diff options
| author |   Guido Günther <agx@sigxcpu.org> | 2020-01-06 16:48:52 +0100 |
|---|---|---|
| committer |   Pavel <pavel@ucw.cz> | 2020-01-07 14:09:13 +0100 |
| commit | 4a8d2bee2080d32511b70d8558036894f42617fd (patch) | |
| tree | 1497b6ee90b63a05538d982211a8255da6137215 | |
| parent | leds: lm3692x: Move lm3692x_init and rename to lm3692x_leds_enable (diff) | |
| download | linux-dev-4a8d2bee2080d32511b70d8558036894f42617fd.tar.xz linux-dev-4a8d2bee2080d32511b70d8558036894f42617fd.zip | |
leds: lm3692x: Split out lm3692x_leds_disable
Move the relevant parts out of lm3692x_remove() and call it from
there. No functional change.
Signed-off-by: Guido Günther <agx@sigxcpu.org>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pavel Machek <pavel@ucw.cz>
| -rw-r--r-- | drivers/leds/leds-lm3692x.c | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/drivers/leds/leds-lm3692x.c b/drivers/leds/leds-lm3692x.c index f7fdfaee5ac5..1254695d7e94 100644 --- a/drivers/leds/leds-lm3692x.c +++ b/drivers/leds/leds-lm3692x.c @@ -289,6 +289,30 @@ out: return ret; } +static int lm3692x_leds_disable(struct lm3692x_led *led) +{ + int ret; + + ret = regmap_update_bits(led->regmap, LM3692X_EN, LM3692X_DEVICE_EN, 0); + if (ret) { + dev_err(&led->client->dev, "Failed to disable regulator: %d\n", + ret); + return ret; + } + + if (led->enable_gpio) + gpiod_direction_output(led->enable_gpio, 0); + + if (led->regulator) { + ret = regulator_disable(led->regulator); + if (ret) + dev_err(&led->client->dev, + "Failed to disable regulator: %d\n", ret); + } + + return ret; +} + static int lm3692x_brightness_set(struct led_classdev *led_cdev, enum led_brightness brt_val) { @@ -463,23 +487,9 @@ static int lm3692x_remove(struct i2c_client *client) struct lm3692x_led *led = i2c_get_clientdata(client); int ret; - ret = regmap_update_bits(led->regmap, LM3692X_EN, LM3692X_DEVICE_EN, 0); - if (ret) { - dev_err(&led->client->dev, "Failed to disable regulator: %d\n", - ret); + ret = lm3692x_leds_disable(led); + if (ret) return ret; - } - - if (led->enable_gpio) - gpiod_direction_output(led->enable_gpio, 0); - - if (led->regulator) { - ret = regulator_disable(led->regulator); - if (ret) - dev_err(&led->client->dev, - "Failed to disable regulator: %d\n", ret); - } - mutex_destroy(&led->lock); return 0; |