Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1466058 > unrolled thread

[PATCH for 4.8] ASoC: omap-abe-twl6040: Correct dmic-codec device registration

Started byPeter Ujfalusi <peter.ujfalusi@ti.com>
First post2016-08-19 08:40 +0200
Last post2016-08-19 17:20 +0200
Articles 4 — 3 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH for 4.8] ASoC: omap-abe-twl6040: Correct dmic-codec device registration Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-08-19 08:40 +0200
    Re: [PATCH for 4.8] ASoC: omap-abe-twl6040: Correct dmic-codec  device registration Russell King - ARM Linux <linux@armlinux.org.uk> - 2016-08-19 11:00 +0200
      Re: [PATCH for 4.8] ASoC: omap-abe-twl6040: Correct dmic-codec device  registration Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-08-19 12:00 +0200
    Applied "ASoC: omap-abe-twl6040: Correct dmic-codec device registration" to the asoc tree Mark Brown <broonie@kernel.org> - 2016-08-19 17:20 +0200

#1466058 — [PATCH for 4.8] ASoC: omap-abe-twl6040: Correct dmic-codec device registration

FromPeter Ujfalusi <peter.ujfalusi@ti.com>
Date2016-08-19 08:40 +0200
Subject[PATCH for 4.8] ASoC: omap-abe-twl6040: Correct dmic-codec device registration
Message-ID<s7LDc-23l-27@gated-at.bofh.it>
The dmic-codec was registered within the platform_driver's probe function,
which can cause deferred probe to run in loops as reported and analyzed by
Russell King.

Use module_init/exit in the driver and handle the dmic-codec device
registration and removal at that level instead of the platform_driver
probe/remove.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Reported-by: Russell King <linux@arm.linux.org.uk>
---
 sound/soc/omap/omap-abe-twl6040.c | 61 ++++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 29 deletions(-)

diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c
index 0843a68f277c..f61b3b58083b 100644
--- a/sound/soc/omap/omap-abe-twl6040.c
+++ b/sound/soc/omap/omap-abe-twl6040.c
@@ -38,10 +38,10 @@
 struct abe_twl6040 {
 	int	jack_detection;	/* board can detect jack events */
 	int	mclk_freq;	/* MCLK frequency speed for twl6040 */
-
-	struct platform_device *dmic_codec_dev;
 };
 
+struct platform_device *dmic_codec_dev;
+
 static int omap_abe_hw_params(struct snd_pcm_substream *substream,
 	struct snd_pcm_hw_params *params)
 {
@@ -258,8 +258,6 @@ static int omap_abe_probe(struct platform_device *pdev)
 	if (priv == NULL)
 		return -ENOMEM;
 
-	priv->dmic_codec_dev = ERR_PTR(-EINVAL);
-
 	if (snd_soc_of_parse_card_name(card, "ti,model")) {
 		dev_err(&pdev->dev, "Card name is not provided\n");
 		return -ENODEV;
@@ -284,13 +282,6 @@ static int omap_abe_probe(struct platform_device *pdev)
 		num_links = 2;
 		abe_twl6040_dai_links[1].cpu_of_node = dai_node;
 		abe_twl6040_dai_links[1].platform_of_node = dai_node;
-
-		priv->dmic_codec_dev = platform_device_register_simple(
-						"dmic-codec", -1, NULL, 0);
-		if (IS_ERR(priv->dmic_codec_dev)) {
-			dev_err(&pdev->dev, "Can't instantiate dmic-codec\n");
-			return PTR_ERR(priv->dmic_codec_dev);
-		}
 	} else {
 		num_links = 1;
 	}
@@ -299,16 +290,14 @@ static int omap_abe_probe(struct platform_device *pdev)
 	of_property_read_u32(node, "ti,mclk-freq", &priv->mclk_freq);
 	if (!priv->mclk_freq) {
 		dev_err(&pdev->dev, "MCLK frequency not provided\n");
-		ret = -EINVAL;
-		goto err_unregister;
+		return -EINVAL;
 	}
 
 	card->fully_routed = 1;
 
 	if (!priv->mclk_freq) {
 		dev_err(&pdev->dev, "MCLK frequency missing\n");
-		ret = -ENODEV;
-		goto err_unregister;
+		return -ENODEV;
 	}
 
 	card->dai_link = abe_twl6040_dai_links;
@@ -317,17 +306,9 @@ static int omap_abe_probe(struct platform_device *pdev)
 	snd_soc_card_set_drvdata(card, priv);
 
 	ret = snd_soc_register_card(card);
-	if (ret) {
+	if (ret)
 		dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
 			ret);
-		goto err_unregister;
-	}
-
-	return 0;
-
-err_unregister:
-	if (!IS_ERR(priv->dmic_codec_dev))
-		platform_device_unregister(priv->dmic_codec_dev);
 
 	return ret;
 }
@@ -335,13 +316,9 @@ err_unregister:
 static int omap_abe_remove(struct platform_device *pdev)
 {
 	struct snd_soc_card *card = platform_get_drvdata(pdev);
-	struct abe_twl6040 *priv = snd_soc_card_get_drvdata(card);
 
 	snd_soc_unregister_card(card);
 
-	if (!IS_ERR(priv->dmic_codec_dev))
-		platform_device_unregister(priv->dmic_codec_dev);
-
 	return 0;
 }
 
@@ -361,7 +338,33 @@ static struct platform_driver omap_abe_driver = {
 	.remove = omap_abe_remove,
 };
 
-module_platform_driver(omap_abe_driver);
+static int __init omap_abe_init(void)
+{
+	int ret;
+
+	dmic_codec_dev = platform_device_register_simple("dmic-codec", -1, NULL,
+							 0);
+	if (IS_ERR(dmic_codec_dev)) {
+		pr_err("%s: dmic-codec device registration failed\n", __func__);
+		return PTR_ERR(dmic_codec_dev);
+	}
+
+	ret = platform_driver_register(&omap_abe_driver);
+	if (ret) {
+		pr_err("%s: platform driver registration failed\n", __func__);
+		platform_device_unregister(dmic_codec_dev);
+	}
+
+	return ret;
+}
+module_init(omap_abe_init);
+
+static void __exit omap_abe_exit(void)
+{
+	platform_driver_unregister(&omap_abe_driver);
+	platform_device_unregister(dmic_codec_dev);
+}
+module_exit(omap_abe_exit);
 
 MODULE_AUTHOR("Misael Lopez Cruz <misael.lopez@ti.com>");
 MODULE_DESCRIPTION("ALSA SoC for OMAP boards with ABE and twl6040 codec");
-- 
2.9.2

[toc] | [next] | [standalone]

#1466237 — Re: [PATCH for 4.8] ASoC: omap-abe-twl6040: Correct dmic-codec device registration

FromRussell King - ARM Linux <linux@armlinux.org.uk>
Date2016-08-19 11:00 +0200
SubjectRe: [PATCH for 4.8] ASoC: omap-abe-twl6040: Correct dmic-codec device registration
Message-ID<s7NOG-3o7-5@gated-at.bofh.it>
In reply to#1466058
On Fri, Aug 19, 2016 at 09:34:24AM +0300, Peter Ujfalusi wrote:
> The dmic-codec was registered within the platform_driver's probe function,
> which can cause deferred probe to run in loops as reported and analyzed by
> Russell King.
> 
> Use module_init/exit in the driver and handle the dmic-codec device
> registration and removal at that level instead of the platform_driver
> probe/remove.
> 
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> Reported-by: Russell King <linux@arm.linux.org.uk>

I think this address came from memory... it's certainly not the one that
I'm using today. ;)

> ---

This certainly fixes the problem:

VUSB: disabling
mmcblk0: mmc0:0002 00000 972 MiB
ALSA device list:
 mmcblk0: p1 p2
  No soundcards found.
omap-abe-twl6040 sound: ASoC: CPU DAI (null) not registered
omap-abe-twl6040 sound: snd_soc_register_card() failed: -517
Waiting 2 sec before mounting root device...
EXT4-fs (mmcblk0p2): mounting ext3 file system using the ext4 subsystem
EXT4-fs (mmcblk0p2): warning: maximal mount count reached, running e2fsck is recommended

and allows booting to continue.  Thanks.

Tested-by: Russell King <rmk+kernel@armlinux.org.uk>

-- 
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.

[toc] | [prev] | [next] | [standalone]

#1466257 — Re: [PATCH for 4.8] ASoC: omap-abe-twl6040: Correct dmic-codec device registration

FromPeter Ujfalusi <peter.ujfalusi@ti.com>
Date2016-08-19 12:00 +0200
SubjectRe: [PATCH for 4.8] ASoC: omap-abe-twl6040: Correct dmic-codec device registration
Message-ID<s7OKK-3Ya-11@gated-at.bofh.it>
In reply to#1466237
On 08/19/16 11:54, Russell King - ARM Linux wrote:
> On Fri, Aug 19, 2016 at 09:34:24AM +0300, Peter Ujfalusi wrote:
>> The dmic-codec was registered within the platform_driver's probe function,
>> which can cause deferred probe to run in loops as reported and analyzed by
>> Russell King.
>>
>> Use module_init/exit in the driver and handle the dmic-codec device
>> registration and removal at that level instead of the platform_driver
>> probe/remove.
>>
>> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
>> Reported-by: Russell King <linux@arm.linux.org.uk>
> 
> I think this address came from memory... it's certainly not the one that
> I'm using today. ;)

I'm really sorry. I have one txt file where I store e-mail addresses when I'm
lazy to look them up in my mailbox. txt updated.

Mark: can you fix Russell's e-mail addrress to:
linux@armlinux.org.uk

Or I can resend the patch.

> 
>> ---
> 
> This certainly fixes the problem:
> 
> VUSB: disabling
> mmcblk0: mmc0:0002 00000 972 MiB
> ALSA device list:
>  mmcblk0: p1 p2
>   No soundcards found.
> omap-abe-twl6040 sound: ASoC: CPU DAI (null) not registered
> omap-abe-twl6040 sound: snd_soc_register_card() failed: -517
> Waiting 2 sec before mounting root device...
> EXT4-fs (mmcblk0p2): mounting ext3 file system using the ext4 subsystem
> EXT4-fs (mmcblk0p2): warning: maximal mount count reached, running e2fsck is recommended
> 
> and allows booting to continue.  Thanks.
> 
> Tested-by: Russell King <rmk+kernel@armlinux.org.uk>
> 


-- 
Péter

[toc] | [prev] | [next] | [standalone]

#1466492 — Applied "ASoC: omap-abe-twl6040: Correct dmic-codec device registration" to the asoc tree

FromMark Brown <broonie@kernel.org>
Date2016-08-19 17:20 +0200
SubjectApplied "ASoC: omap-abe-twl6040: Correct dmic-codec device registration" to the asoc tree
Message-ID<s7TKq-7i3-27@gated-at.bofh.it>
In reply to#1466058
The patch

   ASoC: omap-abe-twl6040: Correct dmic-codec device registration

has been applied to the asoc tree at

   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 

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

From 21eb45db282317543ca46c821bbb8d5075e02cbe Mon Sep 17 00:00:00 2001
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
Date: Fri, 19 Aug 2016 09:34:24 +0300
Subject: [PATCH] ASoC: omap-abe-twl6040: Correct dmic-codec device
 registration

The dmic-codec was registered within the platform_driver's probe function,
which can cause deferred probe to run in loops as reported and analyzed by
Russell King.

Use module_init/exit in the driver and handle the dmic-codec device
registration and removal at that level instead of the platform_driver
probe/remove.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Reported-by: Russell King <rmk+kernel@armlinux.org.uk>
Tested-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/omap/omap-abe-twl6040.c | 61 ++++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 29 deletions(-)

diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c
index 0843a68f277c..f61b3b58083b 100644
--- a/sound/soc/omap/omap-abe-twl6040.c
+++ b/sound/soc/omap/omap-abe-twl6040.c
@@ -38,10 +38,10 @@
 struct abe_twl6040 {
 	int	jack_detection;	/* board can detect jack events */
 	int	mclk_freq;	/* MCLK frequency speed for twl6040 */
-
-	struct platform_device *dmic_codec_dev;
 };
 
+struct platform_device *dmic_codec_dev;
+
 static int omap_abe_hw_params(struct snd_pcm_substream *substream,
 	struct snd_pcm_hw_params *params)
 {
@@ -258,8 +258,6 @@ static int omap_abe_probe(struct platform_device *pdev)
 	if (priv == NULL)
 		return -ENOMEM;
 
-	priv->dmic_codec_dev = ERR_PTR(-EINVAL);
-
 	if (snd_soc_of_parse_card_name(card, "ti,model")) {
 		dev_err(&pdev->dev, "Card name is not provided\n");
 		return -ENODEV;
@@ -284,13 +282,6 @@ static int omap_abe_probe(struct platform_device *pdev)
 		num_links = 2;
 		abe_twl6040_dai_links[1].cpu_of_node = dai_node;
 		abe_twl6040_dai_links[1].platform_of_node = dai_node;
-
-		priv->dmic_codec_dev = platform_device_register_simple(
-						"dmic-codec", -1, NULL, 0);
-		if (IS_ERR(priv->dmic_codec_dev)) {
-			dev_err(&pdev->dev, "Can't instantiate dmic-codec\n");
-			return PTR_ERR(priv->dmic_codec_dev);
-		}
 	} else {
 		num_links = 1;
 	}
@@ -299,16 +290,14 @@ static int omap_abe_probe(struct platform_device *pdev)
 	of_property_read_u32(node, "ti,mclk-freq", &priv->mclk_freq);
 	if (!priv->mclk_freq) {
 		dev_err(&pdev->dev, "MCLK frequency not provided\n");
-		ret = -EINVAL;
-		goto err_unregister;
+		return -EINVAL;
 	}
 
 	card->fully_routed = 1;
 
 	if (!priv->mclk_freq) {
 		dev_err(&pdev->dev, "MCLK frequency missing\n");
-		ret = -ENODEV;
-		goto err_unregister;
+		return -ENODEV;
 	}
 
 	card->dai_link = abe_twl6040_dai_links;
@@ -317,17 +306,9 @@ static int omap_abe_probe(struct platform_device *pdev)
 	snd_soc_card_set_drvdata(card, priv);
 
 	ret = snd_soc_register_card(card);
-	if (ret) {
+	if (ret)
 		dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
 			ret);
-		goto err_unregister;
-	}
-
-	return 0;
-
-err_unregister:
-	if (!IS_ERR(priv->dmic_codec_dev))
-		platform_device_unregister(priv->dmic_codec_dev);
 
 	return ret;
 }
@@ -335,13 +316,9 @@ err_unregister:
 static int omap_abe_remove(struct platform_device *pdev)
 {
 	struct snd_soc_card *card = platform_get_drvdata(pdev);
-	struct abe_twl6040 *priv = snd_soc_card_get_drvdata(card);
 
 	snd_soc_unregister_card(card);
 
-	if (!IS_ERR(priv->dmic_codec_dev))
-		platform_device_unregister(priv->dmic_codec_dev);
-
 	return 0;
 }
 
@@ -361,7 +338,33 @@ static struct platform_driver omap_abe_driver = {
 	.remove = omap_abe_remove,
 };
 
-module_platform_driver(omap_abe_driver);
+static int __init omap_abe_init(void)
+{
+	int ret;
+
+	dmic_codec_dev = platform_device_register_simple("dmic-codec", -1, NULL,
+							 0);
+	if (IS_ERR(dmic_codec_dev)) {
+		pr_err("%s: dmic-codec device registration failed\n", __func__);
+		return PTR_ERR(dmic_codec_dev);
+	}
+
+	ret = platform_driver_register(&omap_abe_driver);
+	if (ret) {
+		pr_err("%s: platform driver registration failed\n", __func__);
+		platform_device_unregister(dmic_codec_dev);
+	}
+
+	return ret;
+}
+module_init(omap_abe_init);
+
+static void __exit omap_abe_exit(void)
+{
+	platform_driver_unregister(&omap_abe_driver);
+	platform_device_unregister(dmic_codec_dev);
+}
+module_exit(omap_abe_exit);
 
 MODULE_AUTHOR("Misael Lopez Cruz <misael.lopez@ti.com>");
 MODULE_DESCRIPTION("ALSA SoC for OMAP boards with ABE and twl6040 codec");
-- 
2.8.1

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web