Unverified Commit 0f5c6010 authored by Frank Li's avatar Frank Li Committed by Mark Brown
Browse files

regulator: pca9450: Use dev_err_probe() to simplify code 



Use dev_err_probe() to simplify code.

Signed-off-by: default avatarFrank Li <Frank.Li@nxp.com>
Link: https://patch.msgid.link/20241205-pca9450-v1-2-aab448b74e78@nxp.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 229773f9

drivers/regulator/pca9450-regulator.c

+27 −46
Original line number Diff line number Diff line
@@ -932,25 +932,20 @@ static int pca9450_i2c_probe(struct i2c_client *i2c) 


	pca9450->regmap = devm_regmap_init_i2c(i2c,

					       &pca9450_regmap_config);

	if (IS_ERR(pca9450->regmap)) {

		dev_err(&i2c->dev, "regmap initialization failed\n");

		return PTR_ERR(pca9450->regmap);

	}

	if (IS_ERR(pca9450->regmap))

		return dev_err_probe(&i2c->dev, PTR_ERR(pca9450->regmap),

				     "regmap initialization failed\n");



	ret = regmap_read(pca9450->regmap, PCA9450_REG_DEV_ID, &device_id);

	if (ret) {

		dev_err(&i2c->dev, "Read device id error\n");

		return ret;

	}

	if (ret)

		return dev_err_probe(&i2c->dev, ret, "Read device id error\n");



	/* Check your board and dts for match the right pmic */

	if (((device_id >> 4) != 0x1 && type == PCA9450_TYPE_PCA9450A) ||

	    ((device_id >> 4) != 0x3 && type == PCA9450_TYPE_PCA9450BC) ||

	    ((device_id >> 4) != 0x9 && type == PCA9450_TYPE_PCA9451A)) {

		dev_err(&i2c->dev, "Device id(%x) mismatched\n",

			device_id >> 4);

		return -EINVAL;

	}

	    ((device_id >> 4) != 0x9 && type == PCA9450_TYPE_PCA9451A))

		return dev_err_probe(&i2c->dev, -EINVAL,

				     "Device id(%x) mismatched\n", device_id >> 4);



	for (i = 0; i < pca9450->rcnt; i++) {

		const struct regulator_desc *desc;
@@ -964,13 +959,9 @@ static int pca9450_i2c_probe(struct i2c_client *i2c) 
		config.dev = pca9450->dev;



		rdev = devm_regulator_register(pca9450->dev, desc, &config);

		if (IS_ERR(rdev)) {

			ret = PTR_ERR(rdev);

			dev_err(pca9450->dev,

				"Failed to register regulator(%s): %d\n",

				desc->name, ret);

			return ret;

		}

		if (IS_ERR(rdev))

			return dev_err_probe(pca9450->dev, PTR_ERR(rdev),

					     "Failed to register regulator(%s)\n", desc->name);

	}



	if (pca9450->irq) {
@@ -978,29 +969,24 @@ static int pca9450_i2c_probe(struct i2c_client *i2c) 
						pca9450_irq_handler,

						(IRQF_TRIGGER_FALLING | IRQF_ONESHOT),

						"pca9450-irq", pca9450);

		if (ret != 0) {

			dev_err(pca9450->dev, "Failed to request IRQ: %d\n",

		if (ret != 0)

			return dev_err_probe(pca9450->dev, ret, "Failed to request IRQ: %d\n",

					     pca9450->irq);

			return ret;

		}



		/* Unmask all interrupt except PWRON/WDOG/RSVD */

		ret = regmap_update_bits(pca9450->regmap, PCA9450_REG_INT1_MSK,

					IRQ_VR_FLT1 | IRQ_VR_FLT2 | IRQ_LOWVSYS |

					IRQ_THERM_105 | IRQ_THERM_125,

					IRQ_PWRON | IRQ_WDOGB | IRQ_RSVD);

		if (ret) {

			dev_err(&i2c->dev, "Unmask irq error\n");

			return ret;

		}

		if (ret)

			return dev_err_probe(&i2c->dev, ret, "Unmask irq error\n");

	}



	/* Clear PRESET_EN bit in BUCK123_DVS to use DVS registers */

	ret = regmap_clear_bits(pca9450->regmap, PCA9450_REG_BUCK123_DVS,

				BUCK123_PRESET_EN);

	if (ret) {

		dev_err(&i2c->dev, "Failed to clear PRESET_EN bit: %d\n", ret);

		return ret;

	}

	if (ret)

		return dev_err_probe(&i2c->dev, ret,  "Failed to clear PRESET_EN bit\n");



	if (of_property_read_bool(i2c->dev.of_node, "nxp,wdog_b-warm-reset"))

		reset_ctrl = WDOG_B_CFG_WARM;
@@ -1010,20 +996,16 @@ static int pca9450_i2c_probe(struct i2c_client *i2c) 
	/* Set reset behavior on assertion of WDOG_B signal */

	ret = regmap_update_bits(pca9450->regmap, PCA9450_REG_RESET_CTRL,

				 WDOG_B_CFG_MASK, reset_ctrl);

	if (ret) {

		dev_err(&i2c->dev, "Failed to set WDOG_B reset behavior\n");

		return ret;

	}

	if (ret)

		return dev_err_probe(&i2c->dev, ret, "Failed to set WDOG_B reset behavior\n");



	if (of_property_read_bool(i2c->dev.of_node, "nxp,i2c-lt-enable")) {

		/* Enable I2C Level Translator */

		ret = regmap_update_bits(pca9450->regmap, PCA9450_REG_CONFIG2,

					 I2C_LT_MASK, I2C_LT_ON_STANDBY_RUN);

		if (ret) {

			dev_err(&i2c->dev,

		if (ret)

			return dev_err_probe(&i2c->dev, ret,

					     "Failed to enable I2C level translator\n");

			return ret;

		}

	}



	/*
@@ -1033,10 +1015,9 @@ static int pca9450_i2c_probe(struct i2c_client *i2c) 
	 */

	pca9450->sd_vsel_gpio = gpiod_get_optional(pca9450->dev, "sd-vsel", GPIOD_OUT_HIGH);



	if (IS_ERR(pca9450->sd_vsel_gpio)) {

		dev_err(&i2c->dev, "Failed to get SD_VSEL GPIO\n");

		return PTR_ERR(pca9450->sd_vsel_gpio);

	}

	if (IS_ERR(pca9450->sd_vsel_gpio))

		return dev_err_probe(&i2c->dev, PTR_ERR(pca9450->sd_vsel_gpio),

				     "Failed to get SD_VSEL GPIO\n");



	dev_info(&i2c->dev, "%s probed.\n",

		type == PCA9450_TYPE_PCA9450A ? "pca9450a" :