From patchwork Fri Aug 16 15:27:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Porter X-Patchwork-Id: 19243 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f71.google.com (mail-yh0-f71.google.com [209.85.213.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0F64B25A1B for ; Fri, 16 Aug 2013 15:28:03 +0000 (UTC) Received: by mail-yh0-f71.google.com with SMTP id f64sf862638yha.6 for ; Fri, 16 Aug 2013 08:28:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:delivered-to:sender:from:to:cc:subject:date:message-id :in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=YKrTxxKfW2XCljtxkoMyG4ehlA5iGD004Xn4bmONUSA=; b=x35d2ZPi01ZNWcmwkXh6bwyoIv1sTEjxbStSP4RxdrEwAIX507NNASEnOJNu9Ns4Mm 9wQx7KJKc1IUU5jC6Vf4KLhrwmO64RMaHTfv0vOWWCUqwlOHhGJmhwAD94u6jlOxGtPH FDxp9p6uYiVVfq7f3q+1BAZCMgCPckJsurL8Ag86/pDM5VUK0vbIMmVTqqu2b8dnc4pB Bt2EQS7j7Te/zIN5dH5ykPIeQErLT41Mt010oOHQ1rE84idlSHfFxwIsERTfxRErjWke Ib4TXd3du1fdmothWDbbfdmRK9VE1X76jYFilkqe7Z7mPktDYktlZijCoz02ghcOTwpQ 3eQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-gm-message-state:delivered-to:sender:from:to:cc :subject:date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=YKrTxxKfW2XCljtxkoMyG4ehlA5iGD004Xn4bmONUSA=; b=kvSNp9x78VNAhim/vj22yxmxj/LX2fTpN/IWd3rVRIORcTjXTyo7+VkrhmvnU/JDfI HSr0aiVSLd3OKFK5NiBxD16NVqQRMubXXauIKpW1wSNAx8Y/nfWv+wkABIfNhSRSVAui zBwGl4Cn0MuEZ17un56Jd7+sOkQyzeyW8XHvieMC0wQFXX/zqecxRrDHW/2c62exjjFs BnVUtezvxny9jx+9DoIExZM0mitgOrW4AXYTYQfvJmIsgtRHuz2dWwBg/a5HppMlNXe3 ArPjE+i4nQ7s6NhcwHXP9RwiDlb2NkHmt+2IoglYjdXAi6CGW35oqHQPGLVD0DtVwvAB wpqw== X-Received: by 10.236.153.39 with SMTP id e27mr663631yhk.14.1376666882759; Fri, 16 Aug 2013 08:28:02 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.118.136 with SMTP id km8ls825183qeb.32.gmail; Fri, 16 Aug 2013 08:28:02 -0700 (PDT) X-Received: by 10.52.164.16 with SMTP id ym16mr666084vdb.32.1376666882624; Fri, 16 Aug 2013 08:28:02 -0700 (PDT) Received: from mail-vb0-x22f.google.com (mail-vb0-x22f.google.com [2607:f8b0:400c:c02::22f]) by mx.google.com with ESMTPS id h4si437569vdw.58.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 16 Aug 2013 08:28:02 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::22f is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::22f; Received: by mail-vb0-f47.google.com with SMTP id h10so1693862vbh.6 for ; Fri, 16 Aug 2013 08:28:02 -0700 (PDT) X-Gm-Message-State: ALoCoQkTDtS5/ZReHHAYz3jcpWzjHwRp/UvmnnN7xZZAOB3jRNEJQzbnbnjFpe8Ks6hokBpCX+TS X-Received: by 10.52.227.6 with SMTP id rw6mr1465475vdc.19.1376666882514; Fri, 16 Aug 2013 08:28:02 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp74617vcz; Fri, 16 Aug 2013 08:28:02 -0700 (PDT) X-Received: by 10.182.143.5 with SMTP id sa5mr200690obb.80.1376666881697; Fri, 16 Aug 2013 08:28:01 -0700 (PDT) Received: from mail-ie0-x234.google.com (mail-ie0-x234.google.com [2607:f8b0:4001:c03::234]) by mx.google.com with ESMTPS id i3si1138962obz.107.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 16 Aug 2013 08:28:01 -0700 (PDT) Received-SPF: pass (google.com: domain of ohiomdp@gmail.com designates 2607:f8b0:4001:c03::234 as permitted sender) client-ip=2607:f8b0:4001:c03::234; Received: by mail-ie0-f180.google.com with SMTP id aq17so3629581iec.11 for ; Fri, 16 Aug 2013 08:28:01 -0700 (PDT) X-Received: by 10.43.15.68 with SMTP id pt4mr1117326icb.35.1376666881177; Fri, 16 Aug 2013 08:28:01 -0700 (PDT) Received: from beef.ohporter.com (cpe-98-27-254-98.neo.res.rr.com. [98.27.254.98]) by mx.google.com with ESMTPSA id ri1sm2161650igc.2.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 16 Aug 2013 08:28:00 -0700 (PDT) Sender: Matt Porter From: Matt Porter To: Felipe Balbi Cc: Greg Kroah-Hartman , Linux USB List , Linux Kernel Mailing List , Linaro Patches 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 Message-Id: <1376666868-32581-2-git-send-email-matt.porter@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1376666868-32581-1-git-send-email-matt.porter@linaro.org> References: <1376666868-32581-1-git-send-email-matt.porter@linaro.org> X-Original-Sender: matt.porter@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::22f is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=pass header.i=@gmail.com Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 --- 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,