Skip to content
This repository has been archived by the owner on Nov 21, 2022. It is now read-only.

Commit

Permalink
Merge branch 'net-amd-static-checker-warnings'
Browse files Browse the repository at this point in the history 
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: David S. Miller <[email protected]>
  • Loading branch information
@davem330
davem330 committed Sep 16, 2022
2 parents 454e7b1 + 78923e8 commit 3b63ef7
Show file tree
Hide file tree
Showing 11 changed files with 55 additions and 56 deletions.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/amd/a2065.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
45 changes: 22 additions & 23 deletions drivers/net/ethernet/amd/amd8111e.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -185,24 +185,23 @@ 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 |
ADVERTISE_100HALF | ADVERTISE_100FULL);
break;
case SPEED10_HALF:
tmp |= ADVERTISE_10HALF;
break;
case SPEED10_FULL:
tmp |= ADVERTISE_10FULL;
break;
case SPEED100_HALF:
tmp |= ADVERTISE_100HALF;
break;
case SPEED100_FULL:
tmp |= ADVERTISE_100FULL;
break;
default:
case SPEED_AUTONEG: /* advertise all values */
tmp |= (ADVERTISE_10HALF | ADVERTISE_10FULL |
ADVERTISE_100HALF | ADVERTISE_100FULL);
break;
case SPEED10_HALF:
tmp |= ADVERTISE_10HALF;
break;
case SPEED10_FULL:
tmp |= ADVERTISE_10FULL;
break;
case SPEED100_HALF:
tmp |= ADVERTISE_100HALF;
break;
case SPEED100_FULL:
tmp |= ADVERTISE_100FULL;
break;
}

if(advert != tmp)
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/amd/amd8111e.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/amd/ariadne.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions drivers/net/ethernet/amd/atarilance.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -581,15 +581,15 @@ static unsigned long __init lance_probe1( struct net_device *dev,

/* Get the ethernet address */
switch( lp->cardtype ) {
case OLD_RIEBL:
case OLD_RIEBL:
/* No ethernet address! (Set some default address) */
eth_hw_addr_set(dev, OldRieblDefHwaddr);
break;
case NEW_RIEBL:
case NEW_RIEBL:
lp->memcpy_f(addr, RIEBL_HWADDR_ADDR, ETH_ALEN);
eth_hw_addr_set(dev, addr);
break;
case PAM_CARD:
case PAM_CARD:
i = IO->eeprom;
for( i = 0; i < 6; ++i )
addr[i] =
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions drivers/net/ethernet/amd/au1000_eth.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,7 @@ static int au1000_rx(struct net_device *dev)
frmlen = (status & RX_FRAME_LEN_MASK);
frmlen -= 4; /* Remove FCS */
skb = netdev_alloc_skb(dev, frmlen + 2);
if (skb == NULL) {
if (!skb) {
dev->stats.rx_dropped++;
continue;
}
Expand Down Expand Up @@ -1199,7 +1199,7 @@ static int au1000_probe(struct platform_device *pdev)
}

aup->mii_bus = mdiobus_alloc();
if (aup->mii_bus == NULL) {
if (!aup->mii_bus) {
dev_err(&pdev->dev, "failed to allocate mdiobus structure\n");
err = -ENOMEM;
goto err_mdiobus_alloc;
Expand Down Expand Up @@ -1284,7 +1284,7 @@ static int au1000_probe(struct platform_device *pdev)
return 0;

err_out:
if (aup->mii_bus != NULL)
if (aup->mii_bus)
mdiobus_unregister(aup->mii_bus);

/* here we should have a valid dev plus aup-> register addresses
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/amd/lance.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,7 @@ lance_init_ring(struct net_device *dev, gfp_t gfp)
rx_buff = skb->data;
else
rx_buff = kmalloc(PKT_BUF_SZ, GFP_DMA | gfp);
if (rx_buff == NULL)
if (!rx_buff)
lp->rx_ring[i].base = 0;
else
lp->rx_ring[i].base = (u32)isa_virt_to_bus(rx_buff) | 0x80000000;
Expand Down Expand Up @@ -1186,7 +1186,7 @@ lance_rx(struct net_device *dev)
else
{
skb = dev_alloc_skb(pkt_len+2);
if (skb == NULL)
if (!skb)
{
printk("%s: Memory squeeze, deferring packet.\n", dev->name);
for (i=0; i < RX_RING_SIZE; i++)
Expand Down
18 changes: 9 additions & 9 deletions drivers/net/ethernet/amd/nmclan_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,10 +485,10 @@ static int mace_read(mace_private *lp, unsigned int ioaddr, int reg)
unsigned long flags;

switch (reg >> 4) {
case 0: /* register 0-15 */
case 0: /* register 0-15 */
data = inb(ioaddr + AM2150_MACE_BASE + reg);
break;
case 1: /* register 16-31 */
case 1: /* register 16-31 */
spin_lock_irqsave(&lp->bank_lock, flags);
MACEBANK(1);
data = inb(ioaddr + AM2150_MACE_BASE + (reg & 0x0F));
Expand All @@ -512,10 +512,10 @@ static void mace_write(mace_private *lp, unsigned int ioaddr, int reg,
unsigned long flags;

switch (reg >> 4) {
case 0: /* register 0-15 */
case 0: /* register 0-15 */
outb(data & 0xFF, ioaddr + AM2150_MACE_BASE + reg);
break;
case 1: /* register 16-31 */
case 1: /* register 16-31 */
spin_lock_irqsave(&lp->bank_lock, flags);
MACEBANK(1);
outb(data & 0xFF, ioaddr + AM2150_MACE_BASE + (reg & 0x0F));
Expand Down Expand Up @@ -567,13 +567,13 @@ static int mace_init(mace_private *lp, unsigned int ioaddr,
* Or just set ASEL in PHYCC below!
*/
switch (if_port) {
case 1:
case 1:
mace_write(lp, ioaddr, MACE_PLSCC, 0x02);
break;
case 2:
case 2:
mace_write(lp, ioaddr, MACE_PLSCC, 0x00);
break;
default:
default:
mace_write(lp, ioaddr, MACE_PHYCC, /* ASEL */ 4);
/* ASEL Auto Select. When set, the PORTSEL[1-0] bits are overridden,
and the MACE device will automatically select the operating media
Expand Down Expand Up @@ -918,7 +918,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id)
int status;
int IntrCnt = MACE_MAX_IR_ITERATIONS;

if (dev == NULL) {
if (!dev) {
pr_debug("mace_interrupt(): irq 0x%X for unknown device.\n",
irq);
return IRQ_NONE;
Expand Down Expand Up @@ -1102,7 +1102,7 @@ static int mace_rx(struct net_device *dev, unsigned char RxCnt)

skb = netdev_alloc_skb(dev, pkt_len + 2);

if (skb != NULL) {
if (skb) {
skb_reserve(skb, 2);
insw(ioaddr + AM2150_RCV, skb_put(skb, pkt_len), pkt_len>>1);
if (pkt_len & 1)
Expand Down
12 changes: 6 additions & 6 deletions drivers/net/ethernet/amd/pcnet32.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ static void pcnet32_realloc_tx_ring(struct net_device *dev,
dma_alloc_coherent(&lp->pci_dev->dev,
sizeof(struct pcnet32_tx_head) * entries,
&new_ring_dma_addr, GFP_ATOMIC);
if (new_tx_ring == NULL)
if (!new_tx_ring)
return;

new_dma_addr_list = kcalloc(entries, sizeof(dma_addr_t), GFP_ATOMIC);
Expand Down Expand Up @@ -547,7 +547,7 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev,
dma_alloc_coherent(&lp->pci_dev->dev,
sizeof(struct pcnet32_rx_head) * entries,
&new_ring_dma_addr, GFP_ATOMIC);
if (new_rx_ring == NULL)
if (!new_rx_ring)
return;

new_dma_addr_list = kcalloc(entries, sizeof(dma_addr_t), GFP_ATOMIC);
Expand Down Expand Up @@ -1249,7 +1249,7 @@ static void pcnet32_rx_entry(struct net_device *dev,
} else
skb = netdev_alloc_skb(dev, pkt_len + NET_IP_ALIGN);

if (skb == NULL) {
if (!skb) {
dev->stats.rx_dropped++;
return;
}
Expand Down Expand Up @@ -2018,15 +2018,15 @@ static int pcnet32_alloc_ring(struct net_device *dev, const char *name)
lp->tx_ring = dma_alloc_coherent(&lp->pci_dev->dev,
sizeof(struct pcnet32_tx_head) * lp->tx_ring_size,
&lp->tx_ring_dma_addr, GFP_KERNEL);
if (lp->tx_ring == NULL) {
if (!lp->tx_ring) {
netif_err(lp, drv, dev, "Coherent memory allocation failed\n");
return -ENOMEM;
}

lp->rx_ring = dma_alloc_coherent(&lp->pci_dev->dev,
sizeof(struct pcnet32_rx_head) * lp->rx_ring_size,
&lp->rx_ring_dma_addr, GFP_KERNEL);
if (lp->rx_ring == NULL) {
if (!lp->rx_ring) {
netif_err(lp, drv, dev, "Coherent memory allocation failed\n");
return -ENOMEM;
}
Expand Down Expand Up @@ -2365,7 +2365,7 @@ static int pcnet32_init_ring(struct net_device *dev)

for (i = 0; i < lp->rx_ring_size; i++) {
struct sk_buff *rx_skbuff = lp->rx_skbuff[i];
if (rx_skbuff == NULL) {
if (!rx_skbuff) {
lp->rx_skbuff[i] = netdev_alloc_skb(dev, PKT_BUF_SKB);
rx_skbuff = lp->rx_skbuff[i];
if (!rx_skbuff) {
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/amd/sun3lance.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ static int __init lance_probe( struct net_device *dev)

/* XXX - leak? */
MEM = dvma_malloc_align(sizeof(struct lance_memory), 0x10000);
if (MEM == NULL) {
if (!MEM) {
#ifdef CONFIG_SUN3
iounmap((void __iomem *)ioaddr);
#endif
Expand Down Expand Up @@ -796,7 +796,7 @@ static int lance_rx( struct net_device *dev )
}
else {
skb = netdev_alloc_skb(dev, pkt_len + 2);
if (skb == NULL) {
if (!skb) {
dev->stats.rx_dropped++;
head->msg_length = 0;
head->flag |= RMD1_OWN_CHIP;
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/amd/sunlance.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ static void lance_rx_dvma(struct net_device *dev)
len = (rd->mblength & 0xfff) - 4;
skb = netdev_alloc_skb(dev, len + 2);

if (skb == NULL) {
if (!skb) {
dev->stats.rx_dropped++;
rd->mblength = 0;
rd->rmd1_bits = LE_R1_OWN;
Expand Down Expand Up @@ -700,7 +700,7 @@ static void lance_rx_pio(struct net_device *dev)
len = (sbus_readw(&rd->mblength) & 0xfff) - 4;
skb = netdev_alloc_skb(dev, len + 2);

if (skb == NULL) {
if (!skb) {
dev->stats.rx_dropped++;
sbus_writew(0, &rd->mblength);
sbus_writeb(LE_R1_OWN, &rd->rmd1_bits);
Expand Down

0 comments on commit 3b63ef7

Please sign in to comment.