mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-10 20:02:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: Another set of platform remove conversions

Browse Source 
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.
This commit is contained in:
Mark Brown
2023-07-12 12:38:07 +01:00
parent 5a043fd5c7 50a91c513f
commit f7c30811de
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sound/soc/amd/ps/ps-sdw-dma.c
View File

@@ -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,

5
sound/soc/starfive/jh7110_tdm.c
View File

@@ -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);