Commit f1ecbe1e authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: ufs: Reduce power management code duplication 

Move the dev_get_drvdata() calls into the ufshcd_{system,runtime}_*()
functions. Remove ufshcd_runtime_idle() since it is empty. This patch does
not change any functionality.

Link: https://lore.kernel.org/r/20210722033439.26550-3-bvanassche@acm.org


Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Stanley Chu <stanley.chu@mediatek.com>
Cc: Can Guo <cang@codeaurora.org>
Cc: Asutosh Das <asutoshd@codeaurora.org>
Reviewed-by: default avatarAvri Altman <avri.altman@wdc.com>
Reviewed-by: default avatarBean Huo <beanhuo@micron.com>
Reviewed-by: default avatarDaejun Park <daejun7.park@samsung.com>
Reviewed-by: default avatarStanley Chu <stanley.chu@mediatek.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent d3d9c457

drivers/scsi/ufs/cdns-pltfrm.c

+2 −5
Original line number Diff line number Diff line
@@ -318,11 +318,8 @@ static int cdns_ufs_pltfrm_remove(struct platform_device *pdev) 
}



static const struct dev_pm_ops cdns_ufs_dev_pm_ops = {

	.suspend         = ufshcd_pltfrm_suspend,

	.resume          = ufshcd_pltfrm_resume,

	.runtime_suspend = ufshcd_pltfrm_runtime_suspend,

	.runtime_resume  = ufshcd_pltfrm_runtime_resume,

	.runtime_idle    = ufshcd_pltfrm_runtime_idle,

	SET_SYSTEM_SLEEP_PM_OPS(ufshcd_system_suspend, ufshcd_system_resume)

	SET_RUNTIME_PM_OPS(ufshcd_runtime_suspend, ufshcd_runtime_resume, NULL)

	.prepare	 = ufshcd_suspend_prepare,

	.complete	 = ufshcd_resume_complete,

};

drivers/scsi/ufs/tc-dwc-g210-pci.c

+2 −30
Original line number Diff line number Diff line
@@ -23,31 +23,6 @@ static int tc_type = TC_G210_INV; 
module_param(tc_type, int, 0);

MODULE_PARM_DESC(tc_type, "Test Chip Type (20 = 20-bit, 40 = 40-bit)");



static int tc_dwc_g210_pci_suspend(struct device *dev)

{

	return ufshcd_system_suspend(dev_get_drvdata(dev));

}



static int tc_dwc_g210_pci_resume(struct device *dev)

{

	return ufshcd_system_resume(dev_get_drvdata(dev));

}



static int tc_dwc_g210_pci_runtime_suspend(struct device *dev)

{

	return ufshcd_runtime_suspend(dev_get_drvdata(dev));

}



static int tc_dwc_g210_pci_runtime_resume(struct device *dev)

{

	return ufshcd_runtime_resume(dev_get_drvdata(dev));

}



static int tc_dwc_g210_pci_runtime_idle(struct device *dev)

{

	return ufshcd_runtime_idle(dev_get_drvdata(dev));

}



/*

 * struct ufs_hba_dwc_vops - UFS DWC specific variant operations

 */
@@ -143,11 +118,8 @@ tc_dwc_g210_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
}



static const struct dev_pm_ops tc_dwc_g210_pci_pm_ops = {

	.suspend	= tc_dwc_g210_pci_suspend,

	.resume		= tc_dwc_g210_pci_resume,

	.runtime_suspend = tc_dwc_g210_pci_runtime_suspend,

	.runtime_resume  = tc_dwc_g210_pci_runtime_resume,

	.runtime_idle    = tc_dwc_g210_pci_runtime_idle,

	SET_SYSTEM_SLEEP_PM_OPS(ufshcd_system_suspend, ufshcd_system_resume)

	SET_RUNTIME_PM_OPS(ufshcd_runtime_suspend, ufshcd_runtime_resume, NULL)

	.prepare	 = ufshcd_suspend_prepare,

	.complete	 = ufshcd_resume_complete,

};

drivers/scsi/ufs/tc-dwc-g210-pltfrm.c

+2 −5
Original line number Diff line number Diff line
@@ -84,11 +84,8 @@ static int tc_dwc_g210_pltfm_remove(struct platform_device *pdev) 
}



static const struct dev_pm_ops tc_dwc_g210_pltfm_pm_ops = {

	.suspend	= ufshcd_pltfrm_suspend,

	.resume		= ufshcd_pltfrm_resume,

	.runtime_suspend = ufshcd_pltfrm_runtime_suspend,

	.runtime_resume  = ufshcd_pltfrm_runtime_resume,

	.runtime_idle    = ufshcd_pltfrm_runtime_idle,

	SET_SYSTEM_SLEEP_PM_OPS(ufshcd_system_suspend, ufshcd_system_resume)

	SET_RUNTIME_PM_OPS(ufshcd_runtime_suspend, ufshcd_runtime_resume, NULL)

};



static struct platform_driver tc_dwc_g210_pltfm_driver = {

drivers/scsi/ufs/ufs-exynos.c

+2 −5
Original line number Diff line number Diff line
@@ -1287,11 +1287,8 @@ static const struct of_device_id exynos_ufs_of_match[] = { 
};



static const struct dev_pm_ops exynos_ufs_pm_ops = {

	.suspend	= ufshcd_pltfrm_suspend,

	.resume		= ufshcd_pltfrm_resume,

	.runtime_suspend = ufshcd_pltfrm_runtime_suspend,

	.runtime_resume  = ufshcd_pltfrm_runtime_resume,

	.runtime_idle    = ufshcd_pltfrm_runtime_idle,

	SET_SYSTEM_SLEEP_PM_OPS(ufshcd_system_suspend, ufshcd_system_resume)

	SET_RUNTIME_PM_OPS(ufshcd_runtime_suspend, ufshcd_runtime_resume, NULL)

	.prepare	 = ufshcd_suspend_prepare,

	.complete	 = ufshcd_resume_complete,

};

drivers/scsi/ufs/ufs-hisi.c

+2 −5
Original line number Diff line number Diff line
@@ -572,11 +572,8 @@ static int ufs_hisi_remove(struct platform_device *pdev) 
}



static const struct dev_pm_ops ufs_hisi_pm_ops = {

	.suspend	= ufshcd_pltfrm_suspend,

	.resume		= ufshcd_pltfrm_resume,

	.runtime_suspend = ufshcd_pltfrm_runtime_suspend,

	.runtime_resume  = ufshcd_pltfrm_runtime_resume,

	.runtime_idle    = ufshcd_pltfrm_runtime_idle,

	SET_SYSTEM_SLEEP_PM_OPS(ufshcd_system_suspend, ufshcd_system_resume)

	SET_RUNTIME_PM_OPS(ufshcd_runtime_suspend, ufshcd_runtime_resume, NULL)

	.prepare	 = ufshcd_suspend_prepare,

	.complete	 = ufshcd_resume_complete,

};