[PATCH] iio: dac: ti-dac7311: Add check for spi_setup

[PATCH] iio: dac: ti-dac7311: Add check for spi_setup

[Chen Ni]

Add check for the return value of spi_setup() and return the error
if it fails in order to catch the error.

Signed-off-by: Chen Ni <nichen@iscas.ac.cn>
---
 drivers/iio/dac/ti-dac7311.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/iio/dac/ti-dac7311.c b/drivers/iio/dac/ti-dac7311.c
index 7f89d2a52f49..8e8a8ab0ebf6 100644
--- a/drivers/iio/dac/ti-dac7311.c
+++ b/drivers/iio/dac/ti-dac7311.c
@@ -249,7 +249,11 @@ static int ti_dac_probe(struct spi_device *spi)
 
 	spi->mode = SPI_MODE_1;
 	spi->bits_per_word = 16;
-	spi_setup(spi);
+	ret = spi_setup(spi);
+	if (ret < 0) {
+		dev_err(dev, "spi_setup failed\n");
+		return ret;
+	}
 
 	indio_dev->info = &ti_dac_info;
 	indio_dev->name = spi_get_device_id(spi)->name;
-- 
2.25.1

Re: [PATCH] iio: dac: ti-dac7311: Add check for spi_setup

[Jonathan Cameron]

On Fri,  5 Jul 2024 16:42:50 +0800
Chen Ni <nichen@iscas.ac.cn> wrote:

> Add check for the return value of spi_setup() and return the error
> if it fails in order to catch the error.
> 
> Signed-off-by: Chen Ni <nichen@iscas.ac.cn>

Hi Chen,

This driver is using dev_err_probe() in some error returns from
the probe function and not in others. It would be good to change them
all to dev_err_probe() as it's both shorter and brings other advantages
in some paths.   In meantime let's not introduce another one to convert!

I'll make the change and apply this.

Applied to the testing branch of iio.git. I'll rebase that on 6.11-rc1 once
that is available in a couple of weeks time. At that point it'll become
the iio.git togreg branch and be picked up by linux next etc


> ---
>  drivers/iio/dac/ti-dac7311.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/iio/dac/ti-dac7311.c b/drivers/iio/dac/ti-dac7311.c
> index 7f89d2a52f49..8e8a8ab0ebf6 100644
> --- a/drivers/iio/dac/ti-dac7311.c
> +++ b/drivers/iio/dac/ti-dac7311.c
> @@ -249,7 +249,11 @@ static int ti_dac_probe(struct spi_device *spi)
>  
>  	spi->mode = SPI_MODE_1;
>  	spi->bits_per_word = 16;
> -	spi_setup(spi);
> +	ret = spi_setup(spi);
> +	if (ret < 0) {
> +		dev_err(dev, "spi_setup failed\n");
> +		return ret;
		return dev_err_probe(dev, ret, "spi_setup failed\n");
and drop the now unneeded brackets.
> +	}
>  
>  	indio_dev->info = &ti_dac_info;
>  	indio_dev->name = spi_get_device_id(spi)->name;