Commit e0b95ba3 authored by Andrew Davis's avatar Andrew Davis Committed by Lee Jones
Browse files

leds: lp8860: Only unlock in lp8860_unlock_eeprom() 



Locking is a single register write, so no need to have the unlock
function also lock. This removes the need to pass in the option
and reduces the nesting level in the function.

Signed-off-by: default avatarAndrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20250407183555.409687-5-afd@ti.com


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

drivers/leds/leds-lp8860.c

+18 −30
Original line number Diff line number Diff line
@@ -129,40 +129,28 @@ static const struct reg_sequence lp8860_eeprom_disp_regs[] = { 
	{ LP8860_EEPROM_REG_24, 0x3E },

};



static int lp8860_unlock_eeprom(struct lp8860_led *led, int lock)

static int lp8860_unlock_eeprom(struct lp8860_led *led)

{

	int ret;



	guard(mutex)(&led->lock);



	if (lock == LP8860_UNLOCK_EEPROM) {

		ret = regmap_write(led->regmap,

			LP8860_EEPROM_UNLOCK,

			LP8860_EEPROM_CODE_1);

	ret = regmap_write(led->regmap, LP8860_EEPROM_UNLOCK, LP8860_EEPROM_CODE_1);

	if (ret) {

		dev_err(&led->client->dev, "EEPROM Unlock failed\n");

		return ret;

	}



		ret = regmap_write(led->regmap,

			LP8860_EEPROM_UNLOCK,

			LP8860_EEPROM_CODE_2);

	ret = regmap_write(led->regmap, LP8860_EEPROM_UNLOCK, LP8860_EEPROM_CODE_2);

	if (ret) {

		dev_err(&led->client->dev, "EEPROM Unlock failed\n");

		return ret;

	}

		ret = regmap_write(led->regmap,

			LP8860_EEPROM_UNLOCK,

			LP8860_EEPROM_CODE_3);

	ret = regmap_write(led->regmap, LP8860_EEPROM_UNLOCK, LP8860_EEPROM_CODE_3);

	if (ret) {

		dev_err(&led->client->dev, "EEPROM Unlock failed\n");

		return ret;

	}

	} else {

		ret = regmap_write(led->regmap,

			LP8860_EEPROM_UNLOCK,

			LP8860_LOCK_EEPROM);

	}



	return ret;

}
@@ -240,7 +228,7 @@ static int lp8860_init(struct lp8860_led *led) 
	if (ret)

		goto out;



	ret = lp8860_unlock_eeprom(led, LP8860_UNLOCK_EEPROM);

	ret = lp8860_unlock_eeprom(led);

	if (ret) {

		dev_err(&led->client->dev, "Failed unlocking EEPROM\n");

		goto out;
@@ -253,7 +241,7 @@ static int lp8860_init(struct lp8860_led *led) 
		goto out;

	}



	ret = lp8860_unlock_eeprom(led, LP8860_LOCK_EEPROM);

	ret = regmap_write(led->regmap, LP8860_EEPROM_UNLOCK, LP8860_LOCK_EEPROM);

	if (ret)

		goto out;