Two separate de-init functions are merged into one common function.
And it is used in err_post_init of lp55xx_init_device().
Signed-off-by: Milo(Woogyom) Kim <milo.kim@xxxxxx>
---
drivers/leds/leds-lp5521.c | 16 ++++------------
drivers/leds/leds-lp5523.c | 16 ++++------------
drivers/leds/leds-lp55xx-common.c | 15 ++++++++++++---
drivers/leds/leds-lp55xx-common.h | 3 ++-
4 files changed, 22 insertions(+), 28 deletions(-)
diff --git a/drivers/leds/leds-lp5521.c b/drivers/leds/leds-lp5521.c
index 0e89155..74f7b39 100644
--- a/drivers/leds/leds-lp5521.c
+++ b/drivers/leds/leds-lp5521.c
@@ -689,16 +689,6 @@ static void lp5521_unregister_sysfs(struct i2c_client *client)
&lp5521_led_attribute_group);
}
-static void lp5521_deinit_device(struct lp5521_chip *chip)
-{
- struct lp5521_platform_data *pdata = chip->pdata;
-
- if (pdata->enable)
- pdata->enable(0);
- if (pdata->release_resources)
- pdata->release_resources();
-}
-
static int lp5521_init_led(struct lp5521_led *led,
struct i2c_client *client,
int chan, struct lp5521_platform_data *pdata)
@@ -859,7 +849,7 @@ static int lp5521_probe(struct i2c_client *client,
fail2:
lp5521_unregister_leds(old_chip);
fail1:
- lp5521_deinit_device(old_chip);
+ lp55xx_deinit_device(chip);
err_init:
return ret;
}
@@ -867,13 +857,15 @@ err_init:
static int lp5521_remove(struct i2c_client *client)
{
struct lp5521_chip *old_chip = i2c_get_clientdata(client);
+ struct lp55xx_led *led = i2c_get_clientdata(client);
+ struct lp55xx_chip *chip = led->chip;
lp5521_run_led_pattern(PATTERN_OFF, old_chip);
lp5521_unregister_sysfs(client);
lp5521_unregister_leds(old_chip);
+ lp55xx_deinit_device(chip);
- lp5521_deinit_device(old_chip);
return 0;
}
diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c
index 1b15b6a..0830727 100644
--- a/drivers/leds/leds-lp5523.c
+++ b/drivers/leds/leds-lp5523.c
@@ -872,16 +872,6 @@ static void lp5523_unregister_leds(struct lp5523_chip *chip)
}
}
-static void lp5523_deinit_device(struct lp5523_chip *chip)
-{
- struct lp5523_platform_data *pdata = chip->pdata;
-
- if (pdata->enable)
- pdata->enable(0);
- if (pdata->release_resources)
- pdata->release_resources();
-}
-
/* Chip specific configurations */
static struct lp55xx_device_config lp5523_cfg = {
.reset = {
@@ -945,7 +935,7 @@ static int lp5523_probe(struct i2c_client *client,
fail2:
lp5523_unregister_leds(old_chip);
fail1:
- lp5523_deinit_device(old_chip);
+ lp55xx_deinit_device(chip);
err_init:
return ret;
}
@@ -953,6 +943,8 @@ 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;
/* Disable engine mode */
lp5523_write(client, LP5523_REG_OP_MODE, LP5523_CMD_DISABLED);
@@ -960,8 +952,8 @@ static int lp5523_remove(struct i2c_client *client)
lp5523_unregister_sysfs(client);
lp5523_unregister_leds(old_chip);
+ lp55xx_deinit_device(chip);
- lp5523_deinit_device(old_chip);
return 0;
}
diff --git a/drivers/leds/leds-lp55xx-common.c b/drivers/leds/leds-lp55xx-common.c
index bf21765..66ba500 100644
--- a/drivers/leds/leds-lp55xx-common.c
+++ b/drivers/leds/leds-lp55xx-common.c
@@ -152,11 +152,20 @@ int lp55xx_init_device(struct lp55xx_chip *chip)
return 0;
err_post_init:
+ lp55xx_deinit_device(chip);
+err:
+ return ret;
+}
+EXPORT_SYMBOL_GPL(lp55xx_init_device);
+
+void lp55xx_deinit_device(struct lp55xx_chip *chip)
+{
+ struct lp55xx_platform_data *pdata = chip->pdata;
+
if (pdata->enable)
pdata->enable(0);
+
if (pdata->release_resources)
pdata->release_resources();
-err:
- return ret;
}
-EXPORT_SYMBOL_GPL(lp55xx_init_device);
+EXPORT_SYMBOL_GPL(lp55xx_deinit_device);
diff --git a/drivers/leds/leds-lp55xx-common.h b/drivers/leds/leds-lp55xx-common.h
index ffedc77..908b00a 100644
--- a/drivers/leds/leds-lp55xx-common.h
+++ b/drivers/leds/leds-lp55xx-common.h
@@ -84,7 +84,8 @@ extern int lp55xx_read(struct lp55xx_chip *chip, u8 reg, u8 *val);
extern int lp55xx_update_bits(struct lp55xx_chip *chip, u8 reg,
u8 mask, u8 val);
-/* common device init functions */
+/* common device init/deinit functions */
extern int lp55xx_init_device(struct lp55xx_chip *chip);
+extern void lp55xx_deinit_device(struct lp55xx_chip *chip);
#endif /* _LEDS_LP55XX_COMMON_H */
--
1.7.9.5
Best Regards,
Milo
--
To unsubscribe from this list: send the line "unsubscribe linux-leds" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
