Re: [PATCH v2 2/2] iio: light: cm3323: use dev_err_probe() in probe path

[David Lechner]

On 4/4/26 3:58 PM, Aldo Conte wrote:
> Replace dev_err() calls with dev_err_probe() in cm3323_init() and
> cm3323_probe(). cm3323_init() is called by cm3323_probe(),  so using
> dev_err_probe() ensures that deferred probing is handled
> correctly and simplifies error paths.
> 
> Remove the redundant error message in cm3323_probe().
> 
> Tested on a Raspberry Pi 3B using i2c-stub. The driver probes
> successfully and successfully read integration_time after this change.
> 
> Suggested-by: Andy Shevchenko <andy@xxxxxxxxxx>
> Signed-off-by: Aldo Conte <aldocontelk@xxxxxxxxx>
> ---
> Changes in v2:
> - Add struct device *dev local variable to shorten dev_err_probe()
>   calls to one-liners (suggested by Andy Shevchenko)
>   
>  drivers/iio/light/cm3323.c | 18 +++++++-----------
>  1 file changed, 7 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/iio/light/cm3323.c b/drivers/iio/light/cm3323.c
> index 0fe61b8a7029..5b36fc265c6c 100644
> --- a/drivers/iio/light/cm3323.c
> +++ b/drivers/iio/light/cm3323.c
> @@ -80,22 +80,19 @@ static int cm3323_init(struct iio_dev *indio_dev)
>  {
>  	int ret;
>  	struct cm3323_data *data = iio_priv(indio_dev);
> +	struct device *dev = &data->client->dev;
>  
>  	ret = i2c_smbus_read_word_data(data->client, CM3323_CMD_CONF);
> -	if (ret < 0) {
> -		dev_err(&data->client->dev, "Error reading reg_conf\n");
> -		return ret;
> -	}
> +	if (ret < 0)
> +		return dev_err_probe(dev, ret, "Error reading reg_conf\n");
>  
>  	/* enable sensor and set auto force mode */
>  	ret &= ~(CM3323_CONF_SD_BIT | CM3323_CONF_AF_BIT);
>  	data->reg_conf = ret;
>  
>  	ret = i2c_smbus_write_word_data(data->client, CM3323_CMD_CONF, data->reg_conf);
> -	if (ret < 0) {
> -		dev_err(&data->client->dev, "Error writing reg_conf\n");
> -		return ret;
> -	}
> +	if (ret < 0)
> +		return dev_err_probe(dev, ret, "Error writing reg_conf\n");
>  
>  	return 0;
>  }
> @@ -236,10 +233,9 @@ static int cm3323_probe(struct i2c_client *client)
>  	indio_dev->modes = INDIO_DIRECT_MODE;
>  
>  	ret = cm3323_init(indio_dev);
> -	if (ret < 0) {
> -		dev_err(&client->dev, "cm3323 chip init failed\n");
> +	if (ret < 0)
>  		return ret;
> -	}
> +
>  

checkpatch.pl should have warned about having to blank lines here
now. Prefer only one.

>  	ret = devm_add_action_or_reset(&client->dev, cm3323_disable, indio_dev);
>  	if (ret < 0)