diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-07-25 01:46:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 10:53:30 -0700 |
| commit | f2999209d779573e17468b680f5f267d8cb2a9c7 (patch) | |
| tree | 4b86867c25a550bde4dd66a3e0728c3f217e961e /drivers/mfd | |
| parent | 28130bea3bcfefe3437b0a5dcab786f1f0296953 (diff) | |
| download | linux-f2999209d779573e17468b680f5f267d8cb2a9c7.tar.gz linux-f2999209d779573e17468b680f5f267d8cb2a9c7.tar.bz2 linux-f2999209d779573e17468b680f5f267d8cb2a9c7.zip | |
mfd: sm501 build fixes when CONFIG_MFD_SM501_GPIO unset
Fix the build problems if CONFIG_MFD_SM501_GPIO is not set, which is
generally when there is no gpiolib support available as currently happens
on x86 when building PCI SM501.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Tested-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/sm501.c | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c index 2dfb41aabcaf..79d7aea5510b 100644 --- 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; @@ -1082,6 +1089,9 @@ static void sm501_gpio_remove(struct sm501_devdata *sm) struct sm501_gpio *gpio = &sm->gpio; int ret; + 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"); @@ -1100,6 +1110,11 @@ 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; } + +static inline int sm501_gpio_isregistered(struct sm501_devdata *sm) +{ + return sm->gpio.registered; +} #else static inline int sm501_register_gpio(struct sm501_devdata *sm) { @@ -1114,6 +1129,11 @@ 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, @@ -1330,8 +1350,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); } @@ -1643,8 +1663,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) |