Commit 3b63ef7b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-amd-static-checker-warnings' 



Haoyue Xu says:

====================
net: amd: Cleanup for clearing static warnings

Most static warnings are detected by tools, mainly about:

(1) #1: About the if stament.
(2) #2: About the spelling.
(2) #3: About the indent.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 454e7b13 78923e8a

drivers/net/ethernet/amd/a2065.c

+1 −1
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ static int a2065_init_one(struct zorro_dev *z, 
	}



	dev = alloc_etherdev(sizeof(struct lance_private));

	if (dev == NULL) {

	if (!dev) {

		release_mem_region(base_addr, sizeof(struct lance_regs));

		release_mem_region(mem_start, A2065_RAM_SIZE);

		return -ENOMEM;

drivers/net/ethernet/amd/amd8111e.c

+22 −23
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ Revision History: 
	3.0.4 12/09/2003

	 1. Added set_mac_address routine for bonding driver support.

	 2. Tested the driver for bonding support

	 3. Bug fix: Fixed mismach in actual receive buffer lenth and lenth

	 3. Bug fix: Fixed mismach in actual receive buffer length and length

	    indicated to the h/w.

	 4. Modified amd8111e_rx() routine to receive all the received packets

	    in the first interrupt.
@@ -185,7 +185,6 @@ static void amd8111e_set_ext_phy(struct net_device *dev) 
	advert = amd8111e_mdio_read(dev, lp->ext_phy_addr, MII_ADVERTISE);

	tmp = advert & ~(ADVERTISE_ALL | ADVERTISE_100BASE4);

	switch (lp->ext_phy_option) {



	default:

	case SPEED_AUTONEG: /* advertise all values */

		tmp |= (ADVERTISE_10HALF | ADVERTISE_10FULL |
@@ -237,7 +236,7 @@ static int amd8111e_free_skbs(struct net_device *dev) 
	/* Freeing previously allocated receive buffers */

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

		rx_skbuff = lp->rx_skbuff[i];

		if (rx_skbuff != NULL) {

		if (rx_skbuff) {

			dma_unmap_single(&lp->pci_dev->dev,

					 lp->rx_dma_addr[i],

					 lp->rx_buff_len - 2, DMA_FROM_DEVICE);
@@ -1084,7 +1083,7 @@ static irqreturn_t amd8111e_interrupt(int irq, void *dev_id) 
	unsigned int intr0, intren0;

	unsigned int handled = 1;



	if (unlikely(dev == NULL))

	if (unlikely(!dev))

		return IRQ_NONE;



	spin_lock(&lp->lock);
@@ -1109,7 +1108,7 @@ static irqreturn_t amd8111e_interrupt(int irq, void *dev_id) 
	/* Check if Receive Interrupt has occurred. */

	if (intr0 & RINT0) {

		if (napi_schedule_prep(&lp->napi)) {

			/* Disable receive interupts */

			/* Disable receive interrupts */

			writel(RINTEN0, mmio + INTEN0);

			/* Schedule a polling routine */

			__napi_schedule(&lp->napi);
@@ -1554,7 +1553,7 @@ static int amd8111e_enable_magicpkt(struct amd8111e_priv *lp) 
static int amd8111e_enable_link_change(struct amd8111e_priv *lp)

{



	/* Adapter is already stoped/suspended/interrupt-disabled */

	/* Adapter is already stopped/suspended/interrupt-disabled */

	writel(VAL0 | LCMODE_SW, lp->mmio + CMD7);



	/* To eliminate PCI posting bug */

drivers/net/ethernet/amd/amd8111e.h

+1 −1
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ typedef enum { 
#define CSTATE  1

#define SSTATE  2



/* Assume contoller gets data 10 times the maximum processing time */

/* Assume controller gets data 10 times the maximum processing time */

#define  REPEAT_CNT			10



/* amd8111e descriptor flag definitions */

drivers/net/ethernet/amd/ariadne.c

+2 −2
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static int ariadne_rx(struct net_device *dev) 
			struct sk_buff *skb;



			skb = netdev_alloc_skb(dev, pkt_len + 2);

			if (skb == NULL) {

			if (!skb) {

				for (i = 0; i < RX_RING_SIZE; i++)

					if (lowb(priv->rx_ring[(entry + i) % RX_RING_SIZE]->RMD1) & RF_OWN)

						break;
@@ -731,7 +731,7 @@ static int ariadne_init_one(struct zorro_dev *z, 
	}



	dev = alloc_etherdev(sizeof(struct ariadne_private));

	if (dev == NULL) {

	if (!dev) {

		release_mem_region(base_addr, sizeof(struct Am79C960));

		release_mem_region(mem_start, ARIADNE_RAM_SIZE);

		return -ENOMEM;

drivers/net/ethernet/amd/atarilance.c

+5 −5
Original line number Diff line number Diff line
@@ -854,7 +854,7 @@ static irqreturn_t lance_interrupt( int irq, void *dev_id ) 
	int csr0, boguscnt = 10;

	int handled = 0;



	if (dev == NULL) {

	if (!dev) {

		DPRINTK( 1, ( "lance_interrupt(): interrupt for unknown device.\n" ));

		return IRQ_NONE;

	}
@@ -995,7 +995,7 @@ static int lance_rx( struct net_device *dev ) 
			}

			else {

				skb = netdev_alloc_skb(dev, pkt_len + 2);

				if (skb == NULL) {

				if (!skb) {

					for( i = 0; i < RX_RING_SIZE; i++ )

						if (MEM->rx_head[(entry+i) & RX_RING_MOD_MASK].flag &

							RMD1_OWN_CHIP)