Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755823AbbHYLxP (ORCPT ); Tue, 25 Aug 2015 07:53:15 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:43895 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755786AbbHYLxM (ORCPT ); Tue, 25 Aug 2015 07:53:12 -0400 Message-ID: In-Reply-To: <1440335381-5122-3-git-send-email-ygardi@codeaurora.org> References: <1440335381-5122-1-git-send-email-ygardi@codeaurora.org> <1440335381-5122-3-git-send-email-ygardi@codeaurora.org> Date: Tue, 25 Aug 2015 11:53:11 -0000 Subject: Re: [PATCH v3 2/8] scsi: ufs-qcom: fix compilation warning if compiled as a module From: ygardi@codeaurora.org To: "Yaniv Gardi" Cc: robherring2@gmail.com, james.bottomley@hansenpartnership.com, pebolle@tiscali.nl, hch@infradead.org, linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, linux-arm-msm@vger.kernel.org, santoshsy@gmail.com, linux-scsi-owner@vger.kernel.org, subhashj@codeaurora.org, ygardi@codeaurora.org, gbroner@codeaurora.org, draviv@codeaurora.org, "Vinayak Holikatti" , "James E.J. Bottomley" User-Agent: SquirrelMail/1.4.22-4.el6 MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7BIT X-Priority: 3 (Normal) Importance: Normal Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1660 Lines: 55 Reviewed-by: Akinobu Mita > This change fixes a compilation warning that happens if SCSI_UFS_QCOM > is compiled as a module. > Also this patch fixes an error happens when insmod the module: > "ufs_qcom: module license 'unspecified' taints kernel." > > Signed-off-by: Yaniv Gardi > > --- > drivers/scsi/ufs/ufs-qcom.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c > index 4cdffa4..6c23bbf 100644 > --- a/drivers/scsi/ufs/ufs-qcom.c > +++ b/drivers/scsi/ufs/ufs-qcom.c > @@ -917,12 +917,15 @@ out: > > #define ANDROID_BOOT_DEV_MAX 30 > static char android_boot_dev[ANDROID_BOOT_DEV_MAX]; > -static int get_android_boot_dev(char *str) > + > +#ifndef MODULE > +static int __init get_android_boot_dev(char *str) > { > strlcpy(android_boot_dev, str, ANDROID_BOOT_DEV_MAX); > return 1; > } > __setup("androidboot.bootdevice=", get_android_boot_dev); > +#endif > > /** > * ufs_qcom_init - bind phy with controller > @@ -1047,3 +1050,5 @@ static const struct ufs_hba_variant_ops > ufs_hba_qcom_vops = { > .resume = ufs_qcom_resume, > }; > EXPORT_SYMBOL(ufs_hba_qcom_vops); > + > +MODULE_LICENSE("GPL v2"); > -- > 1.8.5.2 > > -- > QUALCOMM ISRAEL, on behalf of Qualcomm Innovation Center, Inc. is a member > of Code Aurora Forum, hosted by The Linux Foundation > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/