Commit 1e137d53 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Vinod Koul
Browse files

dmaengine: dw: Switch to LATE_SIMPLE_DEV_PM_OPS() 



SET_LATE_SYSTEM_SLEEP_PM_OPS is deprecated, replace it with
LATE_SYSTEM_SLEEP_PM_OPS() and use pm_sleep_ptr() for setting
the driver's pm routines. We can now remove the ifdeffery
in the suspend and resume functions.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: default avatarSerge Semin <fancer.lancer@gmail.com>
Link: https://lore.kernel.org/r/20250205150701.893083-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 91d8560c

drivers/dma/dw/pci.c

+2 −6
Original line number Diff line number Diff line
@@ -76,8 +76,6 @@ static void dw_pci_remove(struct pci_dev *pdev) 
		dev_warn(&pdev->dev, "can't remove device properly: %d\n", ret);

}



#ifdef CONFIG_PM_SLEEP



static int dw_pci_suspend_late(struct device *dev)

{

	struct dw_dma_chip_pdata *data = dev_get_drvdata(dev);
@@ -94,10 +92,8 @@ static int dw_pci_resume_early(struct device *dev) 
	return do_dw_dma_enable(chip);

};



#endif /* CONFIG_PM_SLEEP */



static const struct dev_pm_ops dw_pci_dev_pm_ops = {

	SET_LATE_SYSTEM_SLEEP_PM_OPS(dw_pci_suspend_late, dw_pci_resume_early)

	LATE_SYSTEM_SLEEP_PM_OPS(dw_pci_suspend_late, dw_pci_resume_early)

};



static const struct pci_device_id dw_pci_id_table[] = {
@@ -136,7 +132,7 @@ static struct pci_driver dw_pci_driver = { 
	.probe		= dw_pci_probe,

	.remove		= dw_pci_remove,

	.driver	= {

		.pm	= &dw_pci_dev_pm_ops,

		.pm	= pm_sleep_ptr(&dw_pci_dev_pm_ops),

	},

};

drivers/dma/dw/platform.c

+2 −6
Original line number Diff line number Diff line
@@ -157,8 +157,6 @@ static const struct acpi_device_id dw_dma_acpi_id_table[] = { 
MODULE_DEVICE_TABLE(acpi, dw_dma_acpi_id_table);

#endif



#ifdef CONFIG_PM_SLEEP



static int dw_suspend_late(struct device *dev)

{

	struct dw_dma_chip_pdata *data = dev_get_drvdata(dev);
@@ -183,10 +181,8 @@ static int dw_resume_early(struct device *dev) 
	return do_dw_dma_enable(chip);

}



#endif /* CONFIG_PM_SLEEP */



static const struct dev_pm_ops dw_dev_pm_ops = {

	SET_LATE_SYSTEM_SLEEP_PM_OPS(dw_suspend_late, dw_resume_early)

	LATE_SYSTEM_SLEEP_PM_OPS(dw_suspend_late, dw_resume_early)

};



static struct platform_driver dw_driver = {
@@ -195,7 +191,7 @@ static struct platform_driver dw_driver = { 
	.shutdown       = dw_shutdown,

	.driver = {

		.name	= DRV_NAME,

		.pm	= &dw_dev_pm_ops,

		.pm	= pm_sleep_ptr(&dw_dev_pm_ops),

		.of_match_table = of_match_ptr(dw_dma_of_id_table),

		.acpi_match_table = ACPI_PTR(dw_dma_acpi_id_table),

	},