[PATCH 0/2] ASoC: ux500: preparation for Card capsuling

[PATCH 0/2] ASoC: ux500: preparation for Card capsuling

[Kuninori Morimoto]

Hi ux500 developers

I will post Card capsuling patch.
To makes its review easy, tidyup its drivers to reduce
un-related diff as preparation.
No functional change, but is preparation for cleanup driver.


Kuninori Morimoto (2):
  ASoC: ux500: mop500: tidyup mop500_of_probe() parameter
  ASoC: ux500: mop500_ab8500: tidyup mop500_ab8500_remove()

 sound/soc/ux500/mop500.c        | 12 ++++++------
 sound/soc/ux500/mop500_ab8500.c |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

-- 
2.53.0

[PATCH 1/2] ASoC: ux500: mop500: tidyup mop500_of_probe() parameter

[Kuninori Morimoto]

mop500.c will be updated when Card capsuling.
To makes its review easy, tidyup mop500_of_probe() parameter.
No functional change, but is preparation for cleanup driver.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 sound/soc/ux500/mop500.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/soc/ux500/mop500.c b/sound/soc/ux500/mop500.c
index ae6d326167d13..6d196b4b88027 100644
--- a/sound/soc/ux500/mop500.c
+++ b/sound/soc/ux500/mop500.c
@@ -68,10 +68,11 @@ static void mop500_of_node_put(void)
 	of_node_put(mop500_dai_links[0].codecs->of_node);
 }
 
-static int mop500_of_probe(struct platform_device *pdev,
-			   struct device_node *np)
+static int mop500_of_probe(struct snd_soc_card *card)
 {
+	struct device *dev = card->dev;
 	struct device_node *codec_np, *msp_np[2];
+	struct device_node *np = dev->of_node;
 	int i;
 
 	msp_np[0] = of_parse_phandle(np, "stericsson,cpu-dai", 0);
@@ -79,7 +80,7 @@ static int mop500_of_probe(struct platform_device *pdev,
 	codec_np  = of_parse_phandle(np, "stericsson,audio-codec", 0);
 
 	if (!(msp_np[0] && msp_np[1] && codec_np)) {
-		dev_err(&pdev->dev, "Phandle missing or invalid\n");
+		dev_err(dev, "Phandle missing or invalid\n");
 		for (i = 0; i < 2; i++)
 			of_node_put(msp_np[i]);
 		of_node_put(codec_np);
@@ -95,21 +96,20 @@ static int mop500_of_probe(struct platform_device *pdev,
 		mop500_dai_links[i].codecs->name = NULL;
 	}
 
-	snd_soc_of_parse_card_name(&mop500_card, "stericsson,card-name");
+	snd_soc_of_parse_card_name(card, "stericsson,card-name");
 
 	return 0;
 }
 
 static int mop500_probe(struct platform_device *pdev)
 {
-	struct device_node *np = pdev->dev.of_node;
 	int ret;
 
 	dev_dbg(&pdev->dev, "%s: Enter.\n", __func__);
 
 	mop500_card.dev = &pdev->dev;
 
-	ret = mop500_of_probe(pdev, np);
+	ret = mop500_of_probe(&mop500_card);
 	if (ret)
 		return ret;
 
-- 
2.53.0

[PATCH 2/2] ASoC: ux500: mop500_ab8500: tidyup mop500_ab8500_remove()

[Kuninori Morimoto]

It sets drvdata again in remove(), but it want to remove it.

	void mop500_ab8500_remove(...)
	{
		struct mop500_ab8500_drvdata *drvdata = snd_soc_card_get_drvdata(card);
		...
		snd_soc_card_set_drvdata(card, drvdata);
	}				       ^^^^^^^

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 sound/soc/ux500/mop500_ab8500.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/ux500/mop500_ab8500.c b/sound/soc/ux500/mop500_ab8500.c
index 2a459267f0f91..feb683c55d113 100644
--- a/sound/soc/ux500/mop500_ab8500.c
+++ b/sound/soc/ux500/mop500_ab8500.c
@@ -433,5 +433,5 @@ void mop500_ab8500_remove(struct snd_soc_card *card)
 	clk_put(drvdata->clk_ptr_ulpclk);
 	clk_put(drvdata->clk_ptr_intclk);
 
-	snd_soc_card_set_drvdata(card, drvdata);
+	snd_soc_card_set_drvdata(card, NULL);
 }
-- 
2.53.0

Re: [PATCH 0/2] ASoC: ux500: preparation for Card capsuling

[Mark Brown]

On Tue, 21 Jul 2026 01:45:44 +0000, Kuninori Morimoto wrote:
> ASoC: ux500: preparation for Card capsuling
> 
> Hi ux500 developers
> 
> I will post Card capsuling patch.
> To makes its review easy, tidyup its drivers to reduce
> un-related diff as preparation.
> No functional change, but is preparation for cleanup driver.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.3

Thanks!

[1/2] ASoC: ux500: mop500: tidyup mop500_of_probe() parameter
      https://git.kernel.org/broonie/sound/c/a14b50577898
[2/2] ASoC: ux500: mop500_ab8500: tidyup mop500_ab8500_remove()
      https://git.kernel.org/broonie/sound/c/1ed8d136f778

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

Re: [PATCH 0/2] ASoC: ux500: preparation for Card capsuling

[Kuninori Morimoto]

Hi Mark

> Applied to
(snip)
> [1/2] ASoC: ux500: mop500: tidyup mop500_of_probe() parameter
> [2/2] ASoC: ux500: mop500_ab8500: tidyup mop500_ab8500_remove()

Hmm... I can't find them on asoc/for-7.3

Thank you for your help !!

Best regards
---
Kuninori Morimoto

Re: [PATCH 0/2] ASoC: ux500: preparation for Card capsuling

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 433 bytes --]

On Thu, Jul 30, 2026 at 11:53:27PM +0000, Kuninori Morimoto wrote:

> > Applied to
> (snip)
> > [1/2] ASoC: ux500: mop500: tidyup mop500_of_probe() parameter
> > [2/2] ASoC: ux500: mop500_ab8500: tidyup mop500_ab8500_remove()

> Hmm... I can't find them on asoc/for-7.3

There was a (now fixed) bug in b4 which caused it to send thanks mails
before things were fully published, it should be pushed out tomorrow
when it's through CI.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]