diff mbox series

[2/9] i2c: mlxbf: Use dev_err_probe in probe function

Message ID 20230728013148.1720978-3-liaochang1@huawei.com
State Superseded
Headers show
Series Use dev_err_probe in i2c probe function | expand

Commit Message

Liao Chang July 28, 2023, 1:31 a.m. UTC 
Use the dev_err_probe function instead of dev_err in the probe function
so that the printed messge includes the return value and also handles
-EPROBE_DEFER nicely.

Signed-off-by: Liao Chang <liaochang1@huawei.com>
---
 drivers/i2c/busses/i2c-mlxbf.c | 44 ++++++++++++----------------------
 1 file changed, 15 insertions(+), 29 deletions(-)

Comments

Andi Shyti Aug. 1, 2023, 9:33 p.m. UTC | #1 
Hi Liao,

On Fri, Jul 28, 2023 at 09:31:41AM +0800, Liao Chang wrote:
> Use the dev_err_probe function instead of dev_err in the probe function
> so that the printed messge includes the return value and also handles
> -EPROBE_DEFER nicely.
> 
> Signed-off-by: Liao Chang <liaochang1@huawei.com>
> ---
>  drivers/i2c/busses/i2c-mlxbf.c | 44 ++++++++++++----------------------
>  1 file changed, 15 insertions(+), 29 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-mlxbf.c b/drivers/i2c/busses/i2c-mlxbf.c
> index ae66bdd1b737..b5f2aa2fc1db 100644
> --- a/drivers/i2c/busses/i2c-mlxbf.c
> +++ b/drivers/i2c/busses/i2c-mlxbf.c
> @@ -2323,10 +2323,8 @@ static int mlxbf_i2c_probe(struct platform_device *pdev)
>  
>  		ret = mlxbf_i2c_init_resource(pdev, &priv->smbus,
>  					      MLXBF_I2C_SMBUS_RES);
> -		if (ret < 0) {
> -			dev_err(dev, "Cannot fetch smbus resource info");
> -			return ret;
> -		}
> +		if (ret < 0)
> +			return dev_err_probe(dev, ret, "Cannot fetch smbus resource info");
>  
>  		priv->timer->io = priv->smbus->io;
>  		priv->mst->io = priv->smbus->io + MLXBF_I2C_MST_ADDR_OFFSET;
> @@ -2334,10 +2332,8 @@ static int mlxbf_i2c_probe(struct platform_device *pdev)
>  	} else {
>  		ret = mlxbf_i2c_init_resource(pdev, &priv->timer,
>  					      MLXBF_I2C_SMBUS_TIMER_RES);
> -		if (ret < 0) {
> -			dev_err(dev, "Cannot fetch timer resource info");
> -			return ret;
> -		}
> +		if (ret < 0)
> +			return dev_err_probe(dev, ret, "Cannot fetch timer resource info");
>  
>  		ret = mlxbf_i2c_init_resource(pdev, &priv->mst,
>  					      MLXBF_I2C_SMBUS_MST_RES);

You forgot one here 

	return dev_err_probe(dev, "Cannot fetch master resource info");

Andi

> @@ -2348,25 +2344,19 @@ static int mlxbf_i2c_probe(struct platform_device *pdev)
>  
>  		ret = mlxbf_i2c_init_resource(pdev, &priv->slv,
>  					      MLXBF_I2C_SMBUS_SLV_RES);
> -		if (ret < 0) {
> -			dev_err(dev, "Cannot fetch slave resource info");
> -			return ret;
> -		}
> +		if (ret < 0)
> +			return dev_err_probe(dev, ret, "Cannot fetch slave resource info");
diff mbox series

Patch

diff --git a/drivers/i2c/busses/i2c-mlxbf.c b/drivers/i2c/busses/i2c-mlxbf.c
index ae66bdd1b737..b5f2aa2fc1db 100644
--- a/drivers/i2c/busses/i2c-mlxbf.c
+++ b/drivers/i2c/busses/i2c-mlxbf.c
@@ -2323,10 +2323,8 @@  static int mlxbf_i2c_probe(struct platform_device *pdev)
 
 		ret = mlxbf_i2c_init_resource(pdev, &priv->smbus,
 					      MLXBF_I2C_SMBUS_RES);
-		if (ret < 0) {
-			dev_err(dev, "Cannot fetch smbus resource info");
-			return ret;
-		}
+		if (ret < 0)
+			return dev_err_probe(dev, ret, "Cannot fetch smbus resource info");
 
 		priv->timer->io = priv->smbus->io;
 		priv->mst->io = priv->smbus->io + MLXBF_I2C_MST_ADDR_OFFSET;
@@ -2334,10 +2332,8 @@  static int mlxbf_i2c_probe(struct platform_device *pdev)
 	} else {
 		ret = mlxbf_i2c_init_resource(pdev, &priv->timer,
 					      MLXBF_I2C_SMBUS_TIMER_RES);
-		if (ret < 0) {
-			dev_err(dev, "Cannot fetch timer resource info");
-			return ret;
-		}
+		if (ret < 0)
+			return dev_err_probe(dev, ret, "Cannot fetch timer resource info");
 
 		ret = mlxbf_i2c_init_resource(pdev, &priv->mst,
 					      MLXBF_I2C_SMBUS_MST_RES);
@@ -2348,25 +2344,19 @@  static int mlxbf_i2c_probe(struct platform_device *pdev)
 
 		ret = mlxbf_i2c_init_resource(pdev, &priv->slv,
 					      MLXBF_I2C_SMBUS_SLV_RES);
-		if (ret < 0) {
-			dev_err(dev, "Cannot fetch slave resource info");
-			return ret;
-		}
+		if (ret < 0)
+			return dev_err_probe(dev, ret, "Cannot fetch slave resource info");
 	}
 
 	ret = mlxbf_i2c_init_resource(pdev, &priv->mst_cause,
 				      MLXBF_I2C_MST_CAUSE_RES);
-	if (ret < 0) {
-		dev_err(dev, "Cannot fetch cause master resource info");
-		return ret;
-	}
+	if (ret < 0)
+		return dev_err_probe(dev, ret, "Cannot fetch cause master resource info");
 
 	ret = mlxbf_i2c_init_resource(pdev, &priv->slv_cause,
 				      MLXBF_I2C_SLV_CAUSE_RES);
-	if (ret < 0) {
-		dev_err(dev, "Cannot fetch cause slave resource info");
-		return ret;
-	}
+	if (ret < 0)
+		return dev_err_probe(dev, ret, "Cannot fetch cause slave resource info");
 
 	adap = &priv->adap;
 	adap->owner = THIS_MODULE;
@@ -2397,11 +2387,9 @@  static int mlxbf_i2c_probe(struct platform_device *pdev)
 	 * does not really hurt, then keep the code as is.
 	 */
 	ret = mlxbf_i2c_init_master(pdev, priv);
-	if (ret < 0) {
-		dev_err(dev, "failed to initialize smbus master %d",
-			priv->bus);
-		return ret;
-	}
+	if (ret < 0)
+		return dev_err_probe(dev, ret, "failed to initialize smbus master %d",
+				     priv->bus);
 
 	mlxbf_i2c_init_timings(pdev, priv);
 
@@ -2413,10 +2401,8 @@  static int mlxbf_i2c_probe(struct platform_device *pdev)
 	ret = devm_request_irq(dev, irq, mlxbf_i2c_irq,
 			       IRQF_SHARED | IRQF_PROBE_SHARED,
 			       dev_name(dev), priv);
-	if (ret < 0) {
-		dev_err(dev, "Cannot get irq %d\n", irq);
-		return ret;
-	}
+	if (ret < 0)
+		return dev_err_probe(dev, ret, "Cannot get irq %d\n", irq);
 
 	priv->irq = irq;