netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] bnx2x: fix build when BNX2X_SRIOV is not enabled
@ 2014-05-10 18:33 Randy Dunlap
  2014-05-13 17:09 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Randy Dunlap @ 2014-05-10 18:33 UTC (permalink / raw)
  To: netdev@vger.kernel.org, David Miller; +Cc: Ariel Elior

From: Randy Dunlap <rdunlap@infradead.org>

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>
---
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Found in linux-next and mmotm.

--- mmotm-2014-0509-1617.orig/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h
+++ mmotm-2014-0509-1617/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h
@@ -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; }

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] bnx2x: fix build when BNX2X_SRIOV is not enabled
  2014-05-10 18:33 [PATCH] bnx2x: fix build when BNX2X_SRIOV is not enabled Randy Dunlap
@ 2014-05-13 17:09 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2014-05-13 17:09 UTC (permalink / raw)
  To: rdunlap; +Cc: netdev, ariele

From: Randy Dunlap <rdunlap@infradead.org>
Date: Sat, 10 May 2014 11:33:54 -0700

> From: Randy Dunlap <rdunlap@infradead.org>
> 
> 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>

Applied, thanks Randy.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-05-13 17:09 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-10 18:33 [PATCH] bnx2x: fix build when BNX2X_SRIOV is not enabled Randy Dunlap
2014-05-13 17:09 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).