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

Commit e4c3c13c authored by Hannes Eder's avatar Hannes Eder Committed by David S. Miller
Browse files

drivers/net: fix sparse warnings: make do-while a compound statement 



While at it insert some extra curly braces and fix formatting.

Fix this sparse warnings:

  drivers/net/atp.c:811:8: warning: do-while statement is not a compound statement
  drivers/net/atp.c:813:8: warning: do-while statement is not a compound statement
  drivers/net/atp.c:815:11: warning: do-while statement is not a compound statement
  drivers/net/atp.c:817:11: warning: do-while statement is not a compound statement
  drivers/net/plip.c:642:4: warning: do-while statement is not a compound statement
  drivers/net/plip.c:647:4: warning: do-while statement is not a compound statement
  drivers/net/plip.c:820:4: warning: do-while statement is not a compound statement
  drivers/net/plip.c:825:4: warning: do-while statement is not a compound statement
  drivers/net/starfire.c:886:3: warning: do-while statement is not a compound statement

Signed-off-by: default avatarHannes Eder <hannes@hanneseder.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2705d4f8

drivers/net/atp.c

+10 −9
Original line number Diff line number Diff line
@@ -802,19 +802,20 @@ static void net_rx(struct net_device *dev) 


static void read_block(long ioaddr, int length, unsigned char *p, int data_mode)

{



	if (data_mode <= 3) { /* Mode 0 or 1 */

		outb(Ctrl_LNibRead, ioaddr + PAR_CONTROL);

		outb(length == 8  ?  RdAddr | HNib | MAR  :  RdAddr | MAR,

			 ioaddr + PAR_DATA);

		if (data_mode <= 1) { /* Mode 0 or 1 */

			do  *p++ = read_byte_mode0(ioaddr);  while (--length > 0);

		} else	/* Mode 2 or 3 */

			do  *p++ = read_byte_mode2(ioaddr);  while (--length > 0);

	} else if (data_mode <= 5)

		do      *p++ = read_byte_mode4(ioaddr);  while (--length > 0);

	else

		do      *p++ = read_byte_mode6(ioaddr);  while (--length > 0);

			do { *p++ = read_byte_mode0(ioaddr); } while (--length > 0);

		} else { /* Mode 2 or 3 */

			do { *p++ = read_byte_mode2(ioaddr); } while (--length > 0);

		}

	} else if (data_mode <= 5) {

		do { *p++ = read_byte_mode4(ioaddr); } while (--length > 0);

	} else {

		do { *p++ = read_byte_mode6(ioaddr); } while (--length > 0);

	}



	outb(EOC+HNib+MAR, ioaddr + PAR_DATA);

	outb(Ctrl_SelData, ioaddr + PAR_CONTROL);

drivers/net/plip.c

+8 −8
Original line number Diff line number Diff line
@@ -638,14 +638,14 @@ plip_receive_packet(struct net_device *dev, struct net_local *nl, 


	case PLIP_PK_DATA:

		lbuf = rcv->skb->data;

		do

		do {

			if (plip_receive(nibble_timeout, dev,

					 &rcv->nibble, &lbuf[rcv->byte]))

				return TIMEOUT;

		while (++rcv->byte < rcv->length.h);

		do

		} while (++rcv->byte < rcv->length.h);

		do {

			rcv->checksum += lbuf[--rcv->byte];

		while (rcv->byte);

		} while (rcv->byte);

		rcv->state = PLIP_PK_CHECKSUM;



	case PLIP_PK_CHECKSUM:
@@ -816,14 +816,14 @@ plip_send_packet(struct net_device *dev, struct net_local *nl, 
		snd->checksum = 0;



	case PLIP_PK_DATA:

		do

		do {

			if (plip_send(nibble_timeout, dev,

				      &snd->nibble, lbuf[snd->byte]))

				return TIMEOUT;

		while (++snd->byte < snd->length.h);

		do

		} while (++snd->byte < snd->length.h);

		do {

			snd->checksum += lbuf[--snd->byte];

		while (snd->byte);

		} while (snd->byte);

		snd->state = PLIP_PK_CHECKSUM;



	case PLIP_PK_CHECKSUM:

drivers/net/starfire.c

+2 −2
Original line number Diff line number Diff line
@@ -880,9 +880,9 @@ static int mdio_read(struct net_device *dev, int phy_id, int location) 
	void __iomem *mdio_addr = np->base + MIICtrl + (phy_id<<7) + (location<<2);

	int result, boguscnt=1000;

	/* ??? Should we add a busy-wait here? */

	do

	do {

		result = readl(mdio_addr);

	while ((result & 0xC0000000) != 0x80000000 && --boguscnt > 0);

	} while ((result & 0xC0000000) != 0x80000000 && --boguscnt > 0);

	if (boguscnt == 0)

		return 0;

	if ((result & 0xffff) == 0xffff)