2005-11-21 01:14:13

by Matthew Wilcox

Subject: [PATCH 3/5] Fix pd6729.c on architectures which define NO_IRQ

Use pci_valid_irq() instead of a custom NO_IRQ definition.

Signed-off-by: Matthew Wilcox <[email protected]>
Acked-by: Ingo Molnar <[email protected]>

---

drivers/pcmcia/pd6729.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)

applies-to: 26750e45f268b109d418c91b01a55e124bd879e1
fd1b59b22f926ee7daa097166d9e7ac6005b1284
diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c
index 20642f0..72720f2 100644
--- a/drivers/pcmcia/pd6729.c
+++ b/drivers/pcmcia/pd6729.c
@@ -39,10 +39,6 @@ MODULE_AUTHOR("Jun Komuro <komurojun-mbn
*/
#define to_cycles(ns) ((ns)/120)

-#ifndef NO_IRQ
-#define NO_IRQ ((unsigned int)(0))
-#endif
-
/*
* PARAMETERS
* irq_mode=n
@@ -733,7 +729,7 @@ static int __devinit pd6729_pci_probe(st
goto err_out_disable;
}

- if (dev->irq == NO_IRQ)
+ if (!pci_valid_irq(dev->irq))
irq_mode = 0; /* fall back to ISA interrupt mode */

mask = pd6729_isa_scan();
---
0.99.8.GIT

2005-11-21 12:42:03

by Komuro

Subject: Re: [PATCH 3/5] Fix pd6729.c on architectures which define NO_IRQ

Thanks for pointing this out!
I have misused the NO_IRQ definition.

Best Regards
Komuro

>
>Use pci_valid_irq() instead of a custom NO_IRQ definition.
>
>Signed-off-by: Matthew Wilcox <[email protected]>
>Acked-by: Ingo Molnar <[email protected]>
>
>---
>
> drivers/pcmcia/pd6729.c | 6 +-----
> 1 files changed, 1 insertions(+), 5 deletions(-)
>
>applies-to: 26750e45f268b109d418c91b01a55e124bd879e1
>fd1b59b22f926ee7daa097166d9e7ac6005b1284
>diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c
>index 20642f0..72720f2 100644
>--- a/drivers/pcmcia/pd6729.c
>+++ b/drivers/pcmcia/pd6729.c
>@@ -39,10 +39,6 @@ MODULE_AUTHOR("Jun Komuro <komurojun-mbn
> */
> #define to_cycles(ns) ((ns)/120)
>
>-#ifndef NO_IRQ
>-#define NO_IRQ ((unsigned int)(0))
>-#endif
>-
> /*
> * PARAMETERS
> * irq_mode=n
>@@ -733,7 +729,7 @@ static int __devinit pd6729_pci_probe(st
> goto err_out_disable;
> }
>
>- if (dev->irq == NO_IRQ)
>+ if (!pci_valid_irq(dev->irq))
> irq_mode = 0; /* fall back to ISA interrupt mode */
>
> mask = pd6729_isa_scan();
>---
>0.99.8.GIT