Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12f04edb authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 7d4b95da a09a87a0

drivers/scsi/ufs/ufs-qcom.c

+33 −31
Original line number Diff line number Diff line
@@ -1783,6 +1783,38 @@ static void ufs_qcom_dump_dbg_regs(struct ufs_hba *hba) 
	ufs_qcom_ice_print_regs(host);

}



/**

 * struct ufs_hba_qcom_vops - UFS QCOM specific variant operations

 *

 * The variant operations configure the necessary controller and PHY

 * handshake during initialization.

 */

const struct ufs_hba_variant_ops ufs_hba_qcom_vops = {

	.name                   = "qcom",

	.init                   = ufs_qcom_init,

	.exit                   = ufs_qcom_exit,

	.get_ufs_hci_version	= ufs_qcom_get_ufs_hci_version,

	.clk_scale_notify	= ufs_qcom_clk_scale_notify,

	.setup_clocks           = ufs_qcom_setup_clocks,

	.hce_enable_notify      = ufs_qcom_hce_enable_notify,

	.link_startup_notify    = ufs_qcom_link_startup_notify,

	.pwr_change_notify	= ufs_qcom_pwr_change_notify,

	.suspend		= ufs_qcom_suspend,

	.resume			= ufs_qcom_resume,

	.full_reset		= ufs_qcom_full_reset,

	.update_sec_cfg		= ufs_qcom_update_sec_cfg,

	.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

};

EXPORT_SYMBOL(ufs_hba_qcom_vops);



/**

 * ufs_qcom_probe - probe routine of the driver

 * @pdev: pointer to platform device handle
@@ -1823,34 +1855,4 @@ static struct platform_driver ufs_qcom_pltform = { 
};

module_platform_driver(ufs_qcom_pltform);



/**

 * struct ufs_hba_qcom_vops - UFS QCOM specific variant operations

 *

 * The variant operations configure the necessary controller and PHY

 * handshake during initialization.

 */

const struct ufs_hba_variant_ops ufs_hba_qcom_vops = {

	.name                   = "qcom",

	.init                   = ufs_qcom_init,

	.exit                   = ufs_qcom_exit,

	.get_ufs_hci_version	= ufs_qcom_get_ufs_hci_version,

	.clk_scale_notify	= ufs_qcom_clk_scale_notify,

	.setup_clocks           = ufs_qcom_setup_clocks,

	.hce_enable_notify      = ufs_qcom_hce_enable_notify,

	.link_startup_notify    = ufs_qcom_link_startup_notify,

	.pwr_change_notify	= ufs_qcom_pwr_change_notify,

	.suspend		= ufs_qcom_suspend,

	.resume			= ufs_qcom_resume,

	.full_reset		= ufs_qcom_full_reset,

	.update_sec_cfg		= ufs_qcom_update_sec_cfg,

	.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

};

EXPORT_SYMBOL(ufs_hba_qcom_vops);
 
MODULE_LICENSE("GPL v2");

drivers/scsi/ufs/ufshcd.h

+0 −8
Original line number Diff line number Diff line
@@ -993,14 +993,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)