Skip to content

Commit 5e9d7b6

Browse files
agxpavelmachek
authored andcommitted
leds: lm3692x: Move lm3692x_init and rename to lm3692x_leds_enable
This moves lm3692x_init so it can be used from lm3692x_brightness_set. Rename to lm3692_leds_enable to pair up with lm3692x_leds_disable. No functional change. Signed-off-by: Guido Günther <[email protected]> Acked-by: Pavel Machek <[email protected]> Signed-off-by: Pavel Machek <[email protected]>
1 parent df7083b commit 5e9d7b6

File tree

1 file changed

+35
-35
lines changed

1 file changed

+35
-35
lines changed

drivers/leds/leds-lm3692x.c

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -165,40 +165,7 @@ static int lm3692x_fault_check(struct lm3692x_led *led)
165165
return read_buf;
166166
}
167167

168-
static int lm3692x_brightness_set(struct led_classdev *led_cdev,
169-
enum led_brightness brt_val)
170-
{
171-
struct lm3692x_led *led =
172-
container_of(led_cdev, struct lm3692x_led, led_dev);
173-
int ret;
174-
int led_brightness_lsb = (brt_val >> 5);
175-
176-
mutex_lock(&led->lock);
177-
178-
ret = lm3692x_fault_check(led);
179-
if (ret) {
180-
dev_err(&led->client->dev, "Cannot read/clear faults: %d\n",
181-
ret);
182-
goto out;
183-
}
184-
185-
ret = regmap_write(led->regmap, LM3692X_BRT_MSB, brt_val);
186-
if (ret) {
187-
dev_err(&led->client->dev, "Cannot write MSB: %d\n", ret);
188-
goto out;
189-
}
190-
191-
ret = regmap_write(led->regmap, LM3692X_BRT_LSB, led_brightness_lsb);
192-
if (ret) {
193-
dev_err(&led->client->dev, "Cannot write LSB: %d\n", ret);
194-
goto out;
195-
}
196-
out:
197-
mutex_unlock(&led->lock);
198-
return ret;
199-
}
200-
201-
static int lm3692x_init(struct lm3692x_led *led)
168+
static int lm3692x_leds_enable(struct lm3692x_led *led)
202169
{
203170
int enable_state;
204171
int ret, reg_ret;
@@ -322,6 +289,39 @@ static int lm3692x_init(struct lm3692x_led *led)
322289
return ret;
323290
}
324291

292+
static int lm3692x_brightness_set(struct led_classdev *led_cdev,
293+
enum led_brightness brt_val)
294+
{
295+
struct lm3692x_led *led =
296+
container_of(led_cdev, struct lm3692x_led, led_dev);
297+
int ret;
298+
int led_brightness_lsb = (brt_val >> 5);
299+
300+
mutex_lock(&led->lock);
301+
302+
ret = lm3692x_fault_check(led);
303+
if (ret) {
304+
dev_err(&led->client->dev, "Cannot read/clear faults: %d\n",
305+
ret);
306+
goto out;
307+
}
308+
309+
ret = regmap_write(led->regmap, LM3692X_BRT_MSB, brt_val);
310+
if (ret) {
311+
dev_err(&led->client->dev, "Cannot write MSB: %d\n", ret);
312+
goto out;
313+
}
314+
315+
ret = regmap_write(led->regmap, LM3692X_BRT_LSB, led_brightness_lsb);
316+
if (ret) {
317+
dev_err(&led->client->dev, "Cannot write LSB: %d\n", ret);
318+
goto out;
319+
}
320+
out:
321+
mutex_unlock(&led->lock);
322+
return ret;
323+
}
324+
325325
static enum led_brightness lm3692x_max_brightness(struct lm3692x_led *led,
326326
u32 max_cur)
327327
{
@@ -451,7 +451,7 @@ static int lm3692x_probe(struct i2c_client *client,
451451
if (ret)
452452
return ret;
453453

454-
ret = lm3692x_init(led);
454+
ret = lm3692x_leds_enable(led);
455455
if (ret)
456456
return ret;
457457

0 commit comments

Comments
 (0)