Hotplug CPU: don't check cpu_online after take_cpu_down

[linux-2.6-omap-h63xx.git] / drivers / net / lib82596.c

diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c
index afa4638052a2dbb4786445466f4c434419d29d23..b59f442bbf36e38885e6bf35570fe7a5b9138104 100644 (file)
--- a/drivers/net/lib82596.c
+++ b/drivers/net/lib82596.c
@@ -176,8 +176,8 @@ struct i596_reg {
 struct i596_tbd {
        unsigned short size;
        unsigned short pad;
-       dma_addr_t     next;
-       dma_addr_t     data;
+       u32            next;
+       u32            data;
        u32 cache_pad[5];               /* Total 32 bytes... */
 };
 
@@ -195,12 +195,12 @@ struct i596_cmd {
        struct i596_cmd *v_next;        /* Address from CPUs viewpoint */
        unsigned short status;
        unsigned short command;
-       dma_addr_t     b_next;  /* Address from i596 viewpoint */
+       u32            b_next;  /* Address from i596 viewpoint */
 };
 
 struct tx_cmd {
        struct i596_cmd cmd;
-       dma_addr_t     tbd;
+       u32            tbd;
        unsigned short size;
        unsigned short pad;
        struct sk_buff *skb;            /* So we can free it after tx */
@@ -237,8 +237,8 @@ struct cf_cmd {
 struct i596_rfd {
        unsigned short stat;
        unsigned short cmd;
-       dma_addr_t     b_next;  /* Address from i596 viewpoint */
-       dma_addr_t     rbd;
+       u32            b_next;  /* Address from i596 viewpoint */
+       u32            rbd;
        unsigned short count;
        unsigned short size;
        struct i596_rfd *v_next;        /* Address from CPUs viewpoint */
@@ -249,18 +249,18 @@ struct i596_rfd {
 };
 
 struct i596_rbd {
-    /* hardware data */
-    unsigned short count;
-    unsigned short zero1;
-    dma_addr_t     b_next;
-    dma_addr_t     b_data;             /* Address from i596 viewpoint */
-    unsigned short size;
-    unsigned short zero2;
-    /* driver data */
-    struct sk_buff *skb;
-    struct i596_rbd *v_next;
-    dma_addr_t     b_addr;             /* This rbd addr from i596 view */
-    unsigned char *v_data;             /* Address from CPUs viewpoint */
+       /* hardware data */
+       unsigned short count;
+       unsigned short zero1;
+       u32            b_next;
+       u32            b_data;          /* Address from i596 viewpoint */
+       unsigned short size;
+       unsigned short zero2;
+       /* driver data */
+       struct sk_buff *skb;
+       struct i596_rbd *v_next;
+       u32            b_addr;          /* This rbd addr from i596 view */
+       unsigned char *v_data;          /* Address from CPUs viewpoint */
                                        /* Total 32 bytes... */
 #ifdef __LP64__
     u32 cache_pad[4];
@@ -275,8 +275,8 @@ struct i596_rbd {
 struct i596_scb {
        unsigned short status;
        unsigned short command;
-       dma_addr_t    cmd;
-       dma_addr_t    rfd;
+       u32           cmd;
+       u32           rfd;
        u32           crc_err;
        u32           align_err;
        u32           resource_err;
@@ -288,14 +288,14 @@ struct i596_scb {
 };
 
 struct i596_iscp {
-       u32           stat;
-       dma_addr_t    scb;
+       u32 stat;
+       u32 scb;
 };
 
 struct i596_scp {
-       u32           sysbus;
-       u32           pad;
-       dma_addr_t    iscp;
+       u32 sysbus;
+       u32 pad;
+       u32 iscp;
 };
 
 struct i596_dma {
@@ -1034,15 +1034,12 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 static void print_eth(unsigned char *add, char *str)
 {
-       int i;
+       DECLARE_MAC_BUF(mac);
+       DECLARE_MAC_BUF(mac2);
 
-       printk(KERN_DEBUG "i596 0x%p, ", add);
-       for (i = 0; i < 6; i++)
-               printk(" %02X", add[i + 6]);
-       printk(" -->");
-       for (i = 0; i < 6; i++)
-               printk(" %02X", add[i]);
-       printk(" %02X%02X, %s\n", add[12], add[13], str);
+       printk(KERN_DEBUG "i596 0x%p, %s --> %s %02X%02X, %s\n",
+              add, print_mac(mac, add + 6), print_mac(mac2, add),
+              add[12], add[13], str);
 }
 
 static int __devinit i82596_probe(struct net_device *dev)
@@ -1127,12 +1124,6 @@ static irqreturn_t i596_interrupt(int irq, void *dev_id)
        struct i596_dma *dma;
        unsigned short status, ack_cmd = 0;
 
-       if (dev == NULL) {
-               printk(KERN_WARNING "%s: irq %d for unknown device.\n",
-                      __FUNCTION__, irq);
-               return IRQ_NONE;
-       }
-
        lp = netdev_priv(dev);
        dma = lp->dma;
 
@@ -1143,7 +1134,7 @@ static irqreturn_t i596_interrupt(int irq, void *dev_id)
 
        DEB(DEB_INTS, printk(KERN_DEBUG
                             "%s: i596 interrupt, IRQ %d, status %4.4x.\n",
-                       dev->name, irq, status));
+                       dev->name, dev->irq, status));
 
        ack_cmd = status & 0xf000;
 
@@ -1352,6 +1343,7 @@ static void set_multicast_list(struct net_device *dev)
        struct i596_private *lp = netdev_priv(dev);
        struct i596_dma *dma = lp->dma;
        int config = 0, cnt;
+       DECLARE_MAC_BUF(mac);
 
        DEB(DEB_MULTI,
            printk(KERN_DEBUG
@@ -1415,8 +1407,8 @@ static void set_multicast_list(struct net_device *dev)
                        if (i596_debug > 1)
                                DEB(DEB_MULTI,
                                    printk(KERN_DEBUG
-                                          "%s: Adding address %02x:%02x:%02x:%02x:%02x:%02x\n",
-                                          dev->name, cp[0], cp[1], cp[2], cp[3], cp[4], cp[5]));
+                                          "%s: Adding address %s\n",
+                                          dev->name, print_mac(mac, cp)));
                }
                DMA_WBACK_INV(dev, &dma->mc_cmd, sizeof(struct mc_cmd));
                i596_add_cmd(dev, &cmd->cmd);