Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[cascardo/linux.git] / drivers / mfd / htc-i2cpld.c

diff --git a/drivers/mfd/htc-i2cpld.c b/drivers/mfd/htc-i2cpld.c
index adbbce0..ebb9cf1 100644 (file)
--- a/drivers/mfd/htc-i2cpld.c
+++ b/drivers/mfd/htc-i2cpld.c
@@ -227,15 +227,12 @@ static irqreturn_t htcpld_handler(int irq, void *dev)
 static void htcpld_chip_set(struct gpio_chip *chip, unsigned offset, int val)
 {
        struct i2c_client *client;
-       struct htcpld_chip *chip_data;
+       struct htcpld_chip *chip_data =
+               container_of(chip, struct htcpld_chip, chip_out);
        unsigned long flags;
 
-       chip_data = container_of(chip, struct htcpld_chip, chip_out);
-       if (!chip_data)
-               return;
-
        client = chip_data->client;
-       if (client == NULL)
+       if (!client)
                return;
 
        spin_lock_irqsave(&chip_data->lock, flags);
@@ -261,31 +258,18 @@ static void htcpld_chip_set_ni(struct work_struct *work)
 static int htcpld_chip_get(struct gpio_chip *chip, unsigned offset)
 {
        struct htcpld_chip *chip_data;
-       int val = 0;
-       int is_input = 0;
-
-       /* Try out first */
-       chip_data = container_of(chip, struct htcpld_chip, chip_out);
-       if (!chip_data) {
-               /* Try in */
-               is_input = 1;
-               chip_data = container_of(chip, struct htcpld_chip, chip_in);
-               if (!chip_data)
-                       return -EINVAL;
-       }
+       u8 cache;
 
-       /* Determine if this is an input or output GPIO */
-       if (!is_input)
-               /* Use the output cache */
-               val = (chip_data->cache_out >> offset) & 1;
-       else
-               /* Use the input cache */
-               val = (chip_data->cache_in >> offset) & 1;
+       if (!strncmp(chip->label, "htcpld-out", 10)) {
+               chip_data = container_of(chip, struct htcpld_chip, chip_out);
+               cache = chip_data->cache_out;
+       } else if (!strncmp(chip->label, "htcpld-in", 9)) {
+               chip_data = container_of(chip, struct htcpld_chip, chip_in);
+               cache = chip_data->cache_in;
+       } else
+               return -EINVAL;
 
-       if (val)
-               return 1;
-       else
-               return 0;
+       return (cache >> offset) & 1;
 }
 
 static int htcpld_direction_output(struct gpio_chip *chip,
@@ -376,7 +360,7 @@ static int htcpld_register_chip_i2c(
        plat_chip_data = &pdata->chip[chip_index];
 
        adapter = i2c_get_adapter(pdata->i2c_adapter_id);
-       if (adapter == NULL) {
+       if (!adapter) {
                /* Eek, no such I2C adapter!  Bail out. */
                dev_warn(dev, "Chip at i2c address 0x%x: Invalid i2c adapter %d\n",
                         plat_chip_data->addr, pdata->i2c_adapter_id);