scsi: ufs-qcom: fix compilation warning if compiled as a module
authorYaniv Gardi <ygardi@codeaurora.org>
Wed, 28 Oct 2015 11:15:45 +0000 (13:15 +0200)
committerMartin K. Petersen <martin.petersen@oracle.com>
Mon, 9 Nov 2015 22:45:04 +0000 (17:45 -0500)
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>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/ufs/ufs-qcom.c

index 4cdffa46d401a5ea6120ba5d350e453158166a31..6c23bbfe8d36d697855a390442b5e6329978dfce 100644 (file)
@@ -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");