Skip to contentSkip to conversation

ASoC: cs4271: free reset gpio in cs4271_remove()

PATCH In review Daniel Mack 4 participants 7 messages Feb 19, 2014

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: cs4271: free reset gpio in cs4271_remove()

The reset GPIO line is acquired in cs4271_probe(), so it should be freed from cs4271_remove() as well. This way, the driver can unloaded and reloaded more than once.

---
 sound/soc/codecs/cs4271.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/codecs/cs4271.c +3 -1
index ce05fd9..aeaa5c6 100644
@@ -604,9 +604,11 @@ static int cs4271_remove(struct snd_soc_codec *codec)
 {
 	struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec);
 
-	if (gpio_is_valid(cs4271->gpio_nreset))
+	if (gpio_is_valid(cs4271->gpio_nreset)) {
 		/* Set codec to the reset state */
 		gpio_set_value(cs4271->gpio_nreset, 0);
+		devm_gpio_free(codec->dev, cs4271->gpio_nreset);
+	}
 
 	return 0;
 };
Signature · 1 line
1.8.5.3
maintainer
#1 lore raw

sound/soc/codecs/cs4271.c static int cs4271_remove(struct snd_soc_codec *codec) · line 611

Quoted 5 lines · Daniel Mack
sound/soc/codecs/cs4271.c +3 -0
+	if (gpio_is_valid(cs4271->gpio_nreset)) {
 		/* Set codec to the reset state */
 		gpio_set_value(cs4271->gpio_nreset, 0);
+		devm_gpio_free(codec->dev, cs4271->gpio_nreset);
+	}

If it's being requested as a managed resource shouldn't it be being freed automatically?

#2 lore raw
Quoted 11 lines · Mark Brown

sound/soc/codecs/cs4271.c static int cs4271_remove(struct snd_soc_codec *codec) · line 611

Quoted 5 lines · Daniel Mack
sound/soc/codecs/cs4271.c +3 -0
+	if (gpio_is_valid(cs4271->gpio_nreset)) {
 		/* Set codec to the reset state */
 		gpio_set_value(cs4271->gpio_nreset, 0);
+		devm_gpio_free(codec->dev, cs4271->gpio_nreset);
+	}

If it's being requested as a managed resource shouldn't it be being freed automatically?

Nope, as the module itself will not go away necessarily. I hit the bug when unloading and reloading the machine driver. cs4271_probe(codec) will fail to acquire and drive the reset line, and the codec stays in reset.

Daniel

#3 lore raw
Quoted 13 lines · Daniel Mack
Quoted 11 lines · Mark Brown

sound/soc/codecs/cs4271.c static int cs4271_remove(struct snd_soc_codec *codec) · line 611

Quoted 5 lines · Daniel Mack
sound/soc/codecs/cs4271.c +3 -0
+	if (gpio_is_valid(cs4271->gpio_nreset)) {
  		/* Set codec to the reset state */
  		gpio_set_value(cs4271->gpio_nreset, 0);
+		devm_gpio_free(codec->dev, cs4271->gpio_nreset);
+	}

If it's being requested as a managed resource shouldn't it be being freed automatically?

Quoted 4 lines

Nope, as the module itself will not go away necessarily. I hit the bug when unloading and reloading the machine driver. cs4271_probe(codec) will fail to acquire and drive the reset line, and the codec stays in reset.

In my opinion a better solution is to move the requesting of the GPIO from the CODEC probe() function to the SPI/I2C probe() functions. Actually it looks as if most of the code (if not all) in the CODEC probe() function should be done when the driver is probed.

- Lars

maintainer
#4 lore raw
In reply to Daniel Mack
Quoted 12 lines · Daniel Mack
Quoted 10 lines · Mark Brown

sound/soc/codecs/cs4271.c static int cs4271_remove(struct snd_soc_codec *codec) · line 611

Quoted 5 lines · Daniel Mack
sound/soc/codecs/cs4271.c +3 -0
+	if (gpio_is_valid(cs4271->gpio_nreset)) {
 		/* Set codec to the reset state */
 		gpio_set_value(cs4271->gpio_nreset, 0);
+		devm_gpio_free(codec->dev, cs4271->gpio_nreset);
+	}

If it's being requested as a managed resource shouldn't it be being freed automatically?

Quoted 3 lines

Nope, as the module itself will not go away necessarily. I hit the bug when unloading and reloading the machine driver. cs4271_probe(codec) will fail to acquire and drive the reset line, and the codec stays in reset.

The fix here is to move the resource acquisition to the bus level probe instead of the ASoC card startup.

#5 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 11 lines · Mark Brown
Quoted 9 lines · Daniel Mack
Quoted 8 lines · Mark Brown
Quoted 3 lines · Daniel Mack
(quoted diff) +1 -0
+	if (gpio_is_valid(cs4271->gpio_nreset)) { /* Set codec to

the reset state */ gpio_set_value(cs4271->gpio_nreset, 0); +
devm_gpio_free(codec->dev, cs4271->gpio_nreset); + }

If it's being requested as a managed resource shouldn't it be being freed automatically?

Quoted 8 lines
Quoted 4 lines

Nope, as the module itself will not go away necessarily. I hit the bug when unloading and reloading the machine driver. cs4271_probe(codec) will fail to acquire and drive the reset line, and the codec stays in reset.

The fix here is to move the resource acquisition to the bus level probe instead of the ASoC card startup.

Alright. I thought there was a verdict once that resource claiming should be done right before usage, but you're right, it really rather belongs into the bus probe functions.

I'll send another version.

Thanks!
Daniel

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJTBJ72AAoJELphMRr8Y1QkXt8P/RErTL26/X3s/MnYfhuPDzsx T7oU/YSpYvcqBVBab3rZjbyELRPqcrWO0XaiVFLiOqwt2KslKK/k8zz8gZIsvOxM YzheQMzI45sosYCFf1OssC7ojwTTks/hwgKzOj0Hi0aWtSVYRgV2kvg8S4tiwEzl OpM9Z4r0lCw9kJidlSwPCXcg+s4BN6xMcqaTIFfU1QCQ84dxHwzhf7cYZliOtWEv FlnMVKYAtBVCACVqBxHS+2OdopcTuwQ0aqts7UMXFq2MGCIYf6Fyq/qmmCMuaZrN yDcm3fpJodIoZo20nIf2zpaPGgD7ce+LK/Mu46sZ4MFRBxHgGlQ0C2UNZgNlVILI mY6hj8s44kCptX1sDPTviYoRnxQ4PTAdRUjfVRuShjkEFi8WHKEbIHwLqn0BvjSB FaaESTg5NhBJsAroTK83nqqY7MxcLZV4YBhnoH4Mhc2IZHa5hOxcHy5crGyUUEGF 4QWMJoHW+J3s8malsvwcNj8Fv4a6SaeptNr+4EkGW/lwrVAjl/03Ei7MvvqApyPm TSRuBXQUbiJhxBpkAMhFQ7jIj3Gw+CcgiudcwLA1sVdN2uTvbe/YRas/ZlWQn/W9 TVihbfTM8apHwCacyJYX7yE16eJ162AznYqCZC5ZCJ1L2k8ep30bhwEJk2nq4GP1 6FikGJ1wGOLdvDbwOc8b
=dthk
-----END PGP SIGNATURE-----

maintainer
#6 lore raw
Quoted 3 lines · Daniel Mack

Alright. I thought there was a verdict once that resource claiming should be done right before usage, but you're right, it really rather belongs into the bus probe functions.

No, that's not ever been the case as far as I can recall. There were some things it used to not be possible to do due to the ASoC level I/O only working after the card comes up but that's a different issue.