Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1257919

[PATCH v9 2/8] scsi: ufs-qcom: fix compilation warning if compiled as a module

Show all headers | View raw

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

Reviewed-by: Akinobu Mita <akinobu.mita@gmail.com>
Reviewed-by: Subhash Jadavani <subhashj@codeaurora.org>
Reviewed-by: Gilad Broner <gbroner@codeaurora.org>
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
--
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/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v9 0/8] Fix error message and present UFS variant Yaniv Gardi <ygardi@codeaurora.org> - 2015-10-28 12:20 +0100
  [PATCH v9 4/8] scsi: ufs: add ufshcd_get_variant ufshcd_set_variant Yaniv Gardi <ygardi@codeaurora.org> - 2015-10-28 12:20 +0100
    Re: [PATCH v9 4/8] scsi: ufs: add ufshcd_get_variant  ufshcd_set_variant Hannes Reinecke <hare@suse.de> - 2015-10-30 09:30 +0100
  [PATCH v9 1/8] phy: qcom-ufs: fix build error when the component is built as a module Yaniv Gardi <ygardi@codeaurora.org> - 2015-10-28 12:20 +0100
  [PATCH v9 3/8] scsi: ufs-qcom: update configuration option of SCSI_UFS_QCOM component Yaniv Gardi <ygardi@codeaurora.org> - 2015-10-28 12:20 +0100
    Re: [PATCH v9 3/8] scsi: ufs-qcom: update configuration option of  SCSI_UFS_QCOM component Hannes Reinecke <hare@suse.de> - 2015-10-30 09:30 +0100
  [PATCH v9 7/8] scsi: ufs-qcom: add debug prints for test bus Yaniv Gardi <ygardi@codeaurora.org> - 2015-10-28 12:20 +0100
  [PATCH v9 6/8] scsi: ufs: make the UFS variant a platform device Yaniv Gardi <ygardi@codeaurora.org> - 2015-10-28 12:20 +0100
  [PATCH v9 5/8] scsi: ufs: creates wrapper functions for vops Yaniv Gardi <ygardi@codeaurora.org> - 2015-10-28 12:20 +0100
  [PATCH v9 2/8] scsi: ufs-qcom: fix compilation warning if compiled as a module Yaniv Gardi <ygardi@codeaurora.org> - 2015-10-28 12:20 +0100
  [PATCH v9 8/8] scsi: ufs-qcom: add QUniPro hardware support and power optimizations Yaniv Gardi <ygardi@codeaurora.org> - 2015-10-28 12:20 +0100

csiph-web