gpio: pca953x: Add support for PCA9556

[safe/jmp/linux-2.6] / drivers / gpio / max7301.c

diff --git a/drivers/gpio/max7301.c b/drivers/gpio/max7301.c
index 1b5ad97..7b82eaa 100644 (file)
--- a/drivers/gpio/max7301.c
+++ b/drivers/gpio/max7301.c
@@ -217,8 +217,10 @@ static int __devinit max7301_probe(struct spi_device *spi)
        int i, ret;
 
        pdata = spi->dev.platform_data;
-       if (!pdata || !pdata->base)
-               return -ENODEV;
+       if (!pdata || !pdata->base) {
+               dev_dbg(&spi->dev, "incorrect or missing platform data\n");
+               return -EINVAL;
+       }
 
        /*
         * bits_per_word cannot be configured in platform data
@@ -255,10 +257,6 @@ static int __devinit max7301_probe(struct spi_device *spi)
        ts->chip.dev = &spi->dev;
        ts->chip.owner = THIS_MODULE;
 
-       ret = gpiochip_add(&ts->chip);
-       if (ret)
-               goto exit_destroy;
-
        /*
         * tristate all pins in hardware and cache the
         * register values for later use.
@@ -269,17 +267,19 @@ static int __devinit max7301_probe(struct spi_device *spi)
                max7301_write(spi, 0x08 + i, 0xAA);
                ts->port_config[i] = 0xAA;
                for (j = 0; j < 4; j++) {
-                       int idx = ts->chip.base + (i - 1) * 4 + j;
-                       ret = gpio_direction_input(idx);
+                       int offset = (i - 1) * 4 + j;
+                       ret = max7301_direction_input(&ts->chip, offset);
                        if (ret)
-                               goto exit_remove;
-                       gpio_free(idx);
+                               goto exit_destroy;
                }
        }
+
+       ret = gpiochip_add(&ts->chip);
+       if (ret)
+               goto exit_destroy;
+
        return ret;
 
-exit_remove:
-       gpiochip_remove(&ts->chip);
 exit_destroy:
        dev_set_drvdata(&spi->dev, NULL);
        mutex_destroy(&ts->lock);
@@ -287,7 +287,7 @@ exit_destroy:
        return ret;
 }
 
-static int max7301_remove(struct spi_device *spi)
+static int __devexit max7301_remove(struct spi_device *spi)
 {
        struct max7301 *ts;
        int ret;