diff options
| -rw-r--r-- | drivers/net/3c507.c | 13 | ||||
| -rw-r--r-- | drivers/net/at1700.c | 5 | ||||
| -rw-r--r-- | drivers/net/bnx2x.c | 3 | ||||
| -rw-r--r-- | drivers/net/e1000/e1000_ethtool.c | 2 | ||||
| -rw-r--r-- | drivers/net/eexpress.c | 5 | ||||
| -rw-r--r-- | drivers/net/lp486e.c | 2 | ||||
| -rw-r--r-- | drivers/net/tulip/de4x5.c | 4 |
7 files changed, 18 insertions, 16 deletions
diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c index f90ede931489..030c147211ba 100644 --- a/drivers/net/3c507.c +++ b/drivers/net/3c507.c @@ -832,10 +832,11 @@ static void el16_rx(struct net_device *dev) if (rfd_cmd != 0 || data_buffer_addr != rx_head + 22 || (pkt_len & 0xC000) != 0xC000) { - printk("%s: Rx frame at %#x corrupted, status %04x cmd %04x " - "next %04x data-buf @%04x %04x.\n", dev->name, rx_head, - frame_status, rfd_cmd, next_rx_frame, data_buffer_addr, - pkt_len); + printk(KERN_ERR "%s: Rx frame at %#x corrupted, " + "status %04x cmd %04x next %04x " + "data-buf @%04x %04x.\n", + dev->name, rx_head, frame_status, rfd_cmd, + next_rx_frame, data_buffer_addr, pkt_len); } else if ((frame_status & 0x2000) == 0) { /* Frame Rxed, but with error. */ dev->stats.rx_errors++; @@ -851,7 +852,9 @@ static void el16_rx(struct net_device *dev) pkt_len &= 0x3fff; skb = dev_alloc_skb(pkt_len+2); if (skb == NULL) { - printk("%s: Memory squeeze, dropping packet.\n", dev->name); + printk(KERN_ERR "%s: Memory squeeze, " + "dropping packet.\n", + dev->name); dev->stats.rx_dropped++; break; } diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c index 97041715e8c9..24d81f922533 100644 --- a/drivers/net/at1700.c +++ b/drivers/net/at1700.c @@ -465,8 +465,9 @@ found: /* Snarf the interrupt vector now. */ ret = request_irq(irq, &net_interrupt, 0, DRV_NAME, dev); if (ret) { - printk (" AT1700 at %#3x is unusable due to a conflict on " - "IRQ %d.\n", ioaddr, irq); + printk(KERN_ERR "AT1700 at %#3x is unusable due to a " + "conflict on IRQ %d.\n", + ioaddr, irq); goto err_mca; } diff --git a/drivers/net/bnx2x.c b/drivers/net/bnx2x.c index e8c5754798ea..4a73c884d0c4 100644 --- a/drivers/net/bnx2x.c +++ b/drivers/net/bnx2x.c @@ -8788,8 +8788,7 @@ static int __devinit bnx2x_init_board(struct pci_dev *pdev, INIT_WORK(&bp->reset_task, bnx2x_reset_task); INIT_WORK(&bp->sp_task, bnx2x_sp_task); - dev->base_addr = dev->mem_start = pci_resource_start(pdev, 0); - dev->mem_end = pci_resource_end(pdev, 0); + dev->base_addr = pci_resource_start(pdev, 0); dev->irq = pdev->irq; diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c index 2280818476e2..d876787ce336 100644 --- a/drivers/net/e1000/e1000_ethtool.c +++ b/drivers/net/e1000/e1000_ethtool.c @@ -743,7 +743,7 @@ static bool reg_pattern_test(struct e1000_adapter *adapter, uint64_t *data, if (read != (write & test[i] & mask)) { DPRINTK(DRV, ERR, "pattern test reg %04X failed: " "got 0x%08X expected 0x%08X\n", - reg, read, (write & test[i] & mask)); + reg, read, (write & test[i] & mask)); *data = reg; return true; } diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c index 8969c3b6d443..d5459a8056b1 100644 --- a/drivers/net/eexpress.c +++ b/drivers/net/eexpress.c @@ -784,8 +784,7 @@ static irqreturn_t eexp_irq(int dummy, void *dev_info) old_read_ptr = inw(ioaddr+READ_PTR); old_write_ptr = inw(ioaddr+WRITE_PTR); - outb(SIRQ_dis|irqrmap[dev->irq],ioaddr+SET_IRQ); - + outb(SIRQ_dis|irqrmap[dev->irq], ioaddr+SET_IRQ); status = scb_status(dev); @@ -852,7 +851,7 @@ static irqreturn_t eexp_irq(int dummy, void *dev_info) eexp_cmd_clear(dev); - outb(SIRQ_en|irqrmap[dev->irq],ioaddr+SET_IRQ); + outb(SIRQ_en|irqrmap[dev->irq], ioaddr+SET_IRQ); #if NET_DEBUG > 6 printk("%s: leaving eexp_irq()\n", dev->name); diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c index 0eff1a00c43c..591a7e4220c7 100644 --- a/drivers/net/lp486e.c +++ b/drivers/net/lp486e.c @@ -1144,7 +1144,7 @@ i596_handle_CU_completion(struct net_device *dev, } static irqreturn_t -i596_interrupt (int irq, void *dev_instance) +i596_interrupt(int irq, void *dev_instance) { struct net_device *dev = dev_instance; struct i596_private *lp = dev->priv; diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c index 2738a591c2ec..6c6fc325c8f9 100644 --- a/drivers/net/tulip/de4x5.c +++ b/drivers/net/tulip/de4x5.c @@ -4168,7 +4168,7 @@ de4x5_bad_srom(struct de4x5_private *lp) { int i, status = 0; - for (i=0; i < ARRAY_SIZE(enet_det); i++) { + for (i = 0; i < ARRAY_SIZE(enet_det); i++) { if (!de4x5_strncmp((char *)&lp->srom, (char *)&enet_det[i], 3) && !de4x5_strncmp((char *)&lp->srom+0x10, (char *)&enet_det[i], 3)) { if (i == 0) { @@ -4188,7 +4188,7 @@ de4x5_strncmp(char *a, char *b, int n) { int ret=0; - for (;n && !ret;n--) { + for (;n && !ret; n--) { ret = *a++ - *b++; } |