diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-11-23 21:50:34 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:04:05 -0500 |
commit | cba0516ddb9153afdc0ffffb9124f5f12a3b6ae5 (patch) | |
tree | 6231980599bf9e5ad42c149c242f21b61d95b59b /drivers/net | |
parent | 93a3b607e6eff7880959149a581d90c71887eb19 (diff) |
[netdrvr] checkpatch cleanups
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net')
-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) | |||
832 | 832 | ||
833 | if (rfd_cmd != 0 || data_buffer_addr != rx_head + 22 | 833 | if (rfd_cmd != 0 || data_buffer_addr != rx_head + 22 |
834 | || (pkt_len & 0xC000) != 0xC000) { | 834 | || (pkt_len & 0xC000) != 0xC000) { |
835 | printk("%s: Rx frame at %#x corrupted, status %04x cmd %04x " | 835 | printk(KERN_ERR "%s: Rx frame at %#x corrupted, " |
836 | "next %04x data-buf @%04x %04x.\n", dev->name, rx_head, | 836 | "status %04x cmd %04x next %04x " |
837 | frame_status, rfd_cmd, next_rx_frame, data_buffer_addr, | 837 | "data-buf @%04x %04x.\n", |
838 | pkt_len); | 838 | dev->name, rx_head, frame_status, rfd_cmd, |
839 | next_rx_frame, data_buffer_addr, pkt_len); | ||
839 | } else if ((frame_status & 0x2000) == 0) { | 840 | } else if ((frame_status & 0x2000) == 0) { |
840 | /* Frame Rxed, but with error. */ | 841 | /* Frame Rxed, but with error. */ |
841 | dev->stats.rx_errors++; | 842 | dev->stats.rx_errors++; |
@@ -851,7 +852,9 @@ static void el16_rx(struct net_device *dev) | |||
851 | pkt_len &= 0x3fff; | 852 | pkt_len &= 0x3fff; |
852 | skb = dev_alloc_skb(pkt_len+2); | 853 | skb = dev_alloc_skb(pkt_len+2); |
853 | if (skb == NULL) { | 854 | if (skb == NULL) { |
854 | printk("%s: Memory squeeze, dropping packet.\n", dev->name); | 855 | printk(KERN_ERR "%s: Memory squeeze, " |
856 | "dropping packet.\n", | ||
857 | dev->name); | ||
855 | dev->stats.rx_dropped++; | 858 | dev->stats.rx_dropped++; |
856 | break; | 859 | break; |
857 | } | 860 | } |
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: | |||
465 | /* Snarf the interrupt vector now. */ | 465 | /* Snarf the interrupt vector now. */ |
466 | ret = request_irq(irq, &net_interrupt, 0, DRV_NAME, dev); | 466 | ret = request_irq(irq, &net_interrupt, 0, DRV_NAME, dev); |
467 | if (ret) { | 467 | if (ret) { |
468 | printk (" AT1700 at %#3x is unusable due to a conflict on " | 468 | printk(KERN_ERR "AT1700 at %#3x is unusable due to a " |
469 | "IRQ %d.\n", ioaddr, irq); | 469 | "conflict on IRQ %d.\n", |
470 | ioaddr, irq); | ||
470 | goto err_mca; | 471 | goto err_mca; |
471 | } | 472 | } |
472 | 473 | ||
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, | |||
8788 | INIT_WORK(&bp->reset_task, bnx2x_reset_task); | 8788 | INIT_WORK(&bp->reset_task, bnx2x_reset_task); |
8789 | INIT_WORK(&bp->sp_task, bnx2x_sp_task); | 8789 | INIT_WORK(&bp->sp_task, bnx2x_sp_task); |
8790 | 8790 | ||
8791 | dev->base_addr = dev->mem_start = pci_resource_start(pdev, 0); | 8791 | dev->base_addr = pci_resource_start(pdev, 0); |
8792 | dev->mem_end = pci_resource_end(pdev, 0); | ||
8793 | 8792 | ||
8794 | dev->irq = pdev->irq; | 8793 | dev->irq = pdev->irq; |
8795 | 8794 | ||
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, | |||
743 | if (read != (write & test[i] & mask)) { | 743 | if (read != (write & test[i] & mask)) { |
744 | DPRINTK(DRV, ERR, "pattern test reg %04X failed: " | 744 | DPRINTK(DRV, ERR, "pattern test reg %04X failed: " |
745 | "got 0x%08X expected 0x%08X\n", | 745 | "got 0x%08X expected 0x%08X\n", |
746 | reg, read, (write & test[i] & mask)); | 746 | reg, read, (write & test[i] & mask)); |
747 | *data = reg; | 747 | *data = reg; |
748 | return true; | 748 | return true; |
749 | } | 749 | } |
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) | |||
784 | old_read_ptr = inw(ioaddr+READ_PTR); | 784 | old_read_ptr = inw(ioaddr+READ_PTR); |
785 | old_write_ptr = inw(ioaddr+WRITE_PTR); | 785 | old_write_ptr = inw(ioaddr+WRITE_PTR); |
786 | 786 | ||
787 | outb(SIRQ_dis|irqrmap[dev->irq],ioaddr+SET_IRQ); | 787 | outb(SIRQ_dis|irqrmap[dev->irq], ioaddr+SET_IRQ); |
788 | |||
789 | 788 | ||
790 | status = scb_status(dev); | 789 | status = scb_status(dev); |
791 | 790 | ||
@@ -852,7 +851,7 @@ static irqreturn_t eexp_irq(int dummy, void *dev_info) | |||
852 | 851 | ||
853 | eexp_cmd_clear(dev); | 852 | eexp_cmd_clear(dev); |
854 | 853 | ||
855 | outb(SIRQ_en|irqrmap[dev->irq],ioaddr+SET_IRQ); | 854 | outb(SIRQ_en|irqrmap[dev->irq], ioaddr+SET_IRQ); |
856 | 855 | ||
857 | #if NET_DEBUG > 6 | 856 | #if NET_DEBUG > 6 |
858 | printk("%s: leaving eexp_irq()\n", dev->name); | 857 | 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, | |||
1144 | } | 1144 | } |
1145 | 1145 | ||
1146 | static irqreturn_t | 1146 | static irqreturn_t |
1147 | i596_interrupt (int irq, void *dev_instance) | 1147 | i596_interrupt(int irq, void *dev_instance) |
1148 | { | 1148 | { |
1149 | struct net_device *dev = dev_instance; | 1149 | struct net_device *dev = dev_instance; |
1150 | struct i596_private *lp = dev->priv; | 1150 | 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) | |||
4168 | { | 4168 | { |
4169 | int i, status = 0; | 4169 | int i, status = 0; |
4170 | 4170 | ||
4171 | for (i=0; i < ARRAY_SIZE(enet_det); i++) { | 4171 | for (i = 0; i < ARRAY_SIZE(enet_det); i++) { |
4172 | if (!de4x5_strncmp((char *)&lp->srom, (char *)&enet_det[i], 3) && | 4172 | if (!de4x5_strncmp((char *)&lp->srom, (char *)&enet_det[i], 3) && |
4173 | !de4x5_strncmp((char *)&lp->srom+0x10, (char *)&enet_det[i], 3)) { | 4173 | !de4x5_strncmp((char *)&lp->srom+0x10, (char *)&enet_det[i], 3)) { |
4174 | if (i == 0) { | 4174 | if (i == 0) { |
@@ -4188,7 +4188,7 @@ de4x5_strncmp(char *a, char *b, int n) | |||
4188 | { | 4188 | { |
4189 | int ret=0; | 4189 | int ret=0; |
4190 | 4190 | ||
4191 | for (;n && !ret;n--) { | 4191 | for (;n && !ret; n--) { |
4192 | ret = *a++ - *b++; | 4192 | ret = *a++ - *b++; |
4193 | } | 4193 | } |
4194 | 4194 | ||