From e812aa458acf7c47f9f5d8e6c62177317a998263 Mon Sep 17 00:00:00 2001 From: Uwe Kleine-König Date: Mon, 12 Dec 2022 21:53:52 +0100 Subject: ASoC: pxa: Drop empty platform remove function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A remove callback just returning 0 is equivalent to no remove callback at all. So drop the useless function. Signed-off-by: Uwe Kleine-König Link: https://lore.kernel.org/r/20221212205406.3771071-2-u.kleine-koenig@pengutronix.de Signed-off-by: Mark Brown --- sound/soc/pxa/spitz.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'sound/soc/pxa') diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index 44303b6eb228..70442315f5c5 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c @@ -306,18 +306,12 @@ static int spitz_probe(struct platform_device *pdev) return ret; } -static int spitz_remove(struct platform_device *pdev) -{ - return 0; -} - static struct platform_driver spitz_driver = { .driver = { .name = "spitz-audio", .pm = &snd_soc_pm_ops, }, .probe = spitz_probe, - .remove = spitz_remove, }; module_platform_driver(spitz_driver); -- cgit v1.2.3 From f2211ac36ab0b175cca7a244560923fbeeb6c7ae Mon Sep 17 00:00:00 2001 From: Uwe Kleine-König Date: Mon, 12 Dec 2022 21:54:03 +0100 Subject: ASoC: pxa: e740_wm9705: Drop empty platform remove function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A remove callback just returning 0 is equivalent to no remove callback at all. So drop the useless function. Signed-off-by: Uwe Kleine-König Link: https://lore.kernel.org/r/20221212205406.3771071-13-u.kleine-koenig@pengutronix.de Signed-off-by: Mark Brown --- sound/soc/pxa/e740_wm9705.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'sound/soc/pxa') diff --git a/sound/soc/pxa/e740_wm9705.c b/sound/soc/pxa/e740_wm9705.c index 4e0e9b778d4c..ec37da331a91 100644 --- a/sound/soc/pxa/e740_wm9705.c +++ b/sound/soc/pxa/e740_wm9705.c @@ -145,18 +145,12 @@ static int e740_probe(struct platform_device *pdev) return ret; } -static int e740_remove(struct platform_device *pdev) -{ - return 0; -} - static struct platform_driver e740_driver = { .driver = { .name = "e740-audio", .pm = &snd_soc_pm_ops, }, .probe = e740_probe, - .remove = e740_remove, }; module_platform_driver(e740_driver); -- cgit v1.2.3 From 4ed923e8076b8728c1c1cf587b79a83e34de22b0 Mon Sep 17 00:00:00 2001 From: Uwe Kleine-König Date: Mon, 12 Dec 2022 21:54:04 +0100 Subject: ASoC: pxa: e750_wm9705: Drop empty platform remove function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A remove callback just returning 0 is equivalent to no remove callback at all. So drop the useless function. Signed-off-by: Uwe Kleine-König Link: https://lore.kernel.org/r/20221212205406.3771071-14-u.kleine-koenig@pengutronix.de Signed-off-by: Mark Brown --- sound/soc/pxa/e750_wm9705.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'sound/soc/pxa') diff --git a/sound/soc/pxa/e750_wm9705.c b/sound/soc/pxa/e750_wm9705.c index 7a1e0d8bfd11..60b22d4f92a7 100644 --- a/sound/soc/pxa/e750_wm9705.c +++ b/sound/soc/pxa/e750_wm9705.c @@ -124,18 +124,12 @@ static int e750_probe(struct platform_device *pdev) return ret; } -static int e750_remove(struct platform_device *pdev) -{ - return 0; -} - static struct platform_driver e750_driver = { .driver = { .name = "e750-audio", .pm = &snd_soc_pm_ops, }, .probe = e750_probe, - .remove = e750_remove, }; module_platform_driver(e750_driver); -- cgit v1.2.3 From 394296eee2c220283ebc835db61ba4531f865558 Mon Sep 17 00:00:00 2001 From: Uwe Kleine-König Date: Mon, 12 Dec 2022 21:54:05 +0100 Subject: ASoC: pxa: e800_wm9712: Drop empty platform remove function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A remove callback just returning 0 is equivalent to no remove callback at all. So drop the useless function. Signed-off-by: Uwe Kleine-König Link: https://lore.kernel.org/r/20221212205406.3771071-15-u.kleine-koenig@pengutronix.de Signed-off-by: Mark Brown --- sound/soc/pxa/e800_wm9712.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'sound/soc/pxa') diff --git a/sound/soc/pxa/e800_wm9712.c b/sound/soc/pxa/e800_wm9712.c index a39c494127cf..c7756acd888a 100644 --- a/sound/soc/pxa/e800_wm9712.c +++ b/sound/soc/pxa/e800_wm9712.c @@ -124,18 +124,12 @@ static int e800_probe(struct platform_device *pdev) return ret; } -static int e800_remove(struct platform_device *pdev) -{ - return 0; -} - static struct platform_driver e800_driver = { .driver = { .name = "e800-audio", .pm = &snd_soc_pm_ops, }, .probe = e800_probe, - .remove = e800_remove, }; module_platform_driver(e800_driver); -- cgit v1.2.3 From 5eab9265759e2fb042aa452931c3d06ab7ab8dae Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 5 Jan 2023 14:46:09 +0100 Subject: ASoC: PXA: make SND_PXA2XX_SOC_AC97 user-selectable When building a PXA kernel without legacy board file support, the AC97 code is not built, so none of the AC97 drivers can be used. Add a Kconfig prompt to let users turn it on, and have it enabled by default. Cc: Robert Jarzmik Cc: Liam Girdwood Cc: Mark Brown Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: alsa-devel@alsa-project.org Signed-off-by: Arnd Bergmann Link: https://lore.kernel.org/r/20230105134622.254560-15-arnd@kernel.org Signed-off-by: Mark Brown --- sound/soc/pxa/Kconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'sound/soc/pxa') diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig index a045693d5bc2..2036d368c08d 100644 --- a/sound/soc/pxa/Kconfig +++ b/sound/soc/pxa/Kconfig @@ -16,7 +16,10 @@ config SND_PXA2XX_AC97 tristate config SND_PXA2XX_SOC_AC97 - tristate + tristate "SoC AC97 support for PXA2xx" + depends on SND_PXA2XX_SOC + depends on AC97_BUS=n + default y select AC97_BUS_NEW select SND_PXA2XX_LIB select SND_PXA2XX_LIB_AC97 -- cgit v1.2.3