Commit e714b50b authored by Sebastian Reichel's avatar Sebastian Reichel Committed by Lee Jones
Browse files

mfd: rk808: Use dev_err_probe 



Use dev_err_probe instead of dev_err in probe function,
which simplifies code a little bit and prints the error
code.

Also drop possibly incorrect printing of chip id registers
while touching the error message.

Tested-by: Diederik de Haas <didi.debian@cknow.org> # Rock64, Quartz64 Model A + B
Tested-by: Vincent Legoll <vincent.legoll@gmail.com> # Pine64 QuartzPro64
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Link: https://lore.kernel.org/r/20230504173618.142075-4-sebastian.reichel@collabora.com


Signed-off-by: default avatarLee Jones <lee@kernel.org>
parent 4fec8a5a

drivers/mfd/rk808.c

+16 −32
Original line number Diff line number Diff line
@@ -670,18 +670,12 @@ 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 MSB\n");



	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 LSB\n");



	rk808->variant = ((msb << 8) | lsb) & RK8XX_ID_MSK;

	dev_info(&client->dev, "chip id: 0x%x\n", (unsigned int)rk808->variant);
@@ -730,44 +724,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",

		if (ret)

			return dev_err_probe(&client->dev, ret, "0x%x write err\n",

					     pre_init_reg[i].addr);

			return ret;

		}

	}



	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,