Unverified Commit f7c30811 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Another set of platform remove conversions 

Merge series from Uwe Kleine-König <u.kleine-koenig@pengutronix.de>:

Two more drivers were added during the current merge window that
are users of the original .remove callback that I plan to get rid of.
Convert them to .remove_new.
parents 5a043fd5 50a91c51

sound/soc/amd/ps/ps-sdw-dma.c

+2 −3
Original line number Diff line number Diff line
@@ -488,10 +488,9 @@ static int acp63_sdw_platform_probe(struct platform_device *pdev) 
	return 0;

}



static int acp63_sdw_platform_remove(struct platform_device *pdev)

static void acp63_sdw_platform_remove(struct platform_device *pdev)

{

	pm_runtime_disable(&pdev->dev);

	return 0;

}



static int acp_restore_sdw_dma_config(struct sdw_dma_dev_data *sdw_data)
@@ -552,7 +551,7 @@ static const struct dev_pm_ops acp63_pm_ops = { 


static struct platform_driver acp63_sdw_dma_driver = {

	.probe = acp63_sdw_platform_probe,

	.remove = acp63_sdw_platform_remove,

	.remove_new = acp63_sdw_platform_remove,

	.driver = {

		.name = "amd_ps_sdw_dma",

		.pm = &acp63_pm_ops,

sound/soc/starfive/jh7110_tdm.c

+2 −3
Original line number Diff line number Diff line
@@ -634,10 +634,9 @@ static int jh7110_tdm_probe(struct platform_device *pdev) 
	return ret;

}



static int jh7110_tdm_dev_remove(struct platform_device *pdev)

static void jh7110_tdm_dev_remove(struct platform_device *pdev)

{

	pm_runtime_disable(&pdev->dev);

	return 0;

}



static const struct of_device_id jh7110_tdm_of_match[] = {
@@ -661,7 +660,7 @@ static struct platform_driver jh7110_tdm_driver = { 
		.pm = pm_ptr(&jh7110_tdm_pm_ops),

	},

	.probe = jh7110_tdm_probe,

	.remove = jh7110_tdm_dev_remove,

	.remove_new = jh7110_tdm_dev_remove,

};

module_platform_driver(jh7110_tdm_driver);