[PATCH] fix smc911x compilation breakage

[PATCH] fix smc911x compilation breakage

[Vitaly Wool]

Hi Jeff,

currently (with 2.6.21) compilation of smc911x driver fails in the following way:

  CC      drivers/net/smc911x.o
/sandbox/vital/opensource/linux-2.6/drivers/net/smc911x.c: In function `smc911x_probe':
/sandbox/vital/opensource/linux-2.6/drivers/net/smc911x.c:2125: warning: implicit declaration of function `set_irq_type'
/sandbox/vital/opensource/linux-2.6/drivers/net/smc911x.c:2125: error: `IRQ_TYPE_EDGE_FALLING' undeclared (first use in this function)
/sandbox/vital/opensource/linux-2.6/drivers/net/smc911x.c:2125: error: (Each undeclared identifier is reported only once
/sandbox/vital/opensource/linux-2.6/drivers/net/smc911x.c:2125: error: for each function it appears in.)
make[3]: *** [drivers/net/smc911x.o] Error 1
make[2]: *** [drivers/net] Error 2
make[1]: *** [drivers] Error 2
make: *** [zImage] Error 2

The patch inlined below fixes the problem.

 smc911x.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Signed-off-by: Vitaly Wool <vitalywool@gmail.com>

Index: linux-2.6/drivers/net/smc911x.c
===================================================================
--- linux-2.6.orig/drivers/net/smc911x.c
+++ linux-2.6/drivers/net/smc911x.c
@@ -75,9 +75,9 @@ static const char version[] =
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/irq.h>
 
 #include <asm/io.h>
-#include <asm/irq.h>
 
 #include "smc911x.h"
 

Re: [PATCH] fix smc911x compilation breakage

[Jeff Garzik]

Vitaly Wool wrote:
> Hi Jeff,
> 
> currently (with 2.6.21) compilation of smc911x driver fails in the following way:
> 
>   CC      drivers/net/smc911x.o
> /sandbox/vital/opensource/linux-2.6/drivers/net/smc911x.c: In function `smc911x_probe':
> /sandbox/vital/opensource/linux-2.6/drivers/net/smc911x.c:2125: warning: implicit declaration of function `set_irq_type'
> /sandbox/vital/opensource/linux-2.6/drivers/net/smc911x.c:2125: error: `IRQ_TYPE_EDGE_FALLING' undeclared (first use in this function)
> /sandbox/vital/opensource/linux-2.6/drivers/net/smc911x.c:2125: error: (Each undeclared identifier is reported only once
> /sandbox/vital/opensource/linux-2.6/drivers/net/smc911x.c:2125: error: for each function it appears in.)
> make[3]: *** [drivers/net/smc911x.o] Error 1
> make[2]: *** [drivers/net] Error 2
> make[1]: *** [drivers] Error 2
> make: *** [zImage] Error 2
> 
> The patch inlined below fixes the problem.
> 
>  smc911x.c |    2 +-
>  1 files changed, 1 insertion(+), 1 deletion(-)
> 
> Signed-off-by: Vitaly Wool <vitalywool@gmail.com>
> 
> Index: linux-2.6/drivers/net/smc911x.c
> ===================================================================
> --- linux-2.6.orig/drivers/net/smc911x.c
> +++ linux-2.6/drivers/net/smc911x.c
> @@ -75,9 +75,9 @@ static const char version[] =
>  #include <linux/netdevice.h>
>  #include <linux/etherdevice.h>
>  #include <linux/skbuff.h>
> +#include <linux/irq.h>
>  
>  #include <asm/io.h>
> -#include <asm/irq.h>
>  
>  #include "smc911x.h"

This seems to clash with rmk's comment at the top of linux/irq.h?

	Jeff

Re: [PATCH] fix smc911x compilation breakage

[Vitaly Wool]

Hello Jeff,

> Vitaly Wool wrote:
> > Index: linux-2.6/drivers/net/smc911x.c
> > ===================================================================
> > --- linux-2.6.orig/drivers/net/smc911x.c
> > +++ linux-2.6/drivers/net/smc911x.c
> > @@ -75,9 +75,9 @@ static const char version[] =
> >  #include <linux/netdevice.h>
> >  #include <linux/etherdevice.h>
> >  #include <linux/skbuff.h>
> > +#include <linux/irq.h>
> >  
> >  #include <asm/io.h>
> > -#include <asm/irq.h>
> >  
> >  #include "smc911x.h"
> 
> This seems to clash with rmk's comment at the top of linux/irq.h?

In a way, yes, but I just was fixing the compilation problem, and not
changing the logic in any way. The driver currently calls set_irq_type
so it has to include linux/irq.h, just as it had to include asm/irq.h
before.

I'd guess that set_irq_type better be called by generic code and either
just make the driver don't even bother or call a callback set by
platform part. If you're fine with any of these, and think it's better
than the initial patch, please let me know and I'll proceed with that.

Thanks,
   Vitaly

Re: [PATCH] fix smc911x compilation breakage

[Russell King]

On Sat, Apr 28, 2007 at 10:10:57PM +0400, Vitaly Wool wrote:
> Hello Jeff,
> 
> > Vitaly Wool wrote:
> > > Index: linux-2.6/drivers/net/smc911x.c
> > > ===================================================================
> > > --- linux-2.6.orig/drivers/net/smc911x.c
> > > +++ linux-2.6/drivers/net/smc911x.c
> > > @@ -75,9 +75,9 @@ static const char version[] =
> > >  #include <linux/netdevice.h>
> > >  #include <linux/etherdevice.h>
> > >  #include <linux/skbuff.h>
> > > +#include <linux/irq.h>
> > >  
> > >  #include <asm/io.h>
> > > -#include <asm/irq.h>
> > >  
> > >  #include "smc911x.h"
> > 
> > This seems to clash with rmk's comment at the top of linux/irq.h?
> 
> In a way, yes, but I just was fixing the compilation problem, and not
> changing the logic in any way. The driver currently calls set_irq_type
> so it has to include linux/irq.h, just as it had to include asm/irq.h
> before.
> 
> I'd guess that set_irq_type better be called by generic code and either
> just make the driver don't even bother or call a callback set by
> platform part. If you're fine with any of these, and think it's better
> than the initial patch, please let me know and I'll proceed with that.

Drivers should really be using IRQF_TRIGGER_* constants, not set_irq_type()
unless they have a very good reason.  I doubt this driver has such a
reason, and it's just coded for an older version of the ARM IRQ API.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:

[patch] fix smc911x compilation breakage

[Vitaly Wool]

Hello,

this is the updated version of smc911x compilation breakage fix.
Hope it's fine now. It just adapts the driver to the new IRQ API
according to what Russell has pointed out.

 drivers/net/smc911x.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

Signed-off-by: Vitaly Wool <vitalywool@gmail.com>

diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index c956141..4b9bdad 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -77,7 +77,6 @@ static const char version[] =
 #include <linux/skbuff.h>
 
 #include <asm/io.h>
-#include <asm/irq.h>
 
 #include "smc911x.h"
 
@@ -2086,12 +2085,11 @@ static int __init smc911x_probe(struct n
 	lp->ctl_rspeed = 100;
 
 	/* Grab the IRQ */
-	retval = request_irq(dev->irq, &smc911x_interrupt, IRQF_SHARED, dev->name, dev);
+	retval = request_irq(dev->irq, &smc911x_interrupt,
+			IRQF_SHARED | IRQF_TRIGGER_FALLING, dev->name, dev);
 	if (retval)
 		goto err_out;
 
-	set_irq_type(dev->irq, IRQT_FALLING);
-
 #ifdef SMC_USE_DMA
 	lp->rxdma = SMC_DMA_REQUEST(dev, smc911x_rx_dma_irq);
 	lp->txdma = SMC_DMA_REQUEST(dev, smc911x_tx_dma_irq);