[PATCH] mfd: Don't use NO_IRQ in WM8350

[PATCH] mfd: Don't use NO_IRQ in WM8350

[Mark Brown]

NO_IRQ is only defined on some architectures - the general way to test
for an invalid IRQ in the modern kernel is by comparing with zero.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

This is a build fix for platforms that don't define NO_IRQ (which is
most of them).  Please merge as soon as possible.

 drivers/mfd/wm8350-core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mfd/wm8350-core.c b/drivers/mfd/wm8350-core.c
index 25a7a5d..bf87f67 100644
--- a/drivers/mfd/wm8350-core.c
+++ b/drivers/mfd/wm8350-core.c
@@ -1217,7 +1217,7 @@ int wm8350_device_init(struct wm8350 *wm8350, int irq,
 
 	mutex_init(&wm8350->irq_mutex);
 	INIT_WORK(&wm8350->irq_work, wm8350_irq_worker);
-	if (irq != NO_IRQ) {
+	if (irq) {
 		ret = request_irq(irq, wm8350_irq, 0,
 				  "wm8350", wm8350);
 		if (ret != 0) {
-- 
1.5.6.5

Re: [PATCH] mfd: Don't use NO_IRQ in WM8350

[Samuel Ortiz]

On Wed, 15 Oct 2008 11:20:54 +0100, Mark Brown
<broonie@opensource.wolfsonmicro.com> wrote:
> NO_IRQ is only defined on some architectures - the general way to test
> for an invalid IRQ in the modern kernel is by comparing with zero.
> 
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Applied, thanks.
I'll send a pull request to Linus soon.

Cheers,
Samuel.


> ---
> 
> This is a build fix for platforms that don't define NO_IRQ (which is
> most of them).  Please merge as soon as possible.
> 
>  drivers/mfd/wm8350-core.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/mfd/wm8350-core.c b/drivers/mfd/wm8350-core.c
> index 25a7a5d..bf87f67 100644
> --- a/drivers/mfd/wm8350-core.c
> +++ b/drivers/mfd/wm8350-core.c
> @@ -1217,7 +1217,7 @@ int wm8350_device_init(struct wm8350 *wm8350, int
> irq,
>  
>  	mutex_init(&wm8350->irq_mutex);
>  	INIT_WORK(&wm8350->irq_work, wm8350_irq_worker);
> -	if (irq != NO_IRQ) {
> +	if (irq) {
>  		ret = request_irq(irq, wm8350_irq, 0,
>  				  "wm8350", wm8350);
>  		if (ret != 0) {
>

Re: [PATCH] mfd: Don't use NO_IRQ in WM8350

[Mark Brown]

On Wed, Oct 15, 2008 at 07:55:17AM -0400, Samuel Ortiz wrote:

> I'll send a pull request to Linus soon.

Thanks, it's fairly urgent since it breaks allmodconfig and allyesconfig
on at least x86_64.

Re: [PATCH] mfd: Don't use NO_IRQ in WM8350

[Samuel Ortiz]

On Wed, 15 Oct 2008 15:15:14 +0100, Mark Brown
<broonie@opensource.wolfsonmicro.com> wrote:
> On Wed, Oct 15, 2008 at 07:55:17AM -0400, Samuel Ortiz wrote:
> 
>> I'll send a pull request to Linus soon.
> 
> Thanks, it's fairly urgent since it breaks allmodconfig and allyesconfig
> on at least x86_64.
My patch queue is ready. I'll wait for a linux-next iteration, and send the
pull request. That will happen tomorrow morning.

Cheers,
Samuel.