From: Matt Porter <matt.porter@linaro.org>
To: Felipe Balbi <balbi@ti.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Linux USB List <linux-usb@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linaro Patches <patches@linaro.org>
Subject: [PATCH 1/2] usb: gadget: ffs: fix eth module parameters warning in pure-only config
Date: Fri, 16 Aug 2013 11:27:47 -0400 [thread overview]
Message-ID: <1376666868-32581-2-git-send-email-matt.porter@linaro.org> (raw)
In-Reply-To: <1376666868-32581-1-git-send-email-matt.porter@linaro.org>
Fixes the build warning spewed out by USB_ETHERNET_MODULE_PARAMETERS()
which was unconditionally included even when ethernet configs are
disabled.
Signed-off-by: Matt Porter <matt.porter@linaro.org>
---
drivers/usb/gadget/g_ffs.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/usb/gadget/g_ffs.c b/drivers/usb/gadget/g_ffs.c
index 5327c82..686b776 100644
--- a/drivers/usb/gadget/g_ffs.c
+++ b/drivers/usb/gadget/g_ffs.c
@@ -45,6 +45,7 @@ static struct eth_dev *the_dev;
static int eth_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN],
struct eth_dev *dev);
# endif
+USB_ETHERNET_MODULE_PARAMETERS();
#else
# define the_dev NULL
# define gether_cleanup(dev) do { } while (0)
@@ -76,8 +77,6 @@ struct gfs_ffs_obj {
USB_GADGET_COMPOSITE_OPTIONS();
-USB_ETHERNET_MODULE_PARAMETERS();
-
static struct usb_device_descriptor gfs_dev_desc = {
.bLength = sizeof gfs_dev_desc,
.bDescriptorType = USB_DT_DEVICE,
--
1.7.9.5
next prev parent reply other threads:[~2013-08-16 15:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-16 15:27 [PATCH 0/2] g_ffs CDC ACM support Matt Porter
2013-08-16 15:27 ` Matt Porter [this message]
2013-08-16 15:27 ` [PATCH 2/2] usb: gadget: ffs: add ACM + FunctionFS configuration Matt Porter
2013-08-16 15:32 ` Felipe Balbi
2013-08-16 15:48 ` Matt Porter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1376666868-32581-2-git-send-email-matt.porter@linaro.org \
--to=matt.porter@linaro.org \
--cc=balbi@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=patches@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.