Skip to contentSkip to conversation

bnx2x: fix build when BNX2X_SRIOV is not enabled

PATCH Applied Randy Dunlap 2 participants 2 messages May 10, 2014 – May 13, 2014

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bnx2x: fix build when BNX2X_SRIOV is not enabled

From: Randy Dunlap <[email protected]>

Fix build when BNX2X_SRIOV is not enabled.
Change one parameter struct from bnx2 to bnx2x and don't return a value from a void function.

drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h:576:48: warning: 'struct bnx2' declared inside parameter list [enabled by default] drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h:576:48: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]

drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h:576:60: warning: 'return' with a value, in function returning void [enabled by default]

---
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Found in linux-next and mmotm.

drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h +1 -1
@@ -571,7 +571,7 @@ static inline void __iomem *bnx2x_vf_doo
 	return NULL;
 }
 
-static inline void bnx2x_vf_pci_dealloc(struct bnx2 *bp) {return 0; }
+static inline void bnx2x_vf_pci_dealloc(struct bnx2x *bp) {}
 static inline int bnx2x_vf_pci_alloc(struct bnx2x *bp) {return 0; }
 static inline void bnx2x_pf_set_vfs_vlan(struct bnx2x *bp) {}
 static inline int bnx2x_sriov_configure(struct pci_dev *dev, int num_vfs) {return 0; }
maintainer Applied
#1 lore raw

From: Randy Dunlap <[email protected]>
Date: Sat, 10 May 2014 11:33:54 -0700

Quoted 6 lines

From: Randy Dunlap <[email protected]>

Fix build when BNX2X_SRIOV is not enabled.
Change one parameter struct from bnx2 to bnx2x and don't return a value from a void function.

Quoted 6 lines

drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h:576:48: warning: 'struct bnx2' declared inside parameter list [enabled by default] drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h:576:48: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]

drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h:576:60: warning: 'return' with a value, in function returning void [enabled by default]

Applied, thanks Randy.