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

Commit c957d09f authored by Yuval Mintz's avatar Yuval Mintz Committed by David S. Miller
Browse files

bnx2x: Remove sparse and coccinelle warnings 



This patch solves several sparse issues as well as an unneeded semicolon
found via coccinelle.

Signed-off-by: default avatarYuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: default avatarDmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: default avatarAriel Elior <ariele@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6da334ee

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+6 −3
Original line number Diff line number Diff line
@@ -1722,7 +1722,7 @@ static int bnx2x_req_irq(struct bnx2x *bp) 
	return request_irq(irq, bnx2x_interrupt, flags, bp->dev->name, bp->dev);

}



int bnx2x_setup_irqs(struct bnx2x *bp)

static int bnx2x_setup_irqs(struct bnx2x *bp)

{

	int rc = 0;

	if (bp->flags & USING_MSIX_FLAG &&
@@ -3543,9 +3543,12 @@ static void bnx2x_update_pbds_gso_enc(struct sk_buff *skb, 
	/* outer IP header info */

	if (xmit_type & XMIT_CSUM_V4) {

		struct iphdr *iph = ip_hdr(skb);

		u16 csum = (__force u16)(~iph->check) -

			   (__force u16)iph->tot_len -

			   (__force u16)iph->frag_off;



		pbd2->fw_ip_csum_wo_len_flags_frag =

			bswab16(csum_fold((~iph->check) -

					  iph->tot_len - iph->frag_off));

			bswab16(csum_fold((__force __wsum)csum));

	} else {

		pbd2->fw_ip_hdr_to_payload_w =

			hlen_w - ((sizeof(struct ipv6hdr)) >> 1);

drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c

+5 −3
Original line number Diff line number Diff line
@@ -1391,7 +1391,7 @@ static bool bnx2x_is_nvm_accessible(struct bnx2x *bp) 
					  bp->pm_cap + PCI_PM_CTRL, &pm);



	if ((rc && !netif_running(dev)) ||

	    (!rc && ((pm & PCI_PM_CTRL_STATE_MASK) != PCI_D0)))

	    (!rc && ((pm & PCI_PM_CTRL_STATE_MASK) != (__force u16)PCI_D0)))

		return false;



	return true;
@@ -1610,8 +1610,10 @@ static int bnx2x_nvram_write1(struct bnx2x *bp, u32 offset, u8 *data_buf, 
		 */

		val = be32_to_cpu(val_be);



		val &= ~le32_to_cpu(0xff << BYTE_OFFSET(offset));

		val |= le32_to_cpu(*data_buf << BYTE_OFFSET(offset));

		val &= ~le32_to_cpu((__force __le32)

				    (0xff << BYTE_OFFSET(offset)));

		val |= le32_to_cpu((__force __le32)

				   (*data_buf << BYTE_OFFSET(offset)));



		rc = bnx2x_nvram_write_dword(bp, align_offset, val,

					     cmd_flags);

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+1 −1
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ void bnx2x_read_dmae(struct bnx2x *bp, u32 src_addr, u32 len32) 
	if (rc) {

		BNX2X_ERR("DMAE returned failure %d\n", rc);

		bnx2x_panic();

	};

	}

}



static void bnx2x_write_dmae_phys_len(struct bnx2x *bp, dma_addr_t phys_addr,