Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be763c94 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

lib8390: Normalize source code spacing 



Make more conformant to normal kernel style.

Long line lengths > 80 columns ignored.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7340c4db

drivers/net/lib8390.c

+44 −37
Original line number Original line Diff line number Diff line
@@ -556,9 +556,12 @@ static void ei_tx_err(struct net_device *dev) 
		ei_tx_intr(dev);

		ei_tx_intr(dev);

	else {

	else {

		dev->stats.tx_errors++;

		dev->stats.tx_errors++;

		if (txsr & ENTSR_CRS) dev->stats.tx_carrier_errors++;

		if (txsr & ENTSR_CRS)

		if (txsr & ENTSR_CDH) dev->stats.tx_heartbeat_errors++;

			dev->stats.tx_carrier_errors++;

		if (txsr & ENTSR_OWC) dev->stats.tx_window_errors++;

		if (txsr & ENTSR_CDH)

			dev->stats.tx_heartbeat_errors++;

		if (txsr & ENTSR_OWC)

			dev->stats.tx_window_errors++;

	}

	}

}

}
@@ -610,9 +613,10 @@ static void ei_tx_intr(struct net_device *dev) 
			ei_local->lasttx = 1;

			ei_local->lasttx = 1;

		} else

		} else

			ei_local->lasttx = 10, ei_local->txing = 0;

			ei_local->lasttx = 10, ei_local->txing = 0;

	}

	} /* else

//	else printk(KERN_WARNING "%s: unexpected TX-done interrupt, lasttx=%d.\n",

		netdev_warn(dev, "unexpected TX-done interrupt, lasttx=%d\n",

//			dev->name, ei_local->lasttx);

			    ei_local->lasttx);

*/





	/* Minimize Tx latency: update the statistics after we restart TXing. */

	/* Minimize Tx latency: update the statistics after we restart TXing. */

	if (status & ENTSR_COL)

	if (status & ENTSR_COL)
@@ -674,7 +678,9 @@ static void ei_receive(struct net_device *dev) 
		   Keep quiet if it looks like a card removal. One problem here

		   Keep quiet if it looks like a card removal. One problem here

		   is that some clones crash in roughly the same way.

		   is that some clones crash in roughly the same way.

		 */

		 */

		if (ei_debug > 0  &&  this_frame != ei_local->current_page && (this_frame!=0x0 || rxing_page!=0xFF))

		if (ei_debug > 0 &&

		    this_frame != ei_local->current_page &&

		    (this_frame != 0x0 || rxing_page != 0xFF))

			netdev_err(dev, "mismatched read page pointers %2x vs %2x\n",

			netdev_err(dev, "mismatched read page pointers %2x vs %2x\n",

				   this_frame, ei_local->current_page);

				   this_frame, ei_local->current_page);
@@ -1031,7 +1037,8 @@ static void __NS8390_init(struct net_device *dev, int startp) 
	ei_outb_p(E8390_NODMA + E8390_PAGE1 + E8390_STOP, e8390_base+E8390_CMD); /* 0x61 */

	ei_outb_p(E8390_NODMA + E8390_PAGE1 + E8390_STOP, e8390_base+E8390_CMD); /* 0x61 */

	for (i = 0; i < 6; i++) {

	for (i = 0; i < 6; i++) {

		ei_outb_p(dev->dev_addr[i], e8390_base + EN1_PHYS_SHIFT(i));

		ei_outb_p(dev->dev_addr[i], e8390_base + EN1_PHYS_SHIFT(i));

		if (ei_debug > 1 && ei_inb_p(e8390_base + EN1_PHYS_SHIFT(i))!=dev->dev_addr[i])

		if (ei_debug > 1 &&

		    ei_inb_p(e8390_base + EN1_PHYS_SHIFT(i)) != dev->dev_addr[i])

			netdev_err(dev, "Hw. address read/write mismap %d\n", i);

			netdev_err(dev, "Hw. address read/write mismap %d\n", i);

	}

	}