diff options
author | Yaniv Gardi <ygardi@codeaurora.org> | 2015-10-28 07:15:45 -0400 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2015-11-09 17:45:04 -0500 |
commit | fb819ee85e4281821b26f1e5b1812bb43ab5c41a (patch) | |
tree | 5ab58351000ed37a9de6a088b81127ca04e2f914 | |
parent | aeeed76b32e440a542e2bd224513844dcf6097d0 (diff) |
scsi: ufs-qcom: fix compilation warning if compiled as a module
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>
-rw-r--r-- | drivers/scsi/ufs/ufs-qcom.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c index 4cdffa46d401..6c23bbfe8d36 100644 --- a/drivers/scsi/ufs/ufs-qcom.c +++ b/drivers/scsi/ufs/ufs-qcom.c | |||
@@ -917,12 +917,15 @@ out: | |||
917 | 917 | ||
918 | #define ANDROID_BOOT_DEV_MAX 30 | 918 | #define ANDROID_BOOT_DEV_MAX 30 |
919 | static char android_boot_dev[ANDROID_BOOT_DEV_MAX]; | 919 | static char android_boot_dev[ANDROID_BOOT_DEV_MAX]; |
920 | static int get_android_boot_dev(char *str) | 920 | |
921 | #ifndef MODULE | ||
922 | static int __init get_android_boot_dev(char *str) | ||
921 | { | 923 | { |
922 | strlcpy(android_boot_dev, str, ANDROID_BOOT_DEV_MAX); | 924 | strlcpy(android_boot_dev, str, ANDROID_BOOT_DEV_MAX); |
923 | return 1; | 925 | return 1; |
924 | } | 926 | } |
925 | __setup("androidboot.bootdevice=", get_android_boot_dev); | 927 | __setup("androidboot.bootdevice=", get_android_boot_dev); |
928 | #endif | ||
926 | 929 | ||
927 | /** | 930 | /** |
928 | * ufs_qcom_init - bind phy with controller | 931 | * ufs_qcom_init - bind phy with controller |
@@ -1047,3 +1050,5 @@ static const struct ufs_hba_variant_ops ufs_hba_qcom_vops = { | |||
1047 | .resume = ufs_qcom_resume, | 1050 | .resume = ufs_qcom_resume, |
1048 | }; | 1051 | }; |
1049 | EXPORT_SYMBOL(ufs_hba_qcom_vops); | 1052 | EXPORT_SYMBOL(ufs_hba_qcom_vops); |
1053 | |||
1054 | MODULE_LICENSE("GPL v2"); | ||