[SCSI] scsi_dh: suppress comparison warning

[linux-2.6-omap-h63xx.git] / drivers / mfd / sm501.c

diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c
index 107215b28805b9e6b500615e007947a7e09b737f..7aebad4c06ff939114bdff7f5f58874ee197f96d 100644 (file)
--- a/drivers/mfd/sm501.c
+++ b/drivers/mfd/sm501.c
@@ -19,7 +19,6 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/pci.h>
-#include <linux/gpio.h>
 #include <linux/i2c-gpio.h>
 
 #include <linux/sm501.h>
@@ -35,6 +34,9 @@ struct sm501_device {
 
 struct sm501_gpio;
 
+#ifdef CONFIG_MFD_SM501_GPIO
+#include <linux/gpio.h>
+
 struct sm501_gpio_chip {
        struct gpio_chip        gpio;
        struct sm501_gpio       *ourgpio;       /* to get back to parent. */
@@ -50,6 +52,11 @@ struct sm501_gpio {
        void __iomem            *regs;
        struct resource         *regs_res;
 };
+#else
+struct sm501_gpio {
+       /* no gpio support, empty definition for sm501_devdata. */
+};
+#endif
 
 struct sm501_devdata {
        spinlock_t                       reg_lock;
@@ -999,7 +1006,7 @@ static int __devinit sm501_gpio_register_chip(struct sm501_devdata *sm,
        struct gpio_chip *gchip = &chip->gpio;
        int base = pdata->gpio_base;
 
-       memcpy(chip, &gpio_chip_template, sizeof(struct gpio_chip));
+       chip->gpio = gpio_chip_template;
 
        if (chip == &gpio->high) {
                if (base > 0)
@@ -1039,7 +1046,7 @@ static int sm501_register_gpio(struct sm501_devdata *sm)
        if (gpio->regs == NULL) {
                dev_err(sm->dev, "gpio: failed to remap registers\n");
                ret = -ENXIO;
-               goto err_mapped;
+               goto err_claimed;
        }
 
        /* Register both our chips. */
@@ -1068,6 +1075,9 @@ static int sm501_register_gpio(struct sm501_devdata *sm)
        }
 
  err_mapped:
+       iounmap(gpio->regs);
+
+ err_claimed:
        release_resource(gpio->regs_res);
        kfree(gpio->regs_res);
 
@@ -1076,36 +1086,56 @@ static int sm501_register_gpio(struct sm501_devdata *sm)
 
 static void sm501_gpio_remove(struct sm501_devdata *sm)
 {
+       struct sm501_gpio *gpio = &sm->gpio;
        int ret;
 
-       ret = gpiochip_remove(&sm->gpio.low.gpio);
+       if (!sm->gpio.registered)
+               return;
+
+       ret = gpiochip_remove(&gpio->low.gpio);
        if (ret)
                dev_err(sm->dev, "cannot remove low chip, cannot tidy up\n");
 
-       ret = gpiochip_remove(&sm->gpio.high.gpio);
+       ret = gpiochip_remove(&gpio->high.gpio);
        if (ret)
                dev_err(sm->dev, "cannot remove high chip, cannot tidy up\n");
+
+       iounmap(gpio->regs);
+       release_resource(gpio->regs_res);
+       kfree(gpio->regs_res);
 }
 
-static int sm501_gpio_pin2nr(struct sm501_devdata *sm, unsigned int pin)
+static inline int sm501_gpio_pin2nr(struct sm501_devdata *sm, unsigned int pin)
 {
        struct sm501_gpio *gpio = &sm->gpio;
-       return pin + (pin < 32) ? gpio->low.gpio.base : gpio->high.gpio.base;
+       int base = (pin < 32) ? gpio->low.gpio.base : gpio->high.gpio.base;
+
+       return (pin % 32) + base;
+}
+
+static inline int sm501_gpio_isregistered(struct sm501_devdata *sm)
+{
+       return sm->gpio.registered;
 }
 #else
-static int sm501_register_gpio(struct sm501_devdata *sm)
+static inline int sm501_register_gpio(struct sm501_devdata *sm)
 {
        return 0;
 }
 
-static void sm501_gpio_remove(struct sm501_devdata *sm)
+static inline void sm501_gpio_remove(struct sm501_devdata *sm)
 {
 }
 
-static int sm501_gpio_pin2nr(struct sm501_devdata *sm, unsigned int pin)
+static inline int sm501_gpio_pin2nr(struct sm501_devdata *sm, unsigned int pin)
 {
        return -1;
 }
+
+static inline int sm501_gpio_isregistered(struct sm501_devdata *sm)
+{
+       return 0;
+}
 #endif
 
 static int sm501_register_gpio_i2c_instance(struct sm501_devdata *sm,
@@ -1322,8 +1352,8 @@ static int sm501_init_dev(struct sm501_devdata *sm)
        }
 
        if (pdata->gpio_i2c != NULL && pdata->gpio_i2c_nr > 0) {
-               if (!sm->gpio.registered)
-                       dev_err(sm->dev, "no gpio registered for i2c gpio.\n");
+               if (!sm501_gpio_isregistered(sm))
+                       dev_err(sm->dev, "no gpio available for i2c gpio.\n");
                else
                        sm501_register_gpio_i2c(sm, pdata);
        }
@@ -1635,8 +1665,7 @@ static void sm501_dev_remove(struct sm501_devdata *sm)
 
        device_remove_file(sm->dev, &dev_attr_dbg_regs);
 
-       if (sm->gpio.registered)
-               sm501_gpio_remove(sm);
+       sm501_gpio_remove(sm);
 }
 
 static void sm501_pci_remove(struct pci_dev *dev)