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

scsi: ufs: core: Simplify driver shutdown 



All UFS host drivers call ufshcd_shutdown(). Hence, instead of calling
ufshcd_shutdown() from the host driver .shutdown() callback, inline that
function into ufshcd_wl_shutdown().

Reviewed-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20230524203659.1394307-5-bvanassche@acm.org


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent b251f6c5

drivers/ufs/core/ufshcd.c

+5 −18
Original line number Diff line number Diff line
@@ -9950,9 +9950,7 @@ EXPORT_SYMBOL(ufshcd_runtime_resume); 
static void ufshcd_wl_shutdown(struct device *dev)

{

	struct scsi_device *sdev = to_scsi_device(dev);

	struct ufs_hba *hba;



	hba = shost_priv(sdev->host);

	struct ufs_hba *hba = shost_priv(sdev->host);



	down(&hba->host_sem);

	hba->shutting_down = true;
@@ -9967,27 +9965,16 @@ static void ufshcd_wl_shutdown(struct device *dev) 
		scsi_device_quiesce(sdev);

	}

	__ufshcd_wl_suspend(hba, UFS_SHUTDOWN_PM);

}



/**

 * ufshcd_shutdown - shutdown routine

 * @hba: per adapter instance

 *

 * This function would turn off both UFS device and UFS hba

 * regulators. It would also disable clocks.

 *

 * Returns 0 always to allow force shutdown even in case of errors.

	/*

	 * Next, turn off the UFS controller and the UFS regulators. Disable

	 * clocks.

	 */

int ufshcd_shutdown(struct ufs_hba *hba)

{

	if (ufshcd_is_ufs_dev_poweroff(hba) && ufshcd_is_link_off(hba))

		ufshcd_suspend(hba);



	hba->is_powered = false;

	/* allow force shutdown even in case of errors */

	return 0;

}

EXPORT_SYMBOL(ufshcd_shutdown);



/**

 * ufshcd_remove - de-allocate SCSI host and host memory space

drivers/ufs/host/cdns-pltfrm.c

+0 −1
Original line number Diff line number Diff line
@@ -328,7 +328,6 @@ static const struct dev_pm_ops cdns_ufs_dev_pm_ops = { 
static struct platform_driver cdns_ufs_pltfrm_driver = {

	.probe	= cdns_ufs_pltfrm_probe,

	.remove	= cdns_ufs_pltfrm_remove,

	.shutdown = ufshcd_pltfrm_shutdown,

	.driver	= {

		.name   = "cdns-ufshcd",

		.pm     = &cdns_ufs_dev_pm_ops,

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

+0 −10
Original line number Diff line number Diff line
@@ -32,15 +32,6 @@ static struct ufs_hba_variant_ops tc_dwc_g210_pci_hba_vops = { 
	.link_startup_notify	= ufshcd_dwc_link_startup_notify,

};



/**

 * tc_dwc_g210_pci_shutdown - main function to put the controller in reset state

 * @pdev: pointer to PCI device handle

 */

static void tc_dwc_g210_pci_shutdown(struct pci_dev *pdev)

{

	ufshcd_shutdown((struct ufs_hba *)pci_get_drvdata(pdev));

}



/**

 * tc_dwc_g210_pci_remove - de-allocate PCI/SCSI host and host memory space

 *		data structure memory
@@ -137,7 +128,6 @@ static struct pci_driver tc_dwc_g210_pci_driver = { 
	.id_table = tc_dwc_g210_pci_tbl,

	.probe = tc_dwc_g210_pci_probe,

	.remove = tc_dwc_g210_pci_remove,

	.shutdown = tc_dwc_g210_pci_shutdown,

	.driver = {

		.pm = &tc_dwc_g210_pci_pm_ops

	},

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

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ static const struct dev_pm_ops tc_dwc_g210_pltfm_pm_ops = { 
static struct platform_driver tc_dwc_g210_pltfm_driver = {

	.probe		= tc_dwc_g210_pltfm_probe,

	.remove		= tc_dwc_g210_pltfm_remove,

	.shutdown = ufshcd_pltfrm_shutdown,

	.driver		= {

		.name	= "tc-dwc-g210-pltfm",

		.pm	= &tc_dwc_g210_pltfm_pm_ops,

drivers/ufs/host/ufs-exynos.c

+0 −1
Original line number Diff line number Diff line
@@ -1757,7 +1757,6 @@ static const struct dev_pm_ops exynos_ufs_pm_ops = { 
static struct platform_driver exynos_ufs_pltform = {

	.probe	= exynos_ufs_probe,

	.remove	= exynos_ufs_remove,

	.shutdown = ufshcd_pltfrm_shutdown,

	.driver	= {

		.name	= "exynos-ufshc",

		.pm	= &exynos_ufs_pm_ops,