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

Commit d6d7d3ed authored by Joe Perches's avatar Joe Perches Committed by Michael Grzeschik
Browse files

arcnet: Wrap some long lines 



Just neatening.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarMichael Grzeschik <m.grzeschik@pengutronix.de>
parent 83df99b5

drivers/net/arcnet/arc-rawmode.c

+2 −1
Original line number Diff line number Diff line
@@ -165,7 +165,8 @@ static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length, 
	arc_printk(D_DURING, dev, "prepare_tx: txbufs=%d/%d/%d\n",

		   lp->next_tx, lp->cur_tx, bufnum);



	length -= ARC_HDR_SIZE;	/* hard header is not included in packet length */

	/* hard header is not included in packet length */

	length -= ARC_HDR_SIZE;



	if (length > XMTU) {

		/* should never happen! other people already check for this. */

drivers/net/arcnet/arc-rimi.c

+6 −5
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ static void arcrimi_setmask(struct net_device *dev, int mask); 
static int arcrimi_reset(struct net_device *dev, int really_reset);

static void arcrimi_copy_to_card(struct net_device *dev, int bufnum, int offset,

				 void *buf, int count);

static void arcrimi_copy_from_card(struct net_device *dev, int bufnum, int offset,

				   void *buf, int count);

static void arcrimi_copy_from_card(struct net_device *dev, int bufnum,

				   int offset, void *buf, int count);



/* Handy defines for ARCnet specific stuff */
@@ -215,7 +215,8 @@ static int __init arcrimi_found(struct net_device *dev) 
		goto err_free_irq;

	}



	lp->mem_start = ioremap(dev->mem_start, dev->mem_end - dev->mem_start + 1);

	lp->mem_start = ioremap(dev->mem_start,

				dev->mem_end - dev->mem_start + 1);

	if (!lp->mem_start) {

		arc_printk(D_NORMAL, dev, "Can't remap device memory!\n");

		goto err_release_mem;
@@ -307,8 +308,8 @@ static void arcrimi_copy_to_card(struct net_device *dev, int bufnum, int offset, 
	TIME(dev, "memcpy_toio", count, memcpy_toio(memaddr, buf, count));

}



static void arcrimi_copy_from_card(struct net_device *dev, int bufnum, int offset,

				   void *buf, int count)

static void arcrimi_copy_from_card(struct net_device *dev, int bufnum,

				   int offset, void *buf, int count)

{

	struct arcnet_local *lp = netdev_priv(dev);

	void __iomem *memaddr = lp->mem_start + 0x800 + bufnum * 512 + offset;

drivers/net/arcnet/arcnet.c

+7 −3
Original line number Diff line number Diff line
@@ -759,7 +759,8 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id) 
		if ((status & lp->intmask & TXFREEflag) || lp->timed_out) {

			lp->intmask &= ~(TXFREEflag | EXCNAKflag);



			arc_printk(D_DURING, dev, "TX IRQ (stat=%Xh)\n", status);

			arc_printk(D_DURING, dev, "TX IRQ (stat=%Xh)\n",

				   status);



			if (lp->cur_tx != -1 && !lp->timed_out) {

				if (!(status & TXACKflag)) {
@@ -804,7 +805,8 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id) 
			go_tx(dev);



			/* continue a split packet, if any */

			if (lp->outgoing.proto && lp->outgoing.proto->continue_tx) {

			if (lp->outgoing.proto &&

			    lp->outgoing.proto->continue_tx) {

				int txbuf = get_arcbuf(dev);



				if (txbuf != -1) {
@@ -874,7 +876,9 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id) 
					arc_printk(D_NORMAL, dev, "many reconfigurations detected: cabling problem?\n");

				} else if (!lp->network_down &&

					   lp->last_recon - lp->first_recon > HZ * 60) {

					/* reset counters if we've gone for over a minute. */

					/* reset counters if we've gone for

					 *  over a minute.

					 */

					lp->first_recon = lp->last_recon;

					lp->num_recons = 1;

				}

drivers/net/arcnet/capmode.c

+2 −1
Original line number Diff line number Diff line
@@ -222,7 +222,8 @@ static int ack_tx(struct net_device *dev, int acked) 


free_outskb:

	dev_kfree_skb_irq(lp->outgoing.skb);

	lp->outgoing.proto = NULL; /* We are always finished when in this protocol */

	lp->outgoing.proto = NULL;

			/* We are always finished when in this protocol */



	return 0;

}

drivers/net/arcnet/com20020-pci.c

+2 −1
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ MODULE_LICENSE("GPL"); 


static void com20020pci_remove(struct pci_dev *pdev);



static int com20020pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)

static int com20020pci_probe(struct pci_dev *pdev,

			     const struct pci_device_id *id)

{

	struct com20020_pci_card_info *ci;

	struct net_device *dev;