gpio: Fix checkpatch.pl issues

This patch fixes some issues given by checkpatch. Fixes include
bracket placement, spacing and indenting.

Signed-off-by: Daniel Lockyer <thisisdaniellockyer@gmail.com>
Reviewed-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-altera.c b/drivers/gpio/gpio-altera.c
index 449fb46..0f3d336 100644 (file)
--- a/drivers/gpio/gpio-altera.c
+++ b/drivers/gpio/gpio-altera.c
@@ -107,7 +107,8 @@ static int altera_gpio_irq_set_type(struct irq_data *d,
        return -EINVAL;
 }
 
-static unsigned int altera_gpio_irq_startup(struct irq_data *d) {
+static unsigned int altera_gpio_irq_startup(struct irq_data *d)
+{
        altera_gpio_irq_unmask(d);
 
        return 0;

diff --git a/drivers/gpio/gpio-crystalcove.c b/drivers/gpio/gpio-crystalcove.c
index 2c39811..fddd204 100644 (file)
--- a/drivers/gpio/gpio-crystalcove.c
+++ b/drivers/gpio/gpio-crystalcove.c
@@ -95,9 +95,8 @@ static inline int to_reg(int gpio, enum ctrl_register reg_type)
 {
        int reg;
 
-       if (gpio == 94) {
+       if (gpio == 94)
                return GPIOPANELCTL;
-       }
 
        if (reg_type == CTRL_IN) {
                if (gpio < 8)

diff --git a/drivers/gpio/gpio-f7188x.c b/drivers/gpio/gpio-f7188x.c
index dbda843..5e3c4fa 100644 (file)
--- a/drivers/gpio/gpio-f7188x.c
+++ b/drivers/gpio/gpio-f7188x.c
@@ -172,7 +172,7 @@ static struct f7188x_gpio_bank f71869a_gpio_bank[] = {
 };
 
 static struct f7188x_gpio_bank f71882_gpio_bank[] = {
-       F7188X_GPIO_BANK(0 , 8, 0xF0),
+       F7188X_GPIO_BANK(0, 8, 0xF0),
        F7188X_GPIO_BANK(10, 8, 0xE0),
        F7188X_GPIO_BANK(20, 8, 0xD0),
        F7188X_GPIO_BANK(30, 4, 0xC0),
@@ -180,7 +180,7 @@ static struct f7188x_gpio_bank f71882_gpio_bank[] = {
 };
 
 static struct f7188x_gpio_bank f71889_gpio_bank[] = {
-       F7188X_GPIO_BANK(0 , 7, 0xF0),
+       F7188X_GPIO_BANK(0, 7, 0xF0),
        F7188X_GPIO_BANK(10, 7, 0xE0),
        F7188X_GPIO_BANK(20, 8, 0xD0),
        F7188X_GPIO_BANK(30, 8, 0xC0),

diff --cc drivers/gpio/gpio-it8761e.c
Simple merge

diff --cc drivers/gpio/gpiolib.c
Simple merge