Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

[~andy/linux] / drivers / net / gt96100eth.c

diff --git a/drivers/net/gt96100eth.c b/drivers/net/gt96100eth.c
index 666cfbbcf6d9173cb47129c4d2f7b41d93898ea8..2b4db74144752b6a54ec2f8a6e15accacee7a93f 100644 (file)
--- a/drivers/net/gt96100eth.c
+++ b/drivers/net/gt96100eth.c
@@ -72,8 +72,6 @@ static void dump_tx_desc(int dbg_lvl, struct net_device *dev, int i);
 static void dump_rx_desc(int dbg_lvl, struct net_device *dev, int i);
 static void dump_skb(int dbg_lvl, struct net_device *dev,
                     struct sk_buff *skb);
-static void dump_hw_addr(int dbg_lvl, struct net_device *dev,
-                        const char* pfx, unsigned char* addr_str);
 static void update_stats(struct gt96100_private *gp);
 static void abort(struct net_device *dev, u32 abort_bits);
 static void hard_stop(struct net_device *dev);
@@ -116,8 +114,8 @@ static int max_interrupt_work = 32;
 
 static char mac0[18] = "00.02.03.04.05.06";
 static char mac1[18] = "00.01.02.03.04.05";
-MODULE_PARM(mac0, "c18");
-MODULE_PARM(mac1, "c18");
+module_param_string(mac0, mac0, 18, 0);
+module_param_string(mac1, mac0, 18, 0);
 MODULE_PARM_DESC(mac0, "MAC address for GT96100 ethernet port 0");
 MODULE_PARM_DESC(mac1, "MAC address for GT96100 ethernet port 1");
 
@@ -334,13 +332,13 @@ dump_MII(int dbg_lvl, struct net_device *dev)
 
 static void
 dump_hw_addr(int dbg_lvl, struct net_device *dev, const char* pfx,
-            unsigned char* addr_str)
+            const char* func, unsigned char* addr_str)
 {
        int i;
        char buf[100], octet[5];
     
        if (dbg_lvl <= GT96100_DEBUG) {
-               strcpy(buf, pfx);
+               sprintf(buf, pfx, func);
                for (i = 0; i < 6; i++) {
                        sprintf(octet, "%2.2x%s",
                                addr_str[i], i<5 ? ":" : "\n");
@@ -701,14 +699,13 @@ static int __init gt96100_probe1(struct pci_dev *pci, int port_num)
        memset(gp, 0, sizeof(*gp)); // clear it
 
        gp->port_num = port_num;
-       gp->io_size = GT96100_ETH_IO_SIZE;
        gp->port_offset = port_num * GT96100_ETH_IO_SIZE;
        gp->phy_addr = phy_addr;
        gp->chip_rev = chip_rev;
 
        info("%s found at 0x%x, irq %d\n",
             chip_name(gp->chip_rev), gtif->iobase, gtif->irq);
-       dump_hw_addr(0, dev, "HW Address ", dev->dev_addr);
+       dump_hw_addr(0, dev, "%s: HW Address ", __FUNCTION__, dev->dev_addr);
        info("%s chip revision=%d\n", chip_name(gp->chip_rev), gp->chip_rev);
        info("%s ethernet port %d\n", chip_name(gp->chip_rev), gp->port_num);
        info("external PHY ID1=0x%04x, ID2=0x%04x\n", phy_id1, phy_id2);
@@ -1032,7 +1029,7 @@ gt96100_open(struct net_device *dev)
        }
 
        if ((retval = request_irq(dev->irq, &gt96100_interrupt,
-                                 SA_SHIRQ, dev->name, dev))) {
+                                 IRQF_SHARED, dev->name, dev))) {
                err("unable to get IRQ %d\n", dev->irq);
                return retval;
        }
@@ -1488,7 +1485,7 @@ gt96100_set_rx_mode(struct net_device *dev)
                gt96100_add_hash_entry(dev, dev->dev_addr);
 
                for (mcptr = dev->mc_list; mcptr; mcptr = mcptr->next) {
-                       dump_hw_addr(2, dev, __FUNCTION__ ": addr=",
+                       dump_hw_addr(2, dev, "%s: addr=", __FUNCTION__,
                                     mcptr->dmi_addr);
                        gt96100_add_hash_entry(dev, mcptr->dmi_addr);
                }
@@ -1533,7 +1530,7 @@ static void gt96100_cleanup_module(void)
                                + sizeof(gt96100_td_t) * TX_RING_SIZE,
                                gp->rx_ring);
                        free_netdev(gtif->dev);
-                       release_region(gtif->iobase, gp->io_size);
+                       release_region(gtif->iobase, GT96100_ETH_IO_SIZE);
                }
        }
 }