diff mbox series

[PATCHv2,02/13] mfd: rk808: use dev_err_probe

Message ID 20220908003107.220143-3-sebastian.reichel@collabora.com (mailing list archive)
State New, archived
Headers show
Series Introduce RK806 Support | expand

Commit Message

Sebastian Reichel Sept. 8, 2022, 12:30 a.m. UTC 
Use dev_err_probe instead of dev_err in probe function,
which simplifies code a little bit and prints the error
code.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
 drivers/mfd/rk808.c | 50 ++++++++++++++++-----------------------------
 1 file changed, 18 insertions(+), 32 deletions(-)

Comments

Robin Murphy Sept. 8, 2022, 8:45 a.m. UTC | #1 
On 2022-09-08 01:30, Sebastian Reichel wrote:
> Use dev_err_probe instead of dev_err in probe function,
> which simplifies code a little bit and prints the error
> code.
> 
> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> ---
>   drivers/mfd/rk808.c | 50 ++++++++++++++++-----------------------------
>   1 file changed, 18 insertions(+), 32 deletions(-)
> 
> diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
> index c17fea1d48ca..e793de9146f7 100644
> --- a/drivers/mfd/rk808.c
> +++ b/drivers/mfd/rk808.c
> @@ -650,18 +650,14 @@ static int rk808_probe(struct i2c_client *client,
>   
>   	/* Read chip variant */
>   	msb = i2c_smbus_read_byte_data(client, pmic_id_msb);
> -	if (msb < 0) {
> -		dev_err(&client->dev, "failed to read the chip id at 0x%x\n",
> -			RK808_ID_MSB);
> -		return msb;
> -	}
> +	if (msb < 0)
> +		return dev_err_probe(&client->dev, msb, "failed to read the chip id at 0x%x\n",
> +				     RK808_ID_MSB);
>   
>   	lsb = i2c_smbus_read_byte_data(client, pmic_id_lsb);
> -	if (lsb < 0) {
> -		dev_err(&client->dev, "failed to read the chip id at 0x%x\n",
> -			RK808_ID_LSB);
> -		return lsb;
> -	}
> +	if (lsb < 0)
> +		return dev_err_probe(&client->dev, lsb, "failed to read the chip id at 0x%x\n",
> +				     RK808_ID_LSB);

Hmm, refactoring these is probably a good opportunity to fix them as 
well - I'm not sure printing the register offset is really all that 
useful, but particularly not when it's hard-coded and may not correspond 
to the actual access that failed.

Robin.

>   
>   	rk808->variant = ((msb << 8) | lsb) & RK8XX_ID_MSK;
>   	dev_info(&client->dev, "chip id: 0x%x\n", (unsigned int)rk808->variant);
> @@ -710,44 +706,34 @@ static int rk808_probe(struct i2c_client *client,
>   	i2c_set_clientdata(client, rk808);
>   
>   	rk808->regmap = devm_regmap_init_i2c(client, rk808->regmap_cfg);
> -	if (IS_ERR(rk808->regmap)) {
> -		dev_err(&client->dev, "regmap initialization failed\n");
> -		return PTR_ERR(rk808->regmap);
> -	}
> +	if (IS_ERR(rk808->regmap))
> +		return dev_err_probe(&client->dev, PTR_ERR(rk808->regmap),
> +				     "regmap initialization failed\n");
>   
> -	if (!client->irq) {
> -		dev_err(&client->dev, "No interrupt support, no core IRQ\n");
> -		return -EINVAL;
> -	}
> +	if (!client->irq)
> +		return dev_err_probe(&client->dev, -EINVAL, "No interrupt support, no core IRQ\n");
>   
>   	ret = devm_regmap_add_irq_chip(&client->dev, rk808->regmap, client->irq,
>   				       IRQF_ONESHOT, -1,
>   				       rk808->regmap_irq_chip, &rk808->irq_data);
> -	if (ret) {
> -		dev_err(&client->dev, "Failed to add irq_chip %d\n", ret);
> -		return ret;
> -	}
> +	if (ret)
> +		return dev_err_probe(&client->dev, ret, "Failed to add irq_chip\n");
>   
>   	for (i = 0; i < nr_pre_init_regs; i++) {
>   		ret = regmap_update_bits(rk808->regmap,
>   					pre_init_reg[i].addr,
>   					pre_init_reg[i].mask,
>   					pre_init_reg[i].value);
> -		if (ret) {
> -			dev_err(&client->dev,
> -				"0x%x write err\n",
> -				pre_init_reg[i].addr);
> -			return ret;
> -		}
> +		if (ret)
> +			return dev_err_probe(&client->dev, ret, "0x%x write err\n",
> +					     pre_init_reg[i].addr);
>   	}
>   
>   	ret = devm_mfd_add_devices(&client->dev, PLATFORM_DEVID_NONE,
>   			      cells, nr_cells, NULL, 0,
>   			      regmap_irq_get_domain(rk808->irq_data));
> -	if (ret) {
> -		dev_err(&client->dev, "failed to add MFD devices %d\n", ret);
> -		return ret;
> -	}
> +	if (ret)
> +		return dev_err_probe(&client->dev, ret, "failed to add MFD devices\n");
>   
>   	if (of_property_read_bool(np, "rockchip,system-power-controller")) {
>   		ret = devm_register_sys_off_handler(&client->dev,
diff mbox series

Patch

diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
index c17fea1d48ca..e793de9146f7 100644
--- a/drivers/mfd/rk808.c
+++ b/drivers/mfd/rk808.c
@@ -650,18 +650,14 @@  static int rk808_probe(struct i2c_client *client,
 
 	/* Read chip variant */
 	msb = i2c_smbus_read_byte_data(client, pmic_id_msb);
-	if (msb < 0) {
-		dev_err(&client->dev, "failed to read the chip id at 0x%x\n",
-			RK808_ID_MSB);
-		return msb;
-	}
+	if (msb < 0)
+		return dev_err_probe(&client->dev, msb, "failed to read the chip id at 0x%x\n",
+				     RK808_ID_MSB);
 
 	lsb = i2c_smbus_read_byte_data(client, pmic_id_lsb);
-	if (lsb < 0) {
-		dev_err(&client->dev, "failed to read the chip id at 0x%x\n",
-			RK808_ID_LSB);
-		return lsb;
-	}
+	if (lsb < 0)
+		return dev_err_probe(&client->dev, lsb, "failed to read the chip id at 0x%x\n",
+				     RK808_ID_LSB);
 
 	rk808->variant = ((msb << 8) | lsb) & RK8XX_ID_MSK;
 	dev_info(&client->dev, "chip id: 0x%x\n", (unsigned int)rk808->variant);
@@ -710,44 +706,34 @@  static int rk808_probe(struct i2c_client *client,
 	i2c_set_clientdata(client, rk808);
 
 	rk808->regmap = devm_regmap_init_i2c(client, rk808->regmap_cfg);
-	if (IS_ERR(rk808->regmap)) {
-		dev_err(&client->dev, "regmap initialization failed\n");
-		return PTR_ERR(rk808->regmap);
-	}
+	if (IS_ERR(rk808->regmap))
+		return dev_err_probe(&client->dev, PTR_ERR(rk808->regmap),
+				     "regmap initialization failed\n");
 
-	if (!client->irq) {
-		dev_err(&client->dev, "No interrupt support, no core IRQ\n");
-		return -EINVAL;
-	}
+	if (!client->irq)
+		return dev_err_probe(&client->dev, -EINVAL, "No interrupt support, no core IRQ\n");
 
 	ret = devm_regmap_add_irq_chip(&client->dev, rk808->regmap, client->irq,
 				       IRQF_ONESHOT, -1,
 				       rk808->regmap_irq_chip, &rk808->irq_data);
-	if (ret) {
-		dev_err(&client->dev, "Failed to add irq_chip %d\n", ret);
-		return ret;
-	}
+	if (ret)
+		return dev_err_probe(&client->dev, ret, "Failed to add irq_chip\n");
 
 	for (i = 0; i < nr_pre_init_regs; i++) {
 		ret = regmap_update_bits(rk808->regmap,
 					pre_init_reg[i].addr,
 					pre_init_reg[i].mask,
 					pre_init_reg[i].value);
-		if (ret) {
-			dev_err(&client->dev,
-				"0x%x write err\n",
-				pre_init_reg[i].addr);
-			return ret;
-		}
+		if (ret)
+			return dev_err_probe(&client->dev, ret, "0x%x write err\n",
+					     pre_init_reg[i].addr);
 	}
 
 	ret = devm_mfd_add_devices(&client->dev, PLATFORM_DEVID_NONE,
 			      cells, nr_cells, NULL, 0,
 			      regmap_irq_get_domain(rk808->irq_data));
-	if (ret) {
-		dev_err(&client->dev, "failed to add MFD devices %d\n", ret);
-		return ret;
-	}
+	if (ret)
+		return dev_err_probe(&client->dev, ret, "failed to add MFD devices\n");
 
 	if (of_property_read_bool(np, "rockchip,system-power-controller")) {
 		ret = devm_register_sys_off_handler(&client->dev,