2010-08-17 12:13:46

by Mark Brown

Subject: [PATCH 1/2] mfd: Move PCF50633 IRQ protoypes where the definitions can see them

Fixed warnings about unprototyped global functions.

Signed-off-by: Mark Brown <[email protected]>
---
drivers/mfd/pcf50633-core.c | 7 -------
include/linux/mfd/pcf50633/core.h | 7 +++++++
2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c
index 23e5855..6d4233f 100644
--- a/drivers/mfd/pcf50633-core.c
+++ b/drivers/mfd/pcf50633-core.c
@@ -25,13 +25,6 @@

#include <linux/mfd/pcf50633/core.h>

-int pcf50633_irq_init(struct pcf50633 *pcf, int irq);
-void pcf50633_irq_free(struct pcf50633 *pcf);
-#ifdef CONFIG_PM
-int pcf50633_irq_suspend(struct pcf50633 *pcf);
-int pcf50633_irq_resume(struct pcf50633 *pcf);
-#endif
-
static int __pcf50633_read(struct pcf50633 *pcf, u8 reg, int num, u8 *data)
{
int ret;
diff --git a/include/linux/mfd/pcf50633/core.h b/include/linux/mfd/pcf50633/core.h
index ad411a7..50d4a04 100644
--- a/include/linux/mfd/pcf50633/core.h
+++ b/include/linux/mfd/pcf50633/core.h
@@ -227,4 +227,11 @@ static inline struct pcf50633 *dev_to_pcf50633(struct device *dev)
return dev_get_drvdata(dev);
}

+int pcf50633_irq_init(struct pcf50633 *pcf, int irq);
+void pcf50633_irq_free(struct pcf50633 *pcf);
+#ifdef CONFIG_PM
+int pcf50633_irq_suspend(struct pcf50633 *pcf);
+int pcf50633_irq_resume(struct pcf50633 *pcf);
+#endif
+
#endif
--
1.7.1

2010-08-17 12:13:45

by Mark Brown

Subject: [PATCH 2/2] gpiolib: Hook up WM8994 gpio_to_irq()

Not sure where this went.

Signed-off-by: Mark Brown <[email protected]>
---
drivers/gpio/wm8994-gpio.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/gpio/wm8994-gpio.c b/drivers/gpio/wm8994-gpio.c
index 2ac9a16..618398e 100644
--- a/drivers/gpio/wm8994-gpio.c
+++ b/drivers/gpio/wm8994-gpio.c
@@ -140,6 +140,7 @@ static struct gpio_chip template_chip = {
.get = wm8994_gpio_get,
.direction_output = wm8994_gpio_direction_out,
.set = wm8994_gpio_set,
+ .to_irq = wm8994_gpio_to_irq,
.dbg_show = wm8994_gpio_dbg_show,
.can_sleep = 1,
};
--
1.7.1

2010-08-20 21:55:03

by Samuel Ortiz

Subject: Re: [PATCH 1/2] mfd: Move PCF50633 IRQ protoypes where the definitions can see them

On Tue, Aug 17, 2010 at 01:13:36PM +0100, Mark Brown wrote:
> Fixed warnings about unprototyped global functions.
Applied, thanks.

Cheers,
Samuel.

--
Intel Open Source Technology Centre
http://oss.intel.com/

2010-08-20 21:55:49

by Samuel Ortiz

Subject: Re: [PATCH 2/2] gpiolib: Hook up WM8994 gpio_to_irq()

On Tue, Aug 17, 2010 at 01:13:37PM +0100, Mark Brown wrote:
> Not sure where this went.
You mean I missed this one ? Anyway, applied now.

Cheers,
Samuel.

--
Intel Open Source Technology Centre
http://oss.intel.com/

2010-08-21 10:09:21

by Mark Brown

Subject: Re: [PATCH 2/2] gpiolib: Hook up WM8994 gpio_to_irq()

On Fri, Aug 20, 2010 at 11:55:46PM +0200, Samuel Ortiz wrote:
> On Tue, Aug 17, 2010 at 01:13:37PM +0100, Mark Brown wrote:
> > Not sure where this went.

> You mean I missed this one ? Anyway, applied now.

Me more likely. Thanks.