1 files changed, 11 insertions, 16 deletions

diff --git a/drivers/gpio/74x164.c b/drivers/gpio/74x164.c
index 84e070219839..7fb60b6bf523 100644
--- a/drivers/gpio/74x164.c
+++ b/drivers/gpio/74x164.c
@@ -16,9 +16,6 @@
 #include <linux/gpio.h>
 #include <linux/slab.h>
 
-#define GEN_74X164_GPIO_COUNT   8
-
-
 struct gen_74x164_chip {
         struct spi_device       *spi;
         struct gpio_chip        gpio_chip;
@@ -26,8 +23,6 @@ struct gen_74x164_chip {
         u8                      port_config;
 };
 
-static void gen_74x164_set_value(struct gpio_chip *, unsigned, int);
-
 static struct gen_74x164_chip *gpio_to_chip(struct gpio_chip *gc)
 {
         return container_of(gc, struct gen_74x164_chip, gpio_chip);
@@ -39,13 +34,6 @@ static int __gen_74x164_write_config(struct gen_74x164_chip *chip)
                          &chip->port_config, sizeof(chip->port_config));
 }
 
-static int gen_74x164_direction_output(struct gpio_chip *gc,
-                unsigned offset, int val)
-{
-        gen_74x164_set_value(gc, offset, val);
-        return 0;
-}
-
 static int gen_74x164_get_value(struct gpio_chip *gc, unsigned offset)
 {
         struct gen_74x164_chip *chip = gpio_to_chip(gc);
@@ -73,6 +61,13 @@ static void gen_74x164_set_value(struct gpio_chip *gc,
         mutex_unlock(&chip->lock);
 }
 
+static int gen_74x164_direction_output(struct gpio_chip *gc,
+                unsigned offset, int val)
+{
+        gen_74x164_set_value(gc, offset, val);
+        return 0;
+}
+
 static int __devinit gen_74x164_probe(struct spi_device *spi)
 {
         struct gen_74x164_chip *chip;
@@ -104,12 +99,12 @@ static int __devinit gen_74x164_probe(struct spi_device *spi)
 
         chip->spi = spi;
 
-        chip->gpio_chip.label = GEN_74X164_DRIVER_NAME,
-                chip->gpio_chip.direction_output = gen_74x164_direction_output;
+        chip->gpio_chip.label = spi->modalias;
+        chip->gpio_chip.direction_output = gen_74x164_direction_output;
         chip->gpio_chip.get = gen_74x164_get_value;
         chip->gpio_chip.set = gen_74x164_set_value;
         chip->gpio_chip.base = pdata->base;
-        chip->gpio_chip.ngpio = GEN_74X164_GPIO_COUNT;
+        chip->gpio_chip.ngpio = 8;
         chip->gpio_chip.can_sleep = 1;
         chip->gpio_chip.dev = &spi->dev;
         chip->gpio_chip.owner = THIS_MODULE;
@@ -157,7 +152,7 @@ static int __devexit gen_74x164_remove(struct spi_device *spi)
 
 static struct spi_driver gen_74x164_driver = {
         .driver = {
-                .name           = GEN_74X164_DRIVER_NAME,
+                .name           = "74x164",
                 .owner          = THIS_MODULE,
         },
         .probe          = gen_74x164_probe,