fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c
index 7613947..b9fa4fb 100644 (file)
--- a/drivers/net/sb1000.c
+++ b/drivers/net/sb1000.c
@@ -28,7 +28,7 @@
 
        Small changes to make it work with 2.1.x kernels. Hopefully,
        nothing major will change before official release of Linux 2.2.
 
        Small changes to make it work with 2.1.x kernels. Hopefully,
        nothing major will change before official release of Linux 2.2.

-       
+

        Merged with 2.2 - Alan Cox
 */
 
        Merged with 2.2 - Alan Cox
 */
 


@@ -59,7 +59,7 @@ static char version[] = "sb1000.c:v1.1.2 6/01/98 (fventuri@mediaone.net)\n";
 #ifdef SB1000_DEBUG
 static int sb1000_debug = SB1000_DEBUG;
 #else
 #ifdef SB1000_DEBUG
 static int sb1000_debug = SB1000_DEBUG;
 #else

-static int sb1000_debug = 1;
+static const int sb1000_debug = 1;

 #endif
 
 static const int SB1000_IO_EXTENT = 8;
 #endif
 
 static const int SB1000_IO_EXTENT = 8;


@@ -84,7 +84,7 @@ extern int sb1000_probe(struct net_device *dev);
 static int sb1000_open(struct net_device *dev);
 static int sb1000_dev_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd);
 static int sb1000_start_xmit(struct sk_buff *skb, struct net_device *dev);
 static int sb1000_open(struct net_device *dev);
 static int sb1000_dev_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd);
 static int sb1000_start_xmit(struct sk_buff *skb, struct net_device *dev);

-static irqreturn_t sb1000_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+static irqreturn_t sb1000_interrupt(int irq, void *dev_id);

 static struct net_device_stats *sb1000_stats(struct net_device *dev);
 static int sb1000_close(struct net_device *dev);
 
 static struct net_device_stats *sb1000_stats(struct net_device *dev);
 static int sb1000_close(struct net_device *dev);
 


@@ -143,7 +143,7 @@ sb1000_probe_one(struct pnp_dev *pdev, const struct pnp_device_id *id)
        unsigned short ioaddr[2], irq;
        unsigned int serial_number;
        int error = -ENODEV;
        unsigned short ioaddr[2], irq;
        unsigned int serial_number;
        int error = -ENODEV;

-       
+

        if (pnp_device_attach(pdev) < 0)
                return -ENODEV;
        if (pnp_activate_dev(pdev) < 0)
        if (pnp_device_attach(pdev) < 0)
                return -ENODEV;
        if (pnp_activate_dev(pdev) < 0)


@@ -153,12 +153,12 @@ sb1000_probe_one(struct pnp_dev *pdev, const struct pnp_device_id *id)
                goto out_disable;
        if (!pnp_irq_valid(pdev, 0))
                goto out_disable;
                goto out_disable;
        if (!pnp_irq_valid(pdev, 0))
                goto out_disable;

-               
+

        serial_number = pdev->card->serial;
        serial_number = pdev->card->serial;

-               
+

        ioaddr[0] = pnp_port_start(pdev, 0);
        ioaddr[1] = pnp_port_start(pdev, 0);
        ioaddr[0] = pnp_port_start(pdev, 0);
        ioaddr[1] = pnp_port_start(pdev, 0);

-               
+

        irq = pnp_irq(pdev, 0);
 
        if (!request_region(ioaddr[0], 16, "sb1000"))
        irq = pnp_irq(pdev, 0);
 
        if (!request_region(ioaddr[0], 16, "sb1000"))


@@ -172,7 +172,7 @@ sb1000_probe_one(struct pnp_dev *pdev, const struct pnp_device_id *id)
                goto out_release_regions;
        }
 
                goto out_release_regions;
        }
 

-                
+

        dev->base_addr = ioaddr[0];
        /* mem_start holds the second I/O address */
        dev->mem_start = ioaddr[1];
        dev->base_addr = ioaddr[0];
        /* mem_start holds the second I/O address */
        dev->mem_start = ioaddr[1];


@@ -246,7 +246,7 @@ static struct pnp_driver sb1000_driver = {
        .remove         = sb1000_remove_one,
 };
 
        .remove         = sb1000_remove_one,
 };
 

-\f
+

 /*
  * SB1000 hardware routines to be used during open/configuration phases
  */
 /*
  * SB1000 hardware routines to be used during open/configuration phases
  */


@@ -351,7 +351,7 @@ card_send_command(const int ioaddr[], const char* name,
        return 0;
 }
 
        return 0;
 }
 

-\f
+

 /*
  * SB1000 hardware routines to be used during frame rx interrupt
  */
 /*
  * SB1000 hardware routines to be used during frame rx interrupt
  */


@@ -449,7 +449,7 @@ sb1000_issue_read_command(const int ioaddr[], const char* name)
        return;
 }
 
        return;
 }
 

-\f
+

 /*
  * SB1000 commands for open/configuration
  */
 /*
  * SB1000 commands for open/configuration
  */


@@ -697,7 +697,7 @@ sb1000_set_PIDs(const int ioaddr[], const char* name, const short PID[])
        return sb1000_end_get_set_command(ioaddr, name);
 }
 
        return sb1000_end_get_set_command(ioaddr, name);
 }
 

-\f
+

 static inline void
 sb1000_print_status_buffer(const char* name, unsigned char st[],
        unsigned char buffer[], int size)
 static inline void
 sb1000_print_status_buffer(const char* name, unsigned char st[],
        unsigned char buffer[], int size)


@@ -916,7 +916,7 @@ sb1000_error_dpc(struct net_device *dev)
        return;
 }
 
        return;
 }
 

-\f
+

 /*
  * Linux interface functions
  */
 /*
  * Linux interface functions
  */


@@ -1079,24 +1079,18 @@ sb1000_start_xmit(struct sk_buff *skb, struct net_device *dev)
 }
 
 /* SB1000 interrupt handler. */
 }
 
 /* SB1000 interrupt handler. */

-static irqreturn_t sb1000_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t sb1000_interrupt(int irq, void *dev_id)

 {
        char *name;
        unsigned char st;
        int ioaddr[2];
 {
        char *name;
        unsigned char st;
        int ioaddr[2];

-       struct net_device *dev = (struct net_device *) dev_id;
+       struct net_device *dev = dev_id;

        struct sb1000_private *lp = netdev_priv(dev);
 
        const unsigned char Command0[6] = {0x80, 0x2c, 0x00, 0x00, 0x00, 0x00};
        const unsigned char Command1[6] = {0x80, 0x2e, 0x00, 0x00, 0x00, 0x00};
        const int MaxRxErrorCount = 6;
 
        struct sb1000_private *lp = netdev_priv(dev);
 
        const unsigned char Command0[6] = {0x80, 0x2c, 0x00, 0x00, 0x00, 0x00};
        const unsigned char Command1[6] = {0x80, 0x2e, 0x00, 0x00, 0x00, 0x00};
        const int MaxRxErrorCount = 6;
 

-       if (dev == NULL) {
-               printk(KERN_ERR "sb1000_interrupt(): irq %d for unknown device.\n",
-                       irq);
-               return IRQ_NONE;
-       }
-

        ioaddr[0] = dev->base_addr;
        /* mem_start holds the second I/O address */
        ioaddr[1] = dev->mem_start;
        ioaddr[0] = dev->base_addr;
        /* mem_start holds the second I/O address */
        ioaddr[1] = dev->mem_start;


@@ -1155,7 +1149,7 @@ static int sb1000_close(struct net_device *dev)
                printk(KERN_DEBUG "%s: Shutting down sb1000.\n", dev->name);
 
        netif_stop_queue(dev);
                printk(KERN_DEBUG "%s: Shutting down sb1000.\n", dev->name);
 
        netif_stop_queue(dev);

-       
+

        ioaddr[0] = dev->base_addr;
        /* mem_start holds the second I/O address */
        ioaddr[1] = dev->mem_start;
        ioaddr[0] = dev->base_addr;
        /* mem_start holds the second I/O address */
        ioaddr[1] = dev->mem_start;