Commit 62555582 authored May 10, 2014 by Randy Dunlap Committed by David S. Miller May 13, 2014

bnx2x: fix build when BNX2X_SRIOV is not enabled

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]

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Ariel Elior <ariele@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent b62cb8d9

drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -571,7 +571,7 @@ static inline void __iomem bnx2x_vf_doorbells(struct bnx2x bp)
	return NULL;		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 int bnx2x_vf_pci_alloc(struct bnx2x *bp) {return 0; }
	static inline void bnx2x_pf_set_vfs_vlan(struct bnx2x *bp) {}		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; }		static inline int bnx2x_sriov_configure(struct pci_dev *dev, int num_vfs) {return 0; }