Merge tag 'mvebu-drivers-4.10-1' of git://git.infradead.org/linux-mvebu into next/soc

mvebu drivers for 4.10 (part 1)

Clean-up on thegpio driver for old SoCs(non DT)

* tag 'mvebu-drivers-4.10-1' of git://git.infradead.org/linux-mvebu:
  ARM/orion/gpio: Replace three seq_printf() calls by seq_puts() in orion_gpio_dbg_show()

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2016-11-18 17:51:13 -08:00
+3 -3
View File
@@ -478,13 +478,13 @@ static void orion_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
(data_in ^ in_pol) & msk ? "hi" : "lo",
in_pol & msk ? "lo" : "hi");
if (!((edg_msk | lvl_msk) & msk)) {
seq_printf(s, " disabled\n");
seq_puts(s, " disabled\n");
continue;
}
if (edg_msk & msk)
seq_printf(s, " edge ");
seq_puts(s, " edge ");
if (lvl_msk & msk)
seq_printf(s, " level");
seq_puts(s, " level");
seq_printf(s, " (%s)\n", cause & msk ? "pending" : "clear ");
}
}