| Message ID | 1365964548-4193-1-git-send-email-marex@denx.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Dear Marek Vasut, > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Jean Delvare <jdelvare@suse.de> > Cc: Samuel Ortiz <sameo@linux.intel.com> > Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> > Cc: Guenter Roeck <linux@roeck-us.net> > Cc: linux-kernel <linux-kernel@vger.kernel.org> > Cc: Grant Likely <grant.likely@secretlab.ca> > Signed-off-by: Marek Vasut <marex@denx.de> > --- > drivers/gpio/gpio-ucb1400.c | 19 ++++++------------- > drivers/mfd/ucb1400_core.c | 5 +++++ > include/linux/ucb1400.h | 18 ++++++------------ > 3 files changed, 17 insertions(+), 25 deletions(-) > > v2: Rebase patch from: > http://lists.infradead.org/pipermail/linux-arm-kernel/2010-October/028656.h > tml > > NOTE: I didn't even compile-test this, but the fix was plenty > straightforward. But damn, this code is ugly. I'm retrospectively-ashamed. Best regards, Marek Vasut
On Sun, Apr 14, 2013 at 08:35:48PM +0200, Marek Vasut wrote: > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Jean Delvare <jdelvare@suse.de> > Cc: Samuel Ortiz <sameo@linux.intel.com> > Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> > Cc: Guenter Roeck <linux@roeck-us.net> > Cc: linux-kernel <linux-kernel@vger.kernel.org> > Cc: Grant Likely <grant.likely@secretlab.ca> > Signed-off-by: Marek Vasut <marex@denx.de> Reviewed-by: Mark Brown <broonie@opensource.wolfsonmicro.com> it may be a bit ugly but it's still an improvement :)
On Sun, Apr 14, 2013 at 8:35 PM, Marek Vasut <marex@denx.de> wrote: > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Jean Delvare <jdelvare@suse.de> > Cc: Samuel Ortiz <sameo@linux.intel.com> > Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> > Cc: Guenter Roeck <linux@roeck-us.net> > Cc: linux-kernel <linux-kernel@vger.kernel.org> > Cc: Grant Likely <grant.likely@secretlab.ca> > Signed-off-by: Marek Vasut <marex@denx.de> Acked-by: Linus Walleij <linus.walleij@linaro.org> Sam, please pick it up if you're also OK with this. Yours, Linus Walleij
On Sun, Apr 14, 2013 at 08:35:48PM +0200, Marek Vasut wrote: > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Jean Delvare <jdelvare@suse.de> > Cc: Samuel Ortiz <sameo@linux.intel.com> > Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> > Cc: Guenter Roeck <linux@roeck-us.net> > Cc: linux-kernel <linux-kernel@vger.kernel.org> > Cc: Grant Likely <grant.likely@secretlab.ca> > Signed-off-by: Marek Vasut <marex@denx.de> > --- > drivers/gpio/gpio-ucb1400.c | 19 ++++++------------- > drivers/mfd/ucb1400_core.c | 5 +++++ > include/linux/ucb1400.h | 18 ++++++------------ > 3 files changed, 17 insertions(+), 25 deletions(-) Applied, thanks. Cheers, Samuel.
diff --git a/drivers/gpio/gpio-ucb1400.c b/drivers/gpio/gpio-ucb1400.c index 26405ef..6d0feb2 100644 --- a/drivers/gpio/gpio-ucb1400.c +++ b/drivers/gpio/gpio-ucb1400.c @@ -12,8 +12,6 @@ #include <linux/module.h> #include <linux/ucb1400.h> -struct ucb1400_gpio_data *ucbdata; - static int ucb1400_gpio_dir_in(struct gpio_chip *gc, unsigned off) { struct ucb1400_gpio *gpio; @@ -50,7 +48,7 @@ static int ucb1400_gpio_probe(struct platform_device *dev) struct ucb1400_gpio *ucb = dev->dev.platform_data; int err = 0; - if (!(ucbdata && ucbdata->gpio_offset)) { + if (!(ucb && ucb->gpio_offset)) { err = -EINVAL; goto err; } @@ -58,7 +56,7 @@ static int ucb1400_gpio_probe(struct platform_device *dev) platform_set_drvdata(dev, ucb); ucb->gc.label = "ucb1400_gpio"; - ucb->gc.base = ucbdata->gpio_offset; + ucb->gc.base = ucb->gpio_offset; ucb->gc.ngpio = 10; ucb->gc.owner = THIS_MODULE; @@ -72,8 +70,8 @@ static int ucb1400_gpio_probe(struct platform_device *dev) if (err) goto err; - if (ucbdata && ucbdata->gpio_setup) - err = ucbdata->gpio_setup(&dev->dev, ucb->gc.ngpio); + if (ucb && ucb->gpio_setup) + err = ucb->gpio_setup(&dev->dev, ucb->gc.ngpio); err: return err; @@ -85,8 +83,8 @@ static int ucb1400_gpio_remove(struct platform_device *dev) int err = 0; struct ucb1400_gpio *ucb = platform_get_drvdata(dev); - if (ucbdata && ucbdata->gpio_teardown) { - err = ucbdata->gpio_teardown(&dev->dev, ucb->gc.ngpio); + if (ucb && ucb->gpio_teardown) { + err = ucb->gpio_teardown(&dev->dev, ucb->gc.ngpio); if (err) return err; } @@ -103,11 +101,6 @@ static struct platform_driver ucb1400_gpio_driver = { }, }; -void __init ucb1400_gpio_set_data(struct ucb1400_gpio_data *data) -{ - ucbdata = data; -} - module_platform_driver(ucb1400_gpio_driver); MODULE_DESCRIPTION("Philips UCB1400 GPIO driver"); diff --git a/drivers/mfd/ucb1400_core.c b/drivers/mfd/ucb1400_core.c index daf6952..e9031fa 100644 --- a/drivers/mfd/ucb1400_core.c +++ b/drivers/mfd/ucb1400_core.c @@ -75,6 +75,11 @@ static int ucb1400_core_probe(struct device *dev) /* GPIO */ ucb_gpio.ac97 = ac97; + if (pdata) { + ucb_gpio.gpio_setup = pdata->gpio_setup; + ucb_gpio.gpio_teardown = pdata->gpio_teardown; + ucb_gpio.gpio_offset = pdata->gpio_offset; + } ucb->ucb1400_gpio = platform_device_alloc("ucb1400_gpio", -1); if (!ucb->ucb1400_gpio) { err = -ENOMEM; diff --git a/include/linux/ucb1400.h b/include/linux/ucb1400.h index d21b33c..2e9ee4d 100644 --- a/include/linux/ucb1400.h +++ b/include/linux/ucb1400.h @@ -83,15 +83,12 @@ #define UCB_ID 0x7e #define UCB_ID_1400 0x4304 -struct ucb1400_gpio_data { - int gpio_offset; - int (*gpio_setup)(struct device *dev, int ngpio); - int (*gpio_teardown)(struct device *dev, int ngpio); -}; - struct ucb1400_gpio { struct gpio_chip gc; struct snd_ac97 *ac97; + int gpio_offset; + int (*gpio_setup)(struct device *dev, int ngpio); + int (*gpio_teardown)(struct device *dev, int ngpio); }; struct ucb1400_ts { @@ -110,6 +107,9 @@ struct ucb1400 { struct ucb1400_pdata { int irq; + int gpio_offset; + int (*gpio_setup)(struct device *dev, int ngpio); + int (*gpio_teardown)(struct device *dev, int ngpio); }; static inline u16 ucb1400_reg_read(struct snd_ac97 *ac97, u16 reg) @@ -162,10 +162,4 @@ static inline void ucb1400_adc_disable(struct snd_ac97 *ac97) unsigned int ucb1400_adc_read(struct snd_ac97 *ac97, u16 adc_channel, int adcsync); -#ifdef CONFIG_GPIO_UCB1400 -void __init ucb1400_gpio_set_data(struct ucb1400_gpio_data *data); -#else -static inline void ucb1400_gpio_set_data(struct ucb1400_gpio_data *data) {} -#endif - #endif
Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Jean Delvare <jdelvare@suse.de> Cc: Samuel Ortiz <sameo@linux.intel.com> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: Guenter Roeck <linux@roeck-us.net> Cc: linux-kernel <linux-kernel@vger.kernel.org> Cc: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Marek Vasut <marex@denx.de> --- drivers/gpio/gpio-ucb1400.c | 19 ++++++------------- drivers/mfd/ucb1400_core.c | 5 +++++ include/linux/ucb1400.h | 18 ++++++------------ 3 files changed, 17 insertions(+), 25 deletions(-) v2: Rebase patch from: http://lists.infradead.org/pipermail/linux-arm-kernel/2010-October/028656.html NOTE: I didn't even compile-test this, but the fix was plenty straightforward.