fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c
index c2ec9fd..81ed82f 100644 (file)
--- a/drivers/net/tc35815.c
+++ b/drivers/net/tc35815.c
@@ -1,7 +1,7 @@
 /* tc35815.c: A TOSHIBA TC35815CF PCI 10/100Mbps ethernet driver for linux.
  *
  * Copyright 2001 MontaVista Software Inc.
- * Author: MontaVista Software, Inc. 
+ * Author: MontaVista Software, Inc.
  *                ahennessy@mvista.com
  *
  * Based on skelton.c by Donald Becker.
@@ -453,7 +453,7 @@ static int __devinit tc35815_probe1(struct pci_dev *pdev, unsigned int base_addr
 static int     tc35815_open(struct net_device *dev);
 static int     tc35815_send_packet(struct sk_buff *skb, struct net_device *dev);
 static void     tc35815_tx_timeout(struct net_device *dev);
-static irqreturn_t tc35815_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+static irqreturn_t tc35815_interrupt(int irq, void *dev_id);
 static void    tc35815_rx(struct net_device *dev);
 static void    tc35815_txdone(struct net_device *dev);
 static int     tc35815_close(struct net_device *dev);
@@ -663,7 +663,7 @@ tc35815_init_queues(struct net_device *dev)
 #endif
        }
 #ifdef __mips__
-       fd_addr = (unsigned long)vtonocache(lp->fd_buf);  
+       fd_addr = (unsigned long)vtonocache(lp->fd_buf);
 #else
        fd_addr = (unsigned long)lp->fd_buf;
 #endif
@@ -880,7 +880,7 @@ tc35815_open(struct net_device *dev)
         */
 
        if (dev->irq == 0  ||
-           request_irq(dev->irq, &tc35815_interrupt, SA_SHIRQ, cardname, dev)) {
+           request_irq(dev->irq, &tc35815_interrupt, IRQF_SHARED, cardname, dev)) {
                return -EAGAIN;
        }
 
@@ -1044,7 +1044,7 @@ static void tc35815_fatal_error_interrupt(struct net_device *dev, int status)
  * The typical workload of the driver:
  *   Handle the network interface interrupts.
  */
-static irqreturn_t tc35815_interrupt(int irq, void *dev_id, struct pt_regs * regs)
+static irqreturn_t tc35815_interrupt(int irq, void *dev_id)
 {
        struct net_device *dev = dev_id;
        struct tc35815_regs *tr;
@@ -1136,7 +1136,7 @@ tc35815_rx(struct net_device *dev)
                        int cur_bd, offset;
 
                        lp->stats.rx_bytes += pkt_len;
-                       
+
                        skb = dev_alloc_skb(pkt_len + 2); /* +2: for reserve */
                        if (skb == NULL) {
                                printk(KERN_NOTICE "%s: Memory squeeze, dropping packet.\n",
@@ -1523,7 +1523,7 @@ static unsigned long tc_phy_read(struct net_device *dev, struct tc35815_regs *tr
        struct tc35815_local *lp = dev->priv;
        unsigned long data;
        unsigned long flags;
-       
+
        spin_lock_irqsave(&lp->lock, flags);
 
        tc_writel(MD_CA_Busy | (phy << 5) | phy_reg, &tr->MD_CA);
@@ -1725,7 +1725,7 @@ static struct pci_driver tc35815_driver = {
 
 static int __init tc35815_init_module(void)
 {
-       return pci_module_init(&tc35815_driver);
+       return pci_register_driver(&tc35815_driver);
 }
 
 static void __exit tc35815_cleanup_module(void)