diff mbox series

[v2,06/18] media: i2c: max9271: Check max9271_write() return

Message ID 20210315131512.133720-7-jacopo+renesas@jmondi.org (mailing list archive)
State New, archived
Headers show
Series media: gmsl: Reliability improvement | expand

Commit Message

Jacopo Mondi March 15, 2021, 1:15 p.m. UTC 
Check the return value of the max9271_write() function in the
max9271 library driver.

While at it, modify an existing condition to be made identical
to other checks.

Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
---
 drivers/media/i2c/max9271.c | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

Comments

Kieran Bingham March 15, 2021, 3:46 p.m. UTC | #1 
Hi Jacopo,

On 15/03/2021 13:15, Jacopo Mondi wrote:
> Check the return value of the max9271_write() function in the
> max9271 library driver.
> 
> While at it, modify an existing condition to be made identical
> to other checks.

Excellent, much better to catch write errors early.

Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>


> Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
> ---
>  drivers/media/i2c/max9271.c | 30 +++++++++++++++++++++++-------
>  1 file changed, 23 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/media/i2c/max9271.c b/drivers/media/i2c/max9271.c
> index c495582dcff6..2c7dc7fb9846 100644
> --- a/drivers/media/i2c/max9271.c
> +++ b/drivers/media/i2c/max9271.c
> @@ -106,7 +106,10 @@ int max9271_set_serial_link(struct max9271_device *dev, bool enable)
>  	 * Short delays here appear to show bit-errors in the writes following.
>  	 * Therefore a conservative delay seems best here.
>  	 */
> -	max9271_write(dev, 0x04, val);
> +	ret = max9271_write(dev, 0x04, val);
> +	if (ret < 0)
> +		return ret;
> +
>  	usleep_range(5000, 8000);
>  
>  	return 0;
> @@ -118,7 +121,7 @@ int max9271_configure_i2c(struct max9271_device *dev, u8 i2c_config)
>  	int ret;
>  
>  	ret = max9271_write(dev, 0x0d, i2c_config);
> -	if (ret)
> +	if (ret < 0)
>  		return ret;
>  
>  	/* The delay required after an I2C bus configuration change is not
> @@ -143,7 +146,10 @@ int max9271_set_high_threshold(struct max9271_device *dev, bool enable)
>  	 * Enable or disable reverse channel high threshold to increase
>  	 * immunity to power supply noise.
>  	 */
> -	max9271_write(dev, 0x08, enable ? ret | BIT(0) : ret & ~BIT(0));
> +	ret = max9271_write(dev, 0x08, enable ? ret | BIT(0) : ret & ~BIT(0));
> +	if (ret < 0)
> +		return ret;
> +
>  	usleep_range(2000, 2500);
>  
>  	return 0;
> @@ -152,6 +158,8 @@ EXPORT_SYMBOL_GPL(max9271_set_high_threshold);
>  
>  int max9271_configure_gmsl_link(struct max9271_device *dev)
>  {
> +	int ret;
> +
>  	/*
>  	 * Configure the GMSL link:
>  	 *
> @@ -162,16 +170,24 @@ int max9271_configure_gmsl_link(struct max9271_device *dev)
>  	 *
>  	 * TODO: Make the GMSL link configuration parametric.
>  	 */
> -	max9271_write(dev, 0x07, MAX9271_DBL | MAX9271_HVEN |
> -		      MAX9271_EDC_1BIT_PARITY);
> +	ret = max9271_write(dev, 0x07, MAX9271_DBL | MAX9271_HVEN |
> +			    MAX9271_EDC_1BIT_PARITY);
> +	if (ret < 0)
> +		return ret;
> +
>  	usleep_range(5000, 8000);
>  
>  	/*
>  	 * Adjust spread spectrum to +4% and auto-detect pixel clock
>  	 * and serial link rate.
>  	 */
> -	max9271_write(dev, 0x02, MAX9271_SPREAD_SPECT_4 | MAX9271_R02_RES |
> -		      MAX9271_PCLK_AUTODETECT | MAX9271_SERIAL_AUTODETECT);
> +	ret = max9271_write(dev, 0x02,
> +			    MAX9271_SPREAD_SPECT_4 | MAX9271_R02_RES |
> +			    MAX9271_PCLK_AUTODETECT |
> +			    MAX9271_SERIAL_AUTODETECT);
> +	if (ret < 0)
> +		return ret;
> +
>  	usleep_range(5000, 8000);
>  
>  	return 0;
>
Laurent Pinchart March 15, 2021, 9:38 p.m. UTC | #2 
Hi Jacopo,

Thank you for the patch.

On Mon, Mar 15, 2021 at 02:15:00PM +0100, Jacopo Mondi wrote:
> Check the return value of the max9271_write() function in the
> max9271 library driver.
> 
> While at it, modify an existing condition to be made identical
> to other checks.
> 
> Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  drivers/media/i2c/max9271.c | 30 +++++++++++++++++++++++-------
>  1 file changed, 23 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/media/i2c/max9271.c b/drivers/media/i2c/max9271.c
> index c495582dcff6..2c7dc7fb9846 100644
> --- a/drivers/media/i2c/max9271.c
> +++ b/drivers/media/i2c/max9271.c
> @@ -106,7 +106,10 @@ int max9271_set_serial_link(struct max9271_device *dev, bool enable)
>  	 * Short delays here appear to show bit-errors in the writes following.
>  	 * Therefore a conservative delay seems best here.
>  	 */
> -	max9271_write(dev, 0x04, val);
> +	ret = max9271_write(dev, 0x04, val);
> +	if (ret < 0)
> +		return ret;
> +
>  	usleep_range(5000, 8000);
>  
>  	return 0;
> @@ -118,7 +121,7 @@ int max9271_configure_i2c(struct max9271_device *dev, u8 i2c_config)
>  	int ret;
>  
>  	ret = max9271_write(dev, 0x0d, i2c_config);
> -	if (ret)
> +	if (ret < 0)
>  		return ret;
>  
>  	/* The delay required after an I2C bus configuration change is not
> @@ -143,7 +146,10 @@ int max9271_set_high_threshold(struct max9271_device *dev, bool enable)
>  	 * Enable or disable reverse channel high threshold to increase
>  	 * immunity to power supply noise.
>  	 */
> -	max9271_write(dev, 0x08, enable ? ret | BIT(0) : ret & ~BIT(0));
> +	ret = max9271_write(dev, 0x08, enable ? ret | BIT(0) : ret & ~BIT(0));
> +	if (ret < 0)
> +		return ret;
> +
>  	usleep_range(2000, 2500);
>  
>  	return 0;
> @@ -152,6 +158,8 @@ EXPORT_SYMBOL_GPL(max9271_set_high_threshold);
>  
>  int max9271_configure_gmsl_link(struct max9271_device *dev)
>  {
> +	int ret;
> +
>  	/*
>  	 * Configure the GMSL link:
>  	 *
> @@ -162,16 +170,24 @@ int max9271_configure_gmsl_link(struct max9271_device *dev)
>  	 *
>  	 * TODO: Make the GMSL link configuration parametric.
>  	 */
> -	max9271_write(dev, 0x07, MAX9271_DBL | MAX9271_HVEN |
> -		      MAX9271_EDC_1BIT_PARITY);
> +	ret = max9271_write(dev, 0x07, MAX9271_DBL | MAX9271_HVEN |
> +			    MAX9271_EDC_1BIT_PARITY);
> +	if (ret < 0)
> +		return ret;
> +
>  	usleep_range(5000, 8000);
>  
>  	/*
>  	 * Adjust spread spectrum to +4% and auto-detect pixel clock
>  	 * and serial link rate.
>  	 */
> -	max9271_write(dev, 0x02, MAX9271_SPREAD_SPECT_4 | MAX9271_R02_RES |
> -		      MAX9271_PCLK_AUTODETECT | MAX9271_SERIAL_AUTODETECT);
> +	ret = max9271_write(dev, 0x02,
> +			    MAX9271_SPREAD_SPECT_4 | MAX9271_R02_RES |
> +			    MAX9271_PCLK_AUTODETECT |
> +			    MAX9271_SERIAL_AUTODETECT);
> +	if (ret < 0)
> +		return ret;
> +
>  	usleep_range(5000, 8000);
>  
>  	return 0;
diff mbox series

Patch

diff --git a/drivers/media/i2c/max9271.c b/drivers/media/i2c/max9271.c
index c495582dcff6..2c7dc7fb9846 100644
--- a/drivers/media/i2c/max9271.c
+++ b/drivers/media/i2c/max9271.c
@@ -106,7 +106,10 @@  int max9271_set_serial_link(struct max9271_device *dev, bool enable)
 	 * Short delays here appear to show bit-errors in the writes following.
 	 * Therefore a conservative delay seems best here.
 	 */
-	max9271_write(dev, 0x04, val);
+	ret = max9271_write(dev, 0x04, val);
+	if (ret < 0)
+		return ret;
+
 	usleep_range(5000, 8000);
 
 	return 0;
@@ -118,7 +121,7 @@  int max9271_configure_i2c(struct max9271_device *dev, u8 i2c_config)
 	int ret;
 
 	ret = max9271_write(dev, 0x0d, i2c_config);
-	if (ret)
+	if (ret < 0)
 		return ret;
 
 	/* The delay required after an I2C bus configuration change is not
@@ -143,7 +146,10 @@  int max9271_set_high_threshold(struct max9271_device *dev, bool enable)
 	 * Enable or disable reverse channel high threshold to increase
 	 * immunity to power supply noise.
 	 */
-	max9271_write(dev, 0x08, enable ? ret | BIT(0) : ret & ~BIT(0));
+	ret = max9271_write(dev, 0x08, enable ? ret | BIT(0) : ret & ~BIT(0));
+	if (ret < 0)
+		return ret;
+
 	usleep_range(2000, 2500);
 
 	return 0;
@@ -152,6 +158,8 @@  EXPORT_SYMBOL_GPL(max9271_set_high_threshold);
 
 int max9271_configure_gmsl_link(struct max9271_device *dev)
 {
+	int ret;
+
 	/*
 	 * Configure the GMSL link:
 	 *
@@ -162,16 +170,24 @@  int max9271_configure_gmsl_link(struct max9271_device *dev)
 	 *
 	 * TODO: Make the GMSL link configuration parametric.
 	 */
-	max9271_write(dev, 0x07, MAX9271_DBL | MAX9271_HVEN |
-		      MAX9271_EDC_1BIT_PARITY);
+	ret = max9271_write(dev, 0x07, MAX9271_DBL | MAX9271_HVEN |
+			    MAX9271_EDC_1BIT_PARITY);
+	if (ret < 0)
+		return ret;
+
 	usleep_range(5000, 8000);
 
 	/*
 	 * Adjust spread spectrum to +4% and auto-detect pixel clock
 	 * and serial link rate.
 	 */
-	max9271_write(dev, 0x02, MAX9271_SPREAD_SPECT_4 | MAX9271_R02_RES |
-		      MAX9271_PCLK_AUTODETECT | MAX9271_SERIAL_AUTODETECT);
+	ret = max9271_write(dev, 0x02,
+			    MAX9271_SPREAD_SPECT_4 | MAX9271_R02_RES |
+			    MAX9271_PCLK_AUTODETECT |
+			    MAX9271_SERIAL_AUTODETECT);
+	if (ret < 0)
+		return ret;
+
 	usleep_range(5000, 8000);
 
 	return 0;