Commit 7fc031e6 authored Oct 04, 2013 by David Cohen Committed by Felipe Balbi Oct 10, 2013

usb: g_ffs: fix compilation warning



If USB_FUNCTIONFS is selected without USB_FUNCTIONFS_ETH and
USB_FUNCTIONFS_RNIS, u_ether.h won't be included and then
USB_ETHERNET_MODULE_PARAMAETERS macro won't be available causing the
following warning compilation:

drivers/usb/gadget/g_ffs.c:81:1: warning: data definition has no type or
storage class [enabled by default]
drivers/usb/gadget/g_ffs.c:81:1: warning: type defaults to ‘int’ in
declaration of ‘USB_ETHERNET_MODULE_PARAMETERS’ [-Wimplicit-int]
drivers/usb/gadget/g_ffs.c:81:1: warning: function declaration isn’t a
prototype [-Wstrict-prototypes]

This patch fixes the warning by making USB_ETHERNET_MODULE_PARAMETERS to
be used iff u_ether.h is included, otherwise it is not needed.

Signed-off-by: David Cohen <david.a.cohen@linux.intel.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

parent 13613c13

drivers/usb/gadget/g_ffs.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -76,7 +76,9 @@ struct gfs_ffs_obj {

	USB_GADGET_COMPOSITE_OPTIONS();		USB_GADGET_COMPOSITE_OPTIONS();

			#if defined CONFIG_USB_FUNCTIONFS_ETH \|\| defined CONFIG_USB_FUNCTIONFS_RNDIS
	USB_ETHERNET_MODULE_PARAMETERS();		USB_ETHERNET_MODULE_PARAMETERS();
			#endif

	static struct usb_device_descriptor gfs_dev_desc = {		static struct usb_device_descriptor gfs_dev_desc = {
	.bLength = sizeof gfs_dev_desc,		.bLength = sizeof gfs_dev_desc,