linux-scsi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yaniv Gardi <ygardi@codeaurora.org>
To: robherring2@gmail.com, James.Bottomley@HansenPartnership.com,
	pebolle@tiscali.nl, hch@infradead.org
Cc: 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 <vinholikatti@gmail.com>,
	"James E.J. Bottomley" <JBottomley@odin.com>
Subject: [PATCH v3 2/8] scsi: ufs-qcom: fix compilation warning if compiled as a module
Date: Sun, 23 Aug 2015 16:09:35 +0300	[thread overview]
Message-ID: <1440335381-5122-3-git-send-email-ygardi@codeaurora.org> (raw)
In-Reply-To: <1440335381-5122-1-git-send-email-ygardi@codeaurora.org>

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 <ygardi@codeaurora.org>

---
 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

  parent reply	other threads:[~2015-08-23 13:09 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-23 13:09 [PATCH v2 0/8] Fix error message and present UFS variant Yaniv Gardi
2015-08-23 13:09 ` [PATCH v3 1/8] phy: qcom-ufs: fix build error when the component is built as a module Yaniv Gardi
2015-08-25 11:52   ` ygardi
2015-08-23 13:09 ` Yaniv Gardi [this message]
2015-08-25 11:53   ` [PATCH v3 2/8] scsi: ufs-qcom: fix compilation warning if compiled " ygardi
2015-08-23 13:09 ` [PATCH v3 3/8] scsi: ufs-qcom: update configuration option of SCSI_UFS_QCOM component Yaniv Gardi
2015-08-25 11:53   ` ygardi
2015-08-23 13:09 ` [PATCH v3 4/8] add ufshcd_get_variant ufshcd_set_variant Yaniv Gardi
2015-08-25 11:53   ` ygardi
2015-08-23 13:09 ` [PATCH v3 5/8] scsi: ufs: creates wrapper functions for vops Yaniv Gardi
2015-08-25 11:53   ` ygardi
2015-08-23 13:09 ` [PATCH v3 6/8] scsi: ufs: make the UFS variant a platform device Yaniv Gardi
2015-08-25 11:54   ` ygardi
2015-08-27 17:56   ` Rob Herring
2015-08-30  8:43     ` ygardi
2015-08-30 13:18       ` Rob Herring
2015-10-25  9:24         ` ygardi
2015-10-25  9:31     ` ygardi
2015-08-23 13:09 ` [PATCH v3 7/8] scsi: ufs-qcom: add debug prints for test bus Yaniv Gardi
2015-08-25 11:54   ` ygardi
2015-08-23 13:09 ` [PATCH v3 8/8] scsi: ufs-qcom: add QUniPro hardware support and power optimizations Yaniv Gardi
2015-08-25 11:55   ` ygardi
2015-08-24 23:47 ` [PATCH v2 0/8] Fix error message and present UFS variant Akinobu Mita
2015-08-25 11:49   ` ygardi
2015-10-20  8:03   ` ygardi
2015-08-25 11:52 ` [PATCH v3 " ygardi

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=1440335381-5122-3-git-send-email-ygardi@codeaurora.org \
    --to=ygardi@codeaurora.org \
    --cc=JBottomley@odin.com \
    --cc=James.Bottomley@HansenPartnership.com \
    --cc=draviv@codeaurora.org \
    --cc=gbroner@codeaurora.org \
    --cc=hch@infradead.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi-owner@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=pebolle@tiscali.nl \
    --cc=robherring2@gmail.com \
    --cc=santoshsy@gmail.com \
    --cc=subhashj@codeaurora.org \
    --cc=vinholikatti@gmail.com \
    /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 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).