diff options
| author | Yaniv Gardi <ygardi@codeaurora.org> | 2015-05-28 17:52:14 +0300 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 10:59:52 -0700 |
| commit | 05a8fb985dc478bf93365d7ec2176e9528e30314 (patch) | |
| tree | 87f1cc9e8f24905b35d311c79e5798fcabfda31c | |
| parent | e0cef40130e18339196bbaa5b948e0ce8f91fdfc (diff) | |
scsi: ufs-qcom: fix build errors incase UFS_QCOM is compiled as a module
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>
| -rw-r--r-- | drivers/scsi/ufs/ufs-qcom.c | 11 | ||||
| -rw-r--r-- | drivers/scsi/ufs/ufshcd.h | 8 |
2 files changed, 6 insertions, 13 deletions
diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c index 82209c4f136a..efd900f540ac 100644 --- a/drivers/scsi/ufs/ufs-qcom.c +++ b/drivers/scsi/ufs/ufs-qcom.c @@ -1805,15 +1805,14 @@ const struct ufs_hba_variant_ops ufs_hba_qcom_vops = { .full_reset = ufs_qcom_full_reset, .update_sec_cfg = ufs_qcom_update_sec_cfg, .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_reset = ufs_qcom_crytpo_engine_reset, .crypto_engine_eh = ufs_qcom_crypto_engine_eh, .crypto_engine_get_err = ufs_qcom_crypto_engine_get_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), }, }; -EXPORT_SYMBOL(ufs_hba_qcom_vops); +module_platform_driver(ufs_qcom_pltform); + +MODULE_LICENSE("GPL v2"); diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index 806d8bafb79f..6ed039c1f115 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -1022,14 +1022,6 @@ static inline void ufshcd_init_req_stats(struct ufs_hba *hba) {} #define UTF16_STD false int ufshcd_read_string_desc(struct ufs_hba *hba, int desc_index, u8 *buf, 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 static inline int ufshcd_pm_qos_init(struct ufs_hba *hba) |