diff mbox series

[v2] ASoC: tegra: probe deferral error reporting

Message ID 20180814140145.12212-1-marcel@ziswiler.com
State Deferred
Headers show
Series [v2] ASoC: tegra: probe deferral error reporting | expand

Commit Message

Marcel Ziswiler Aug. 14, 2018, 2:01 p.m. UTC
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

Actually report the error codes from of_get_named_gpio() resp.
devm_gpio_request_one() upon trying to get the codec reset resp. sync
GPIOs unless it is just a probe deferral.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

---

Changes in v2:
- Silence probe deferral as suggested by Stefan.
- Fix line over 80 characters as reported by checkpatch.

 sound/soc/tegra/tegra20_ac97.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

Comments

Jon Hunter Aug. 15, 2018, 4:02 p.m. UTC | #1
On 14/08/18 15:01, Marcel Ziswiler wrote:
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 
> Actually report the error codes from of_get_named_gpio() resp.
> devm_gpio_request_one() upon trying to get the codec reset resp. sync
> GPIOs unless it is just a probe deferral.
> 
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 
> ---
> 
> Changes in v2:
> - Silence probe deferral as suggested by Stefan.
> - Fix line over 80 characters as reported by checkpatch.
> 
>  sound/soc/tegra/tegra20_ac97.c | 19 ++++++++++++++++---
>  1 file changed, 16 insertions(+), 3 deletions(-)
> 
> diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c
> index 682ef33afb5f..2ac6b2d73980 100644
> --- a/sound/soc/tegra/tegra20_ac97.c
> +++ b/sound/soc/tegra/tegra20_ac97.c
> @@ -351,18 +351,31 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev)
>  		ret = devm_gpio_request_one(&pdev->dev, ac97->reset_gpio,
>  					    GPIOF_OUT_INIT_HIGH, "codec-reset");
>  		if (ret) {
> -			dev_err(&pdev->dev, "could not get codec-reset GPIO\n");
> +			if (ret != -EPROBE_DEFER)
> +				dev_err(&pdev->dev,
> +					"could not get codec-reset GPIO: %d\n",
> +					ret);
> +
>  			goto err_clk_put;
>  		}
>  	} else {
> -		dev_err(&pdev->dev, "no codec-reset GPIO supplied\n");
> +		ret = ac97->reset_gpio;
> +		if (ret != -EPROBE_DEFER)
> +			dev_err(&pdev->dev,
> +				"no codec-reset GPIO supplied: %d\n",
> +				ret);
> +
>  		goto err_clk_put;
>  	}
>  
>  	ac97->sync_gpio = of_get_named_gpio(pdev->dev.of_node,
>  					    "nvidia,codec-sync-gpio", 0);
>  	if (!gpio_is_valid(ac97->sync_gpio)) {
> -		dev_err(&pdev->dev, "no codec-sync GPIO supplied\n");
> +		ret = ac97->sync_gpio;
> +		if (ret != -EPROBE_DEFER)
> +			dev_err(&pdev->dev, "no codec-sync GPIO supplied: %d\n",
> +				ret);
> +
>  		goto err_clk_put;
>  	}

Thanks, looks good to me. However, I wonder why we don't request the
'sync_gpio' in the probe like we do for the reset? Otherwise ...

Acked-by: Jon Hunter <jonathanh@nvidia.com>

Cheers
Jon
Stefan Agner Aug. 18, 2018, 1:02 p.m. UTC | #2
On 15.08.2018 18:02, Jon Hunter wrote:
> On 14/08/18 15:01, Marcel Ziswiler wrote:
>> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
>>
>> Actually report the error codes from of_get_named_gpio() resp.
>> devm_gpio_request_one() upon trying to get the codec reset resp. sync
>> GPIOs unless it is just a probe deferral.
>>
>> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
>>
>> ---
>>
>> Changes in v2:
>> - Silence probe deferral as suggested by Stefan.
>> - Fix line over 80 characters as reported by checkpatch.
>>
>>  sound/soc/tegra/tegra20_ac97.c | 19 ++++++++++++++++---
>>  1 file changed, 16 insertions(+), 3 deletions(-)
>>
>> diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c
>> index 682ef33afb5f..2ac6b2d73980 100644
>> --- a/sound/soc/tegra/tegra20_ac97.c
>> +++ b/sound/soc/tegra/tegra20_ac97.c
>> @@ -351,18 +351,31 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev)
>>  		ret = devm_gpio_request_one(&pdev->dev, ac97->reset_gpio,
>>  					    GPIOF_OUT_INIT_HIGH, "codec-reset");
>>  		if (ret) {
>> -			dev_err(&pdev->dev, "could not get codec-reset GPIO\n");
>> +			if (ret != -EPROBE_DEFER)
>> +				dev_err(&pdev->dev,
>> +					"could not get codec-reset GPIO: %d\n",
>> +					ret);
>> +
>>  			goto err_clk_put;
>>  		}
>>  	} else {
>> -		dev_err(&pdev->dev, "no codec-reset GPIO supplied\n");
>> +		ret = ac97->reset_gpio;
>> +		if (ret != -EPROBE_DEFER)
>> +			dev_err(&pdev->dev,
>> +				"no codec-reset GPIO supplied: %d\n",
>> +				ret);
>> +
>>  		goto err_clk_put;
>>  	}
>>
>>  	ac97->sync_gpio = of_get_named_gpio(pdev->dev.of_node,
>>  					    "nvidia,codec-sync-gpio", 0);
>>  	if (!gpio_is_valid(ac97->sync_gpio)) {
>> -		dev_err(&pdev->dev, "no codec-sync GPIO supplied\n");
>> +		ret = ac97->sync_gpio;
>> +		if (ret != -EPROBE_DEFER)
>> +			dev_err(&pdev->dev, "no codec-sync GPIO supplied: %d\n",
>> +				ret);
>> +
>>  		goto err_clk_put;
>>  	}
> 
> Thanks, looks good to me. However, I wonder why we don't request the
> 'sync_gpio' in the probe like we do for the reset? Otherwise ...

The comment in tegra20_ac97_codec_warm_reset() is probably the reason:

/*
 * although sync line is driven by the DAC pad group warm reset using
 * the controller cmd is not working, have to toggle sync line
 * manually.
 */

I guess the GPIO need to be freed so that the DAC pad group can use the
sync line?

> 
> Acked-by: Jon Hunter <jonathanh@nvidia.com>

Also looks good to me:

Reviewed-by: Stefan Agner <stefan@agner.ch>

--
Stefan
diff mbox series

Patch

diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c
index 682ef33afb5f..2ac6b2d73980 100644
--- a/sound/soc/tegra/tegra20_ac97.c
+++ b/sound/soc/tegra/tegra20_ac97.c
@@ -351,18 +351,31 @@  static int tegra20_ac97_platform_probe(struct platform_device *pdev)
 		ret = devm_gpio_request_one(&pdev->dev, ac97->reset_gpio,
 					    GPIOF_OUT_INIT_HIGH, "codec-reset");
 		if (ret) {
-			dev_err(&pdev->dev, "could not get codec-reset GPIO\n");
+			if (ret != -EPROBE_DEFER)
+				dev_err(&pdev->dev,
+					"could not get codec-reset GPIO: %d\n",
+					ret);
+
 			goto err_clk_put;
 		}
 	} else {
-		dev_err(&pdev->dev, "no codec-reset GPIO supplied\n");
+		ret = ac97->reset_gpio;
+		if (ret != -EPROBE_DEFER)
+			dev_err(&pdev->dev,
+				"no codec-reset GPIO supplied: %d\n",
+				ret);
+
 		goto err_clk_put;
 	}
 
 	ac97->sync_gpio = of_get_named_gpio(pdev->dev.of_node,
 					    "nvidia,codec-sync-gpio", 0);
 	if (!gpio_is_valid(ac97->sync_gpio)) {
-		dev_err(&pdev->dev, "no codec-sync GPIO supplied\n");
+		ret = ac97->sync_gpio;
+		if (ret != -EPROBE_DEFER)
+			dev_err(&pdev->dev, "no codec-sync GPIO supplied: %d\n",
+				ret);
+
 		goto err_clk_put;
 	}