diff mbox series

[v1,09/15] media: i2c: imx290: Use dev_err_probe()

Message ID 20221122223250.21233-10-laurent.pinchart@ideasonboard.com (mailing list archive)
State New, archived
Headers show
Series media: i2c: imx290: Miscellaneous improvements | expand

Commit Message

Laurent Pinchart Nov. 22, 2022, 10:32 p.m. UTC
Improve error handling in the probe() function with dev_err_probe().

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 drivers/media/i2c/imx290.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

Comments

Alexander Stein Nov. 23, 2022, 8:16 a.m. UTC | #1
Hello Laurent,

thanks for working on this.

Am Dienstag, 22. November 2022, 23:32:44 CET schrieb Laurent Pinchart:
> Improve error handling in the probe() function with dev_err_probe().
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>  drivers/media/i2c/imx290.c | 20 ++++++++------------
>  1 file changed, 8 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
> index 655f676df3d2..d423860402fd 100644
> --- a/drivers/media/i2c/imx290.c
> +++ b/drivers/media/i2c/imx290.c
> @@ -1222,10 +1222,9 @@ static int imx290_probe(struct i2c_client *client)
> 
>  	/* get system clock (xclk) */
>  	imx290->xclk = devm_clk_get(dev, "xclk");
> -	if (IS_ERR(imx290->xclk)) {
> -		dev_err(dev, "Could not get xclk");
> -		return PTR_ERR(imx290->xclk);
> -	}
> +	if (IS_ERR(imx290->xclk))
> +		return dev_err_probe(dev, PTR_ERR(imx290->xclk),
> +				     "Could not get xclk");
> 
>  	ret = fwnode_property_read_u32(dev_fwnode(dev), "clock-frequency",
>  				       &xclk_freq);
> @@ -1248,17 +1247,14 @@ static int imx290_probe(struct i2c_client *client)
>  	}
> 
>  	ret = imx290_get_regulators(dev, imx290);
> -	if (ret < 0) {
> -		dev_err(dev, "Cannot get regulators\n");
> -		return ret;
> -	}
> +	if (ret < 0)
> +		return dev_err_probe(dev, ret, "Cannot get regulators\n");
> 
>  	imx290->rst_gpio = devm_gpiod_get_optional(dev, "reset",
>  						   
GPIOD_OUT_HIGH);
> -	if (IS_ERR(imx290->rst_gpio)) {
> -		dev_err(dev, "Cannot get reset gpio\n");
> -		return PTR_ERR(imx290->rst_gpio);
> -	}
> +	if (IS_ERR(imx290->rst_gpio))
> +		return dev_err_probe(dev, PTR_ERR(imx290->rst_gpio),
> +				     "Cannot get reset gpio\n");
> 
>  	mutex_init(&imx290->lock);

Oh, you already addressed my dev_err_probe comments on the last patch :)
For this one:
Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
diff mbox series

Patch

diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
index 655f676df3d2..d423860402fd 100644
--- a/drivers/media/i2c/imx290.c
+++ b/drivers/media/i2c/imx290.c
@@ -1222,10 +1222,9 @@  static int imx290_probe(struct i2c_client *client)
 
 	/* get system clock (xclk) */
 	imx290->xclk = devm_clk_get(dev, "xclk");
-	if (IS_ERR(imx290->xclk)) {
-		dev_err(dev, "Could not get xclk");
-		return PTR_ERR(imx290->xclk);
-	}
+	if (IS_ERR(imx290->xclk))
+		return dev_err_probe(dev, PTR_ERR(imx290->xclk),
+				     "Could not get xclk");
 
 	ret = fwnode_property_read_u32(dev_fwnode(dev), "clock-frequency",
 				       &xclk_freq);
@@ -1248,17 +1247,14 @@  static int imx290_probe(struct i2c_client *client)
 	}
 
 	ret = imx290_get_regulators(dev, imx290);
-	if (ret < 0) {
-		dev_err(dev, "Cannot get regulators\n");
-		return ret;
-	}
+	if (ret < 0)
+		return dev_err_probe(dev, ret, "Cannot get regulators\n");
 
 	imx290->rst_gpio = devm_gpiod_get_optional(dev, "reset",
 						   GPIOD_OUT_HIGH);
-	if (IS_ERR(imx290->rst_gpio)) {
-		dev_err(dev, "Cannot get reset gpio\n");
-		return PTR_ERR(imx290->rst_gpio);
-	}
+	if (IS_ERR(imx290->rst_gpio))
+		return dev_err_probe(dev, PTR_ERR(imx290->rst_gpio),
+				     "Cannot get reset gpio\n");
 
 	mutex_init(&imx290->lock);