Commit 7a29af24 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski
Browse files

eeprom: at24: use dev_err_probe() consistently 

Save some lines by consistently using dev_err_probe() when bailing out
with an error message.

Link: https://lore.kernel.org/r/20251212032646.49336-1-bartosz.golaszewski@oss.qualcomm.com


Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
parent 30116121

drivers/misc/eeprom/at24.c

+7 −13
Original line number Diff line number Diff line
@@ -657,10 +657,8 @@ static int at24_probe(struct i2c_client *client) 
	if (!i2c_fn_i2c && !i2c_fn_block)

		page_size = 1;



	if (!page_size) {

		dev_err(dev, "page_size must not be 0!\n");

		return -EINVAL;

	}

	if (!page_size)

		return dev_err_probe(dev, -EINVAL, "page_size must not be 0!\n");



	if (!is_power_of_2(page_size))

		dev_warn(dev, "page_size looks suspicious (no power of 2)!\n");
@@ -674,11 +672,9 @@ static int at24_probe(struct i2c_client *client) 
				(flags & AT24_FLAG_ADDR16) ? 65536 : 256);

	}



	if ((flags & AT24_FLAG_SERIAL) && (flags & AT24_FLAG_MAC)) {

		dev_err(dev,

	if ((flags & AT24_FLAG_SERIAL) && (flags & AT24_FLAG_MAC))

		return dev_err_probe(dev, -EINVAL,

				     "invalid device data - cannot have both AT24_FLAG_SERIAL & AT24_FLAG_MAC.");

		return -EINVAL;

	}



	regmap_config.val_bits = 8;

	regmap_config.reg_bits = (flags & AT24_FLAG_ADDR16) ? 16 : 8;
@@ -759,10 +755,8 @@ static int at24_probe(struct i2c_client *client) 
	full_power = acpi_dev_state_d0(&client->dev);

	if (full_power) {

		err = regulator_enable(at24->vcc_reg);

		if (err) {

			dev_err(dev, "Failed to enable vcc regulator\n");

			return err;

		}

		if (err)

			return dev_err_probe(dev, err, "Failed to enable vcc regulator\n");



		pm_runtime_set_active(dev);

	}