summaryrefslogtreecommitdiffstats
path: root/drivers/leds/leds-lp5523.c
diff options
context:
space:
mode:
authorMilo(Woogyom) Kim <milo.kim@ti.com>2013-02-05 19:11:18 +0900
committerBryan Wu <cooloney@gmail.com>2013-02-06 15:59:28 -0800
commitc3a68ebfcd22abc186f2328149732c801449b297 (patch)
tree253db155491541accda86b0900dce9856213a9ab /drivers/leds/leds-lp5523.c
parenta96bfa135ddc8045166fc6311ce4d21bfcb8d13d (diff)
downloadlinux-c3a68ebfcd22abc186f2328149732c801449b297.tar.bz2
leds-lp55xx: use lp55xx_unregister_leds()
To unregister led class devices and sysfs attributes, LP5521 and LP5523 have each driver function. This patch makes both drivers simple using common driver function, lp55xx_unregister_leds(). And some unused variables are removed. Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com> Signed-off-by: Bryan Wu <cooloney@gmail.com>
Diffstat (limited to 'drivers/leds/leds-lp5523.c')
-rw-r--r--drivers/leds/leds-lp5523.c25
1 files changed, 2 insertions, 23 deletions
diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c
index dfb335420568..70630156eff9 100644
--- a/drivers/leds/leds-lp5523.c
+++ b/drivers/leds/leds-lp5523.c
@@ -609,9 +609,6 @@ store_mode(1)
store_mode(2)
store_mode(3)
-static struct attribute_group lp5523_led_attribute_group = {
-};
-
/* device attributes */
static DEVICE_ATTR(engine1_mode, S_IRUGO | S_IWUSR,
show_engine1_mode, store_engine1_mode);
@@ -662,15 +659,9 @@ static int lp5523_register_sysfs(struct i2c_client *client)
static void lp5523_unregister_sysfs(struct i2c_client *client)
{
- struct lp5523_chip *chip = i2c_get_clientdata(client);
struct device *dev = &client->dev;
- int i;
sysfs_remove_group(&dev->kobj, &lp5523_group);
-
- for (i = 0; i < chip->num_leds; i++)
- sysfs_remove_group(&chip->leds[i].cdev.dev->kobj,
- &lp5523_led_attribute_group);
}
/*--------------------------------------------------------------*/
@@ -703,16 +694,6 @@ static void lp5523_set_mode(struct lp5523_engine *engine, u8 mode)
/*--------------------------------------------------------------*/
/* Probe, Attach, Remove */
/*--------------------------------------------------------------*/
-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);
- }
-}
-
/* Chip specific configurations */
static struct lp55xx_device_config lp5523_cfg = {
.reset = {
@@ -732,7 +713,6 @@ static struct lp55xx_device_config lp5523_cfg = {
static int lp5523_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
- struct lp5523_chip *old_chip = NULL;
int ret;
struct lp55xx_chip *chip;
struct lp55xx_led *led;
@@ -777,7 +757,7 @@ static int lp5523_probe(struct i2c_client *client,
}
return ret;
fail2:
- lp5523_unregister_leds(old_chip);
+ lp55xx_unregister_leds(led, chip);
err_register_leds:
lp55xx_deinit_device(chip);
err_init:
@@ -786,7 +766,6 @@ err_init:
static int lp5523_remove(struct i2c_client *client)
{
- struct lp5523_chip *old_chip = i2c_get_clientdata(client);
struct lp55xx_led *led = i2c_get_clientdata(client);
struct lp55xx_chip *chip = led->chip;
@@ -795,7 +774,7 @@ static int lp5523_remove(struct i2c_client *client)
lp5523_unregister_sysfs(client);
- lp5523_unregister_leds(old_chip);
+ lp55xx_unregister_leds(led, chip);
lp55xx_deinit_device(chip);
return 0;