[PATCH] nfc: st95hf: Make use of the helper function dev_err_probe()

[PATCH] nfc: st95hf: Make use of the helper function dev_err_probe()

[Cai Huoqing]

When possible use dev_err_probe help to properly deal with the
PROBE_DEFER error, the benefit is that DEFER issue will be logged
in the devices_deferred debugfs file.
Using dev_err_probe() can reduce code size, and the error value
gets printed.

Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
---
 drivers/nfc/st95hf/core.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/nfc/st95hf/core.c b/drivers/nfc/st95hf/core.c
index d16cf3ff644e..8337c0e0c964 100644
--- a/drivers/nfc/st95hf/core.c
+++ b/drivers/nfc/st95hf/core.c
@@ -1087,10 +1087,9 @@ static int st95hf_probe(struct spi_device *nfc_spi_dev)
 		st95context->st95hf_supply =
 			devm_regulator_get(&nfc_spi_dev->dev,
 					   "st95hfvin");
-		if (IS_ERR(st95context->st95hf_supply)) {
-			dev_err(&nfc_spi_dev->dev, "failed to acquire regulator\n");
-			return PTR_ERR(st95context->st95hf_supply);
-		}
+		if (IS_ERR(st95context->st95hf_supply))
+			return dev_err_probe(&nfc_spi_dev->dev, PTR_ERR(st95context->st95hf_supply),
+					     "failed to acquire regulator\n");
 
 		ret = regulator_enable(st95context->st95hf_supply);
 		if (ret) {
-- 
2.25.1

Re: [PATCH] nfc: st95hf: Make use of the helper function dev_err_probe()

[Krzysztof Kozlowski]

On 16/09/2021 17:36, Cai Huoqing wrote:
> When possible use dev_err_probe help to properly deal with the
> PROBE_DEFER error, the benefit is that DEFER issue will be logged
> in the devices_deferred debugfs file.
> Using dev_err_probe() can reduce code size, and the error value
> gets printed.
> 
> Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
> ---
>  drivers/nfc/st95hf/core.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/nfc/st95hf/core.c b/drivers/nfc/st95hf/core.c
> index d16cf3ff644e..8337c0e0c964 100644
> --- a/drivers/nfc/st95hf/core.c
> +++ b/drivers/nfc/st95hf/core.c
> @@ -1087,10 +1087,9 @@ static int st95hf_probe(struct spi_device *nfc_spi_dev)
>  		st95context->st95hf_supply =
>  			devm_regulator_get(&nfc_spi_dev->dev,
>  					   "st95hfvin");
> -		if (IS_ERR(st95context->st95hf_supply)) {
> -			dev_err(&nfc_spi_dev->dev, "failed to acquire regulator\n");
> -			return PTR_ERR(st95context->st95hf_supply);
> -		}
> +		if (IS_ERR(st95context->st95hf_supply))
> +			return dev_err_probe(&nfc_spi_dev->dev, PTR_ERR(st95context->st95hf_supply),
> +					     "failed to acquire regulator\n");

I think the preferred approach was Rob's dev_err removal. See:

https://lore.kernel.org/lkml/20200911152943.GA17780@kozik-lap/
https://lore.kernel.org/lkml/CAL_Jsq+ajm5aiAJfQdS2+2DO1ynBDHWha_7TsA4u-2qwd87y6g@mail.gmail.com/

P.S. You need to Cc all folks and all lists. The cc-list here is too short.

Best regards,
Krzysztof