Commit cba0516d authored by Jeff Garzik's avatar Jeff Garzik Committed by David S. Miller
Browse files

[netdrvr] checkpatch cleanups 



Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 93a3b607

drivers/net/3c507.c

+8 −5
Original line number Diff line number Diff line
@@ -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;

			}

drivers/net/at1700.c

+3 −2
Original line number Diff line number Diff line
@@ -465,8 +465,9 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr) 
	/* 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;

	}

drivers/net/bnx2x.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

drivers/net/eexpress.c

+2 −3
Original line number Diff line number Diff line
@@ -786,7 +786,6 @@ static irqreturn_t eexp_irq(int dummy, void *dev_info) 


	outb(SIRQ_dis|irqrmap[dev->irq], ioaddr+SET_IRQ);





	status = scb_status(dev);



#if NET_DEBUG > 4

drivers/net/e1000/e1000_ethtool.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/net/lp486e.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/net/tulip/de4x5.c

+2 −2

File changed.

Contains only whitespace changes.