Linux 2.6.30-rc8

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

diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c
index cc84686..8dc0164 100644 (file)
--- a/drivers/gpio/pca953x.c
+++ b/drivers/gpio/pca953x.c
@@ -33,7 +33,12 @@ static const struct i2c_device_id pca953x_id[] = {
        { "pca9554", 8, },
        { "pca9555", 16, },
        { "pca9557", 8, },
+
        { "max7310", 8, },
+       { "pca6107", 8, },
+       { "tca6408", 8, },
+       { "tca6416", 16, },
+       /* NYET:  { "tca6424", 24, }, */
        { }
 };
 MODULE_DEVICE_TABLE(i2c, pca953x_id);
@@ -47,9 +52,6 @@ struct pca953x_chip {
        struct gpio_chip gpio_chip;
 };
 
-/* NOTE:  we can't currently rely on fault codes to come from SMBus
- * calls, so we map all errors to EIO here and return zero otherwise.
- */
 static int pca953x_write_reg(struct pca953x_chip *chip, int reg, uint16_t val)
 {
        int ret;
@@ -61,7 +63,7 @@ static int pca953x_write_reg(struct pca953x_chip *chip, int reg, uint16_t val)
 
        if (ret < 0) {
                dev_err(&chip->client->dev, "failed writing register\n");
-               return -EIO;
+               return ret;
        }
 
        return 0;
@@ -78,7 +80,7 @@ static int pca953x_read_reg(struct pca953x_chip *chip, int reg, uint16_t *val)
 
        if (ret < 0) {
                dev_err(&chip->client->dev, "failed reading register\n");
-               return -EIO;
+               return ret;
        }
 
        *val = (uint16_t)ret;
@@ -200,8 +202,10 @@ static int __devinit pca953x_probe(struct i2c_client *client,
        int ret;
 
        pdata = client->dev.platform_data;
-       if (pdata == NULL)
-               return -ENODEV;
+       if (pdata == NULL) {
+               dev_dbg(&client->dev, "no platform data\n");
+               return -EINVAL;
+       }
 
        chip = kzalloc(sizeof(struct pca953x_chip), GFP_KERNEL);
        if (chip == NULL)
@@ -289,7 +293,10 @@ static int __init pca953x_init(void)
 {
        return i2c_add_driver(&pca953x_driver);
 }
-module_init(pca953x_init);
+/* register after i2c postcore initcall and before
+ * subsys initcalls that may rely on these GPIOs
+ */
+subsys_initcall(pca953x_init);
 
 static void __exit pca953x_exit(void)
 {