Merge to Fedora kernel-2.6.18-1.2257_FC5 patched with stable patch-2.6.18.5-vs2.0...

[linux-2.6.git] / drivers / net / ni65.c

diff --git a/drivers/net/ni65.c b/drivers/net/ni65.c
index c43c4cf..810cc57 100644 (file)
--- a/drivers/net/ni65.c
+++ b/drivers/net/ni65.c
@@ -73,8 +73,8 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/module.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 
@@ -526,8 +526,7 @@ static int __init ni65_probe1(struct net_device *dev,int ioaddr)
                        ni65_init_lance(p,dev->dev_addr,0,0);
                        irq_mask = probe_irq_on();
                        writereg(CSR0_INIT|CSR0_INEA,CSR0); /* trigger interrupt */
-                       set_current_state(TASK_UNINTERRUPTIBLE);
-                       schedule_timeout(HZ/50);
+                       msleep(20);
                        dev->irq = probe_irq_off(irq_mask);
                        if(!dev->irq)
                        {
@@ -697,8 +696,7 @@ static void ni65_free_buffer(struct priv *p)
                return;
 
        for(i=0;i<TMDNUM;i++) {
-               if(p->tmdbounce[i])
-                       kfree(p->tmdbounce[i]);
+               kfree(p->tmdbounce[i]);
 #ifdef XMT_VIA_SKB
                if(p->tmd_skb[i])
                        dev_kfree_skb(p->tmd_skb[i]);
@@ -711,12 +709,10 @@ static void ni65_free_buffer(struct priv *p)
                if(p->recv_skb[i])
                        dev_kfree_skb(p->recv_skb[i]);
 #else
-               if(p->recvbounce[i])
-                       kfree(p->recvbounce[i]);
+               kfree(p->recvbounce[i]);
 #endif
        }
-       if(p->self)
-               kfree(p->self);
+       kfree(p->self);
 }
 
 
@@ -1250,14 +1246,14 @@ static void set_multicast_list(struct net_device *dev)
 #ifdef MODULE
 static struct net_device *dev_ni65;
 
-MODULE_PARM(irq, "i");
-MODULE_PARM(io, "i");
-MODULE_PARM(dma, "i");
+module_param(irq, int, 0);
+module_param(io, int, 0);
+module_param(dma, int, 0);
 MODULE_PARM_DESC(irq, "ni6510 IRQ number (ignored for some cards)");
 MODULE_PARM_DESC(io, "ni6510 I/O base address");
 MODULE_PARM_DESC(dma, "ni6510 ISA DMA channel (ignored for some cards)");
 
-int init_module(void)
+int __init init_module(void)
 {
        dev_ni65 = ni65_probe(-1);
        return IS_ERR(dev_ni65) ? PTR_ERR(dev_ni65) : 0;