Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1904f83d authored by Milo(Woogyom) Kim's avatar Milo(Woogyom) Kim Committed by Bryan Wu
Browse files

leds-lp55xx: clean up deinit leds in lp5521/5523 



 To make LED unregistration code simple, new function, _unregister_leds()
 is added in each driver.
 This patch is a preceding step for lp55xx common driver architecture.

Signed-off-by: default avatarMilo(Woogyom) Kim <milo.kim@ti.com>
Signed-off-by: default avatarBryan Wu <cooloney@gmail.com>
parent f6524808

drivers/leds/leds-lp5521.c

+13 −10
Original line number Diff line number Diff line
@@ -837,12 +837,22 @@ static int lp5521_register_leds(struct lp5521_chip *chip) 
	return 0;

}



static void lp5521_unregister_leds(struct lp5521_chip *chip)

{

	int i;



	for (i = 0; i < chip->num_leds; i++) {

		led_classdev_unregister(&chip->leds[i].cdev);

		cancel_work_sync(&chip->leds[i].brightness_work);

	}

}



static int lp5521_probe(struct i2c_client *client,

			const struct i2c_device_id *id)

{

	struct lp5521_chip		*chip;

	struct lp5521_platform_data	*pdata;

	int ret, i;

	int ret;



	chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);

	if (!chip)
@@ -885,10 +895,7 @@ static int lp5521_probe(struct i2c_client *client, 
	}

	return ret;

fail2:

	for (i = 0; i < chip->num_leds; i++) {

		led_classdev_unregister(&chip->leds[i].cdev);

		cancel_work_sync(&chip->leds[i].brightness_work);

	}

	lp5521_unregister_leds(chip);

fail1:

	lp5521_deinit_device(chip);

	return ret;
@@ -897,15 +904,11 @@ static int lp5521_probe(struct i2c_client *client, 
static int lp5521_remove(struct i2c_client *client)

{

	struct lp5521_chip *chip = i2c_get_clientdata(client);

	int i;



	lp5521_run_led_pattern(PATTERN_OFF, chip);

	lp5521_unregister_sysfs(client);



	for (i = 0; i < chip->num_leds; i++) {

		led_classdev_unregister(&chip->leds[i].cdev);

		cancel_work_sync(&chip->leds[i].brightness_work);

	}

	lp5521_unregister_leds(chip);



	lp5521_deinit_device(chip);

	return 0;

drivers/leds/leds-lp5523.c

+12 −9
Original line number Diff line number Diff line
@@ -936,6 +936,16 @@ static int lp5523_register_leds(struct lp5523_chip *chip, const char *name) 
	return 0;

}



static void lp5523_unregister_leds(struct lp5523_chip *chip)

{

	int i;



	for (i = 0; i < chip->num_leds; i++) {

		led_classdev_unregister(&chip->leds[i].cdev);

		flush_work(&chip->leds[i].brightness_work);

	}

}



static int lp5523_init_device(struct lp5523_chip *chip)

{

	struct lp5523_platform_data *pdata = chip->pdata;
@@ -1029,10 +1039,7 @@ static int lp5523_probe(struct i2c_client *client, 
	}

	return ret;

fail2:

	for (i = 0; i < chip->num_leds; i++) {

		led_classdev_unregister(&chip->leds[i].cdev);

		flush_work(&chip->leds[i].brightness_work);

	}

	lp5523_unregister_leds(chip);

fail1:

	lp5523_deinit_device(chip);

	return ret;
@@ -1041,17 +1048,13 @@ static int lp5523_probe(struct i2c_client *client, 
static int lp5523_remove(struct i2c_client *client)

{

	struct lp5523_chip *chip = i2c_get_clientdata(client);

	int i;



	/* Disable engine mode */

	lp5523_write(client, LP5523_REG_OP_MODE, LP5523_CMD_DISABLED);



	lp5523_unregister_sysfs(client);



	for (i = 0; i < chip->num_leds; i++) {

		led_classdev_unregister(&chip->leds[i].cdev);

		flush_work(&chip->leds[i].brightness_work);

	}

	lp5523_unregister_leds(chip);



	lp5523_deinit_device(chip);

	return 0;