evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scsi: ufs-qcom: fix build errors incase UFS_QCOM is compiled as a module

Browse source 
In case UFS_QCOM component is compiled as a module, there will be
some building errors. This change fixes them.

Also, since UFS_QCOM didn't have MODULE_LICENSE(), it failed to be
loaded as a module:
"ufs_qcom: module license 'unspecified' taints kernel."
This patch also fixes this error.

Change-Id: I96c7c1cf012b29c954e50e77ed0849a4255f39b3
Signed-off-by: Yaniv Gardi <ygardi@codeaurora.org>
[venkatg@codeaurora.org: resolved trivial merge conflicts]
Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
This commit is contained in:
Yaniv Gardi 2015-05-28 17:52:14 +03:00 • committed by David Keitel
parent e0cef40130
commit 05a8fb985d
2 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/scsi/ufs/ufs-qcom.c
View file

@ -1805,15 +1805,14 @@ const struct ufs_hba_variant_ops ufs_hba_qcom_vops = {
.full_reset = ufs_qcom_full_reset, .full_reset = ufs_qcom_full_reset,
.update_sec_cfg = ufs_qcom_update_sec_cfg, .update_sec_cfg = ufs_qcom_update_sec_cfg,
.dbg_register_dump = ufs_qcom_dump_dbg_regs, .dbg_register_dump = ufs_qcom_dump_dbg_regs,
#ifdef CONFIG_DEBUG_FS
.add_debugfs = ufs_qcom_dbg_add_debugfs,
#endif
.crypto_engine_cfg = ufs_qcom_crytpo_engine_cfg, .crypto_engine_cfg = ufs_qcom_crytpo_engine_cfg,
.crypto_engine_reset = ufs_qcom_crytpo_engine_reset, .crypto_engine_reset = ufs_qcom_crytpo_engine_reset,
.crypto_engine_eh = ufs_qcom_crypto_engine_eh, .crypto_engine_eh = ufs_qcom_crypto_engine_eh,
.crypto_engine_get_err = ufs_qcom_crypto_engine_get_err, .crypto_engine_get_err = ufs_qcom_crypto_engine_get_err,
.crypto_engine_reset_err = ufs_qcom_crypto_engine_reset_err, .crypto_engine_reset_err = ufs_qcom_crypto_engine_reset_err,
.dbg_register_dump = ufs_qcom_dump_dbg_regs,
#ifdef CONFIG_DEBUG_FS
.add_debugfs = ufs_qcom_dbg_add_debugfs,
#endif
}; };
/** /**
@ -1873,4 +1872,6 @@ static struct platform_driver ufs_qcom_pltform = {
.of_match_table = of_match_ptr(ufs_qcom_of_match), .of_match_table = of_match_ptr(ufs_qcom_of_match),
}, },
}; };
EXPORT_SYMBOL(ufs_hba_qcom_vops); module_platform_driver(ufs_qcom_pltform);
MODULE_LICENSE("GPL v2");

8
drivers/scsi/ufs/ufshcd.h
View file

@ -1022,14 +1022,6 @@ static inline void ufshcd_init_req_stats(struct ufs_hba *hba) {}
#define UTF16_STD false #define UTF16_STD false
int ufshcd_read_string_desc(struct ufs_hba *hba, int desc_index, u8 *buf, int ufshcd_read_string_desc(struct ufs_hba *hba, int desc_index, u8 *buf,
u32 size, bool ascii); u32 size, bool ascii);
/* variant specific ops structures */
#ifdef CONFIG_SCSI_UFS_QCOM
extern const struct ufs_hba_variant_ops ufs_hba_qcom_vops;
#else
static const struct ufs_hba_variant_ops ufs_hba_qcom_vops = {
.name = "qcom",
};
#endif
#ifndef CONFIG_SMP #ifndef CONFIG_SMP
static inline int ufshcd_pm_qos_init(struct ufs_hba *hba) static inline int ufshcd_pm_qos_init(struct ufs_hba *hba)