aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVarsha Rao <rvarsha016@gmail.com>2018-06-03 07:49:52 -0400
committerDavid S. Miller <davem@davemloft.net>2018-06-04 17:07:27 -0400
commitb8aac410b76058bc00fff9398d273566fac921cf (patch)
treef98ff30e4915406ee6d0162b52387c536e8b5381
parent6dc5aa212321c87a79746980eb258912bcf352ba (diff)
net: ethernet: bnx2: Replace NULL comparison
This patch fixes the checkpatch issue of NULL comparison. Replace x == NULL with !x, by using the following coccinelle script: @disable is_null@ expression e; @@ -e==NULL +!e Signed-off-by: Varsha Rao <rvarsha016@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/broadcom/bnx2.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 2306523778d4..3853296d78c1 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -384,7 +384,7 @@ static int bnx2_register_cnic(struct net_device *dev, struct cnic_ops *ops,
384 struct bnx2 *bp = netdev_priv(dev); 384 struct bnx2 *bp = netdev_priv(dev);
385 struct cnic_eth_dev *cp = &bp->cnic_eth_dev; 385 struct cnic_eth_dev *cp = &bp->cnic_eth_dev;
386 386
387 if (ops == NULL) 387 if (!ops)
388 return -EINVAL; 388 return -EINVAL;
389 389
390 if (cp->drv_state & CNIC_DRV_STATE_REGD) 390 if (cp->drv_state & CNIC_DRV_STATE_REGD)
@@ -755,13 +755,13 @@ bnx2_alloc_tx_mem(struct bnx2 *bp)
755 struct bnx2_tx_ring_info *txr = &bnapi->tx_ring; 755 struct bnx2_tx_ring_info *txr = &bnapi->tx_ring;
756 756
757 txr->tx_buf_ring = kzalloc(SW_TXBD_RING_SIZE, GFP_KERNEL); 757 txr->tx_buf_ring = kzalloc(SW_TXBD_RING_SIZE, GFP_KERNEL);
758 if (txr->tx_buf_ring == NULL) 758 if (!txr->tx_buf_ring)
759 return -ENOMEM; 759 return -ENOMEM;
760 760
761 txr->tx_desc_ring = 761 txr->tx_desc_ring =
762 dma_alloc_coherent(&bp->pdev->dev, TXBD_RING_SIZE, 762 dma_alloc_coherent(&bp->pdev->dev, TXBD_RING_SIZE,
763 &txr->tx_desc_mapping, GFP_KERNEL); 763 &txr->tx_desc_mapping, GFP_KERNEL);
764 if (txr->tx_desc_ring == NULL) 764 if (!txr->tx_desc_ring)
765 return -ENOMEM; 765 return -ENOMEM;
766 } 766 }
767 return 0; 767 return 0;
@@ -779,7 +779,7 @@ bnx2_alloc_rx_mem(struct bnx2 *bp)
779 779
780 rxr->rx_buf_ring = 780 rxr->rx_buf_ring =
781 vzalloc(SW_RXBD_RING_SIZE * bp->rx_max_ring); 781 vzalloc(SW_RXBD_RING_SIZE * bp->rx_max_ring);
782 if (rxr->rx_buf_ring == NULL) 782 if (!rxr->rx_buf_ring)
783 return -ENOMEM; 783 return -ENOMEM;
784 784
785 for (j = 0; j < bp->rx_max_ring; j++) { 785 for (j = 0; j < bp->rx_max_ring; j++) {
@@ -788,7 +788,7 @@ bnx2_alloc_rx_mem(struct bnx2 *bp)
788 RXBD_RING_SIZE, 788 RXBD_RING_SIZE,
789 &rxr->rx_desc_mapping[j], 789 &rxr->rx_desc_mapping[j],
790 GFP_KERNEL); 790 GFP_KERNEL);
791 if (rxr->rx_desc_ring[j] == NULL) 791 if (!rxr->rx_desc_ring[j])
792 return -ENOMEM; 792 return -ENOMEM;
793 793
794 } 794 }
@@ -796,7 +796,7 @@ bnx2_alloc_rx_mem(struct bnx2 *bp)
796 if (bp->rx_pg_ring_size) { 796 if (bp->rx_pg_ring_size) {
797 rxr->rx_pg_ring = vzalloc(SW_RXPG_RING_SIZE * 797 rxr->rx_pg_ring = vzalloc(SW_RXPG_RING_SIZE *
798 bp->rx_max_pg_ring); 798 bp->rx_max_pg_ring);
799 if (rxr->rx_pg_ring == NULL) 799 if (!rxr->rx_pg_ring)
800 return -ENOMEM; 800 return -ENOMEM;
801 801
802 } 802 }
@@ -807,7 +807,7 @@ bnx2_alloc_rx_mem(struct bnx2 *bp)
807 RXBD_RING_SIZE, 807 RXBD_RING_SIZE,
808 &rxr->rx_pg_desc_mapping[j], 808 &rxr->rx_pg_desc_mapping[j],
809 GFP_KERNEL); 809 GFP_KERNEL);
810 if (rxr->rx_pg_desc_ring[j] == NULL) 810 if (!rxr->rx_pg_desc_ring[j])
811 return -ENOMEM; 811 return -ENOMEM;
812 812
813 } 813 }
@@ -845,7 +845,7 @@ bnx2_alloc_stats_blk(struct net_device *dev)
845 sizeof(struct statistics_block); 845 sizeof(struct statistics_block);
846 status_blk = dma_zalloc_coherent(&bp->pdev->dev, bp->status_stats_size, 846 status_blk = dma_zalloc_coherent(&bp->pdev->dev, bp->status_stats_size,
847 &bp->status_blk_mapping, GFP_KERNEL); 847 &bp->status_blk_mapping, GFP_KERNEL);
848 if (status_blk == NULL) 848 if (!status_blk)
849 return -ENOMEM; 849 return -ENOMEM;
850 850
851 bp->status_blk = status_blk; 851 bp->status_blk = status_blk;
@@ -914,7 +914,7 @@ bnx2_alloc_mem(struct bnx2 *bp)
914 BNX2_PAGE_SIZE, 914 BNX2_PAGE_SIZE,
915 &bp->ctx_blk_mapping[i], 915 &bp->ctx_blk_mapping[i],
916 GFP_KERNEL); 916 GFP_KERNEL);
917 if (bp->ctx_blk[i] == NULL) 917 if (!bp->ctx_blk[i])
918 goto alloc_mem_err; 918 goto alloc_mem_err;
919 } 919 }
920 } 920 }
@@ -2667,7 +2667,7 @@ bnx2_alloc_bad_rbuf(struct bnx2 *bp)
2667 u32 val; 2667 u32 val;
2668 2668
2669 good_mbuf = kmalloc(512 * sizeof(u16), GFP_KERNEL); 2669 good_mbuf = kmalloc(512 * sizeof(u16), GFP_KERNEL);
2670 if (good_mbuf == NULL) 2670 if (!good_mbuf)
2671 return -ENOMEM; 2671 return -ENOMEM;
2672 2672
2673 BNX2_WR(bp, BNX2_MISC_ENABLE_SET_BITS, 2673 BNX2_WR(bp, BNX2_MISC_ENABLE_SET_BITS,
@@ -3225,7 +3225,7 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)
3225 3225
3226 if (len <= bp->rx_copy_thresh) { 3226 if (len <= bp->rx_copy_thresh) {
3227 skb = netdev_alloc_skb(bp->dev, len + 6); 3227 skb = netdev_alloc_skb(bp->dev, len + 6);
3228 if (skb == NULL) { 3228 if (!skb) {
3229 bnx2_reuse_rx_data(bp, rxr, data, sw_ring_cons, 3229 bnx2_reuse_rx_data(bp, rxr, data, sw_ring_cons,
3230 sw_ring_prod); 3230 sw_ring_prod);
3231 goto next_rx; 3231 goto next_rx;
@@ -4561,7 +4561,7 @@ bnx2_nvram_write(struct bnx2 *bp, u32 offset, u8 *data_buf,
4561 4561
4562 if (align_start || align_end) { 4562 if (align_start || align_end) {
4563 align_buf = kmalloc(len32, GFP_KERNEL); 4563 align_buf = kmalloc(len32, GFP_KERNEL);
4564 if (align_buf == NULL) 4564 if (!align_buf)
4565 return -ENOMEM; 4565 return -ENOMEM;
4566 if (align_start) { 4566 if (align_start) {
4567 memcpy(align_buf, start, 4); 4567 memcpy(align_buf, start, 4);
@@ -4575,7 +4575,7 @@ bnx2_nvram_write(struct bnx2 *bp, u32 offset, u8 *data_buf,
4575 4575
4576 if (!(bp->flash_info->flags & BNX2_NV_BUFFERED)) { 4576 if (!(bp->flash_info->flags & BNX2_NV_BUFFERED)) {
4577 flash_buffer = kmalloc(264, GFP_KERNEL); 4577 flash_buffer = kmalloc(264, GFP_KERNEL);
4578 if (flash_buffer == NULL) { 4578 if (!flash_buffer) {
4579 rc = -ENOMEM; 4579 rc = -ENOMEM;
4580 goto nvram_write_end; 4580 goto nvram_write_end;
4581 } 4581 }
@@ -5440,7 +5440,7 @@ bnx2_free_tx_skbs(struct bnx2 *bp)
5440 struct bnx2_tx_ring_info *txr = &bnapi->tx_ring; 5440 struct bnx2_tx_ring_info *txr = &bnapi->tx_ring;
5441 int j; 5441 int j;
5442 5442
5443 if (txr->tx_buf_ring == NULL) 5443 if (!txr->tx_buf_ring)
5444 continue; 5444 continue;
5445 5445
5446 for (j = 0; j < BNX2_TX_DESC_CNT; ) { 5446 for (j = 0; j < BNX2_TX_DESC_CNT; ) {
@@ -5448,7 +5448,7 @@ bnx2_free_tx_skbs(struct bnx2 *bp)
5448 struct sk_buff *skb = tx_buf->skb; 5448 struct sk_buff *skb = tx_buf->skb;
5449 int k, last; 5449 int k, last;
5450 5450
5451 if (skb == NULL) { 5451 if (!skb) {
5452 j = BNX2_NEXT_TX_BD(j); 5452 j = BNX2_NEXT_TX_BD(j);
5453 continue; 5453 continue;
5454 } 5454 }
@@ -5485,14 +5485,14 @@ bnx2_free_rx_skbs(struct bnx2 *bp)
5485 struct bnx2_rx_ring_info *rxr = &bnapi->rx_ring; 5485 struct bnx2_rx_ring_info *rxr = &bnapi->rx_ring;
5486 int j; 5486 int j;
5487 5487
5488 if (rxr->rx_buf_ring == NULL) 5488 if (!rxr->rx_buf_ring)
5489 return; 5489 return;
5490 5490
5491 for (j = 0; j < bp->rx_max_ring_idx; j++) { 5491 for (j = 0; j < bp->rx_max_ring_idx; j++) {
5492 struct bnx2_sw_bd *rx_buf = &rxr->rx_buf_ring[j]; 5492 struct bnx2_sw_bd *rx_buf = &rxr->rx_buf_ring[j];
5493 u8 *data = rx_buf->data; 5493 u8 *data = rx_buf->data;
5494 5494
5495 if (data == NULL) 5495 if (!data)
5496 continue; 5496 continue;
5497 5497
5498 dma_unmap_single(&bp->pdev->dev, 5498 dma_unmap_single(&bp->pdev->dev,
@@ -6826,7 +6826,7 @@ bnx2_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *net_stats)
6826{ 6826{
6827 struct bnx2 *bp = netdev_priv(dev); 6827 struct bnx2 *bp = netdev_priv(dev);
6828 6828
6829 if (bp->stats_blk == NULL) 6829 if (!bp->stats_blk)
6830 return; 6830 return;
6831 6831
6832 net_stats->rx_packets = 6832 net_stats->rx_packets =
@@ -7217,7 +7217,7 @@ bnx2_get_eeprom_len(struct net_device *dev)
7217{ 7217{
7218 struct bnx2 *bp = netdev_priv(dev); 7218 struct bnx2 *bp = netdev_priv(dev);
7219 7219
7220 if (bp->flash_info == NULL) 7220 if (!bp->flash_info)
7221 return 0; 7221 return 0;
7222 7222
7223 return (int) bp->flash_size; 7223 return (int) bp->flash_size;
@@ -7678,7 +7678,7 @@ bnx2_get_ethtool_stats(struct net_device *dev,
7678 u32 *temp_stats = (u32 *) bp->temp_stats_blk; 7678 u32 *temp_stats = (u32 *) bp->temp_stats_blk;
7679 u8 *stats_len_arr = NULL; 7679 u8 *stats_len_arr = NULL;
7680 7680
7681 if (hw_stats == NULL) { 7681 if (!hw_stats) {
7682 memset(buf, 0, sizeof(u64) * BNX2_NUM_STATS); 7682 memset(buf, 0, sizeof(u64) * BNX2_NUM_STATS);
7683 return; 7683 return;
7684 } 7684 }
@@ -8121,7 +8121,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
8121 bp->temp_stats_blk = 8121 bp->temp_stats_blk =
8122 kzalloc(sizeof(struct statistics_block), GFP_KERNEL); 8122 kzalloc(sizeof(struct statistics_block), GFP_KERNEL);
8123 8123
8124 if (bp->temp_stats_blk == NULL) { 8124 if (!bp->temp_stats_blk) {
8125 rc = -ENOMEM; 8125 rc = -ENOMEM;
8126 goto err_out; 8126 goto err_out;
8127 } 8127 }