* [PATCH] UCB1400: Pass ucb1400-gpio data through ac97 bus
@ 2010-08-09 4:16 Marek Vasut
2010-08-09 4:43 ` Marek Vasut
0 siblings, 1 reply; 6+ messages in thread
From: Marek Vasut @ 2010-08-09 4:16 UTC (permalink / raw)
To: linux-kernel; +Cc: akpm, sameo, dtor, adobriyan, tj, Marek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
drivers/gpio/ucb1400_gpio.c | 19 ++++++-------------
drivers/mfd/ucb1400_core.c | 5 +++++
include/linux/ucb1400.h | 19 ++++++-------------
3 files changed, 17 insertions(+), 26 deletions(-)
diff --git a/drivers/gpio/ucb1400_gpio.c b/drivers/gpio/ucb1400_gpio.c
index 50e6bd1..fba45a5 100644
--- a/drivers/gpio/ucb1400_gpio.c
+++ b/drivers/gpio/ucb1400_gpio.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;
}
@@ -113,11 +111,6 @@ static void __exit ucb1400_gpio_exit(void)
platform_driver_unregister(&ucb1400_gpio_driver);
}
-void __init ucb1400_gpio_set_data(struct ucb1400_gpio_data *data)
-{
- ucbdata = data;
-}
-
module_init(ucb1400_gpio_init);
module_exit(ucb1400_gpio_exit);
diff --git a/drivers/mfd/ucb1400_core.c b/drivers/mfd/ucb1400_core.c
index dbe2801..3e24632 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 1b47909..1a6bfdd 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 {
@@ -112,6 +109,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)
@@ -163,11 +163,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
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] UCB1400: Pass ucb1400-gpio data through ac97 bus
2010-08-09 4:16 [PATCH] UCB1400: Pass ucb1400-gpio data through ac97 bus Marek Vasut
@ 2010-08-09 4:43 ` Marek Vasut
2010-08-26 23:07 ` Andrew Morton
0 siblings, 1 reply; 6+ messages in thread
From: Marek Vasut @ 2010-08-09 4:43 UTC (permalink / raw)
To: linux-kernel; +Cc: akpm, sameo, dtor, adobriyan, tj
Dne Po 9. srpna 2010 06:16:34 Marek Vasut napsal(a):
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> ---
> drivers/gpio/ucb1400_gpio.c | 19 ++++++-------------
> drivers/mfd/ucb1400_core.c | 5 +++++
> include/linux/ucb1400.h | 19 ++++++-------------
> 3 files changed, 17 insertions(+), 26 deletions(-)
Ah right, guys, if possible, let this go through Eric Miao's tree (as I have
changes that depend on this). Thanks!
Cheers
>
> diff --git a/drivers/gpio/ucb1400_gpio.c b/drivers/gpio/ucb1400_gpio.c
> index 50e6bd1..fba45a5 100644
> --- a/drivers/gpio/ucb1400_gpio.c
> +++ b/drivers/gpio/ucb1400_gpio.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;
> }
> @@ -113,11 +111,6 @@ static void __exit ucb1400_gpio_exit(void)
> platform_driver_unregister(&ucb1400_gpio_driver);
> }
>
> -void __init ucb1400_gpio_set_data(struct ucb1400_gpio_data *data)
> -{
> - ucbdata = data;
> -}
> -
> module_init(ucb1400_gpio_init);
> module_exit(ucb1400_gpio_exit);
>
> diff --git a/drivers/mfd/ucb1400_core.c b/drivers/mfd/ucb1400_core.c
> index dbe2801..3e24632 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 1b47909..1a6bfdd 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 {
> @@ -112,6 +109,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)
> @@ -163,11 +163,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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] UCB1400: Pass ucb1400-gpio data through ac97 bus
2010-08-09 4:43 ` Marek Vasut
@ 2010-08-26 23:07 ` Andrew Morton
2010-08-27 5:50 ` Marek Vasut
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Morton @ 2010-08-26 23:07 UTC (permalink / raw)
To: Marek Vasut; +Cc: linux-kernel, sameo, dtor, adobriyan, tj, Eric Miao
On Mon, 9 Aug 2010 06:43:14 +0200
Marek Vasut <marek.vasut@gmail.com> wrote:
> Dne Po 9. srpna 2010 06:16:34 Marek Vasut napsal(a):
> > Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Please don't send unchangelogged patches.
The title tells us what the patch does but provides no hint as to why
it does it.
> > ---
> > drivers/gpio/ucb1400_gpio.c | 19 ++++++-------------
> > drivers/mfd/ucb1400_core.c | 5 +++++
> > include/linux/ucb1400.h | 19 ++++++-------------
> > 3 files changed, 17 insertions(+), 26 deletions(-)
>
> Ah right, guys, if possible, let this go through Eric Miao's tree (as I have
> changes that depend on this). Thanks!
He's probably unaware of the patch. Let's cc him.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] UCB1400: Pass ucb1400-gpio data through ac97 bus
2010-08-26 23:07 ` Andrew Morton
@ 2010-08-27 5:50 ` Marek Vasut
2010-08-27 6:14 ` Andrew Morton
0 siblings, 1 reply; 6+ messages in thread
From: Marek Vasut @ 2010-08-27 5:50 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, sameo, dtor, adobriyan, tj, Eric Miao
Dne Pá 27. srpna 2010 01:07:36 Andrew Morton napsal(a):
> On Mon, 9 Aug 2010 06:43:14 +0200
>
> Marek Vasut <marek.vasut@gmail.com> wrote:
> > Dne Po 9. srpna 2010 06:16:34 Marek Vasut napsal(a):
> > > Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
>
> Please don't send unchangelogged patches.
Unchangelogged? What do you mean ?
>
> The title tells us what the patch does but provides no hint as to why
> it does it.
>
> > > ---
> > >
> > > drivers/gpio/ucb1400_gpio.c | 19 ++++++-------------
> > > drivers/mfd/ucb1400_core.c | 5 +++++
> > > include/linux/ucb1400.h | 19 ++++++-------------
> > > 3 files changed, 17 insertions(+), 26 deletions(-)
> >
> > Ah right, guys, if possible, let this go through Eric Miao's tree (as I
> > have changes that depend on this). Thanks!
>
> He's probably unaware of the patch. Let's cc him.
I have this one in my tree and I sent it to Eric as a part of larger patchset. I
just wanted to add your Ack eventually.
Cheers
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] UCB1400: Pass ucb1400-gpio data through ac97 bus
2010-08-27 5:50 ` Marek Vasut
@ 2010-08-27 6:14 ` Andrew Morton
2010-08-27 6:17 ` Marek Vasut
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Morton @ 2010-08-27 6:14 UTC (permalink / raw)
To: Marek Vasut; +Cc: linux-kernel, sameo, dtor, adobriyan, tj, Eric Miao
On Fri, 27 Aug 2010 07:50:37 +0200 Marek Vasut <marek.vasut@gmail.com> wrote:
> Dne P__ 27. srpna 2010 01:07:36 Andrew Morton napsal(a):
> > On Mon, 9 Aug 2010 06:43:14 +0200
> >
> > Marek Vasut <marek.vasut@gmail.com> wrote:
> > > Dne Po 9. srpna 2010 06:16:34 Marek Vasut napsal(a):
> > > > Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> >
> > Please don't send unchangelogged patches.
>
> Unchangelogged? What do you mean ?
Patches which don't have any changelog. This patch was sent with no
covering explanation.
> >
> > The title tells us what the patch does but provides no hint as to why
> > it does it.
As I indicated. The title tells us what the patch does but didn't tell
us *why* it does it. Apparently it is preparatory work for some other
patch?
> > > > ---
> > > >
> > > > drivers/gpio/ucb1400_gpio.c | 19 ++++++-------------
> > > > drivers/mfd/ucb1400_core.c | 5 +++++
> > > > include/linux/ucb1400.h | 19 ++++++-------------
> > > > 3 files changed, 17 insertions(+), 26 deletions(-)
> > >
> > > Ah right, guys, if possible, let this go through Eric Miao's tree (as I
> > > have changes that depend on this). Thanks!
> >
> > He's probably unaware of the patch. Let's cc him.
>
> I have this one in my tree and I sent it to Eric as a part of larger patchset.
Recently, I assume - it wasn't in this morning's linux-next.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] UCB1400: Pass ucb1400-gpio data through ac97 bus
2010-08-27 6:14 ` Andrew Morton
@ 2010-08-27 6:17 ` Marek Vasut
0 siblings, 0 replies; 6+ messages in thread
From: Marek Vasut @ 2010-08-27 6:17 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, sameo, dtor, adobriyan, tj, Eric Miao
Dne Pá 27. srpna 2010 08:14:19 Andrew Morton napsal(a):
> On Fri, 27 Aug 2010 07:50:37 +0200 Marek Vasut <marek.vasut@gmail.com> wrote:
> > Dne P__ 27. srpna 2010 01:07:36 Andrew Morton napsal(a):
> > > On Mon, 9 Aug 2010 06:43:14 +0200
> > >
> > > Marek Vasut <marek.vasut@gmail.com> wrote:
> > > > Dne Po 9. srpna 2010 06:16:34 Marek Vasut napsal(a):
> > > > > Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> > >
> > > Please don't send unchangelogged patches.
> >
> > Unchangelogged? What do you mean ?
>
> Patches which don't have any changelog. This patch was sent with no
> covering explanation.
>
> > > The title tells us what the patch does but provides no hint as to why
> > > it does it.
>
> As I indicated. The title tells us what the patch does but didn't tell
> us *why* it does it. Apparently it is preparatory work for some other
> patch?
Ah, stupid me, I see, just checked the patch.
The point is, some time ago (about one year ago ... but certainly after the
ucb1400 was split into multiple chunks and ucb1400-gpio was added), there was no
way to pass platform data to devices attached to ac97 bus. That's why there was
that function "ucb1400_gpio_set_data()".
That's not true anymore, we can just pass the pdata through the ac97 bus to the
mfd part of ucb1400 driver (ucb1400-core), which then registers the gpio part of
ucb1400. This patch actually makes it possible to pass the pdata through the
ac97 bus instead.
>
> > > > > ---
> > > > >
> > > > > drivers/gpio/ucb1400_gpio.c | 19 ++++++-------------
> > > > > drivers/mfd/ucb1400_core.c | 5 +++++
> > > > > include/linux/ucb1400.h | 19 ++++++-------------
> > > > > 3 files changed, 17 insertions(+), 26 deletions(-)
> > > >
> > > > Ah right, guys, if possible, let this go through Eric Miao's tree (as
> > > > I have changes that depend on this). Thanks!
> > >
> > > He's probably unaware of the patch. Let's cc him.
> >
> > I have this one in my tree and I sent it to Eric as a part of larger
> > patchset.
>
> Recently, I assume - it wasn't in this morning's linux-next.
It was sent to linux-arm-kernel as most of the patches were for linux-arm . I
sent this one especially on it's own to reduce useless traffic. I'll remember
this next time.
Cheers
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-08-27 6:17 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-09 4:16 [PATCH] UCB1400: Pass ucb1400-gpio data through ac97 bus Marek Vasut
2010-08-09 4:43 ` Marek Vasut
2010-08-26 23:07 ` Andrew Morton
2010-08-27 5:50 ` Marek Vasut
2010-08-27 6:14 ` Andrew Morton
2010-08-27 6:17 ` Marek Vasut
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).