iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bnx2x: Remove sparse and coccinelle warnings

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

Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Ariel Elior <ariele@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Yuval Mintz 2013-06-25 08:50:11 +03:00 committed by David S. Miller
parent 6da334ee0c
commit c957d09ffd
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
View File

@ -1722,7 +1722,7 @@ static int bnx2x_req_irq(struct bnx2x *bp)
return request_irq(irq, bnx2x_interrupt, flags, bp->dev->name, bp->dev); 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; int rc = 0;
if (bp->flags & USING_MSIX_FLAG && 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 */ /* outer IP header info */
if (xmit_type & XMIT_CSUM_V4) { if (xmit_type & XMIT_CSUM_V4) {
struct iphdr *iph = ip_hdr(skb); 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 = pbd2->fw_ip_csum_wo_len_flags_frag =
bswab16(csum_fold((~iph->check) - bswab16(csum_fold((__force __wsum)csum));
iph->tot_len - iph->frag_off));
} else { } else {
pbd2->fw_ip_hdr_to_payload_w = pbd2->fw_ip_hdr_to_payload_w =
hlen_w - ((sizeof(struct ipv6hdr)) >> 1); hlen_w - ((sizeof(struct ipv6hdr)) >> 1);

8
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
View File

@ -1391,7 +1391,7 @@ static bool bnx2x_is_nvm_accessible(struct bnx2x *bp)
bp->pm_cap + PCI_PM_CTRL, &pm); bp->pm_cap + PCI_PM_CTRL, &pm);
if ((rc && !netif_running(dev)) || 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 false;
return true; 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 = be32_to_cpu(val_be);
val &= ~le32_to_cpu(0xff << BYTE_OFFSET(offset)); val &= ~le32_to_cpu((__force __le32)
val |= le32_to_cpu(*data_buf << BYTE_OFFSET(offset)); (0xff << BYTE_OFFSET(offset)));
val |= le32_to_cpu((__force __le32)
(*data_buf << BYTE_OFFSET(offset)));
rc = bnx2x_nvram_write_dword(bp, align_offset, val, rc = bnx2x_nvram_write_dword(bp, align_offset, val,
cmd_flags); cmd_flags);

2
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
View File

@ -615,7 +615,7 @@ void bnx2x_read_dmae(struct bnx2x *bp, u32 src_addr, u32 len32)
if (rc) { if (rc) {
BNX2X_ERR("DMAE returned failure %d\n", rc); BNX2X_ERR("DMAE returned failure %d\n", rc);
bnx2x_panic(); bnx2x_panic();
}; }
} }
static void bnx2x_write_dmae_phys_len(struct bnx2x *bp, dma_addr_t phys_addr, static void bnx2x_write_dmae_phys_len(struct bnx2x *bp, dma_addr_t phys_addr,