Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <agx@sigxcpu.org>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pavel Machek <pavel@ucw.cz>

authored by

Guido Günther and committed by
Pavel
5e9d7b6f df7083b5

+35 -35
+35 -35
drivers/leds/leds-lm3692x.c
··· 165 165 return read_buf; 166 166 } 167 167 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) 202 169 { 203 170 int enable_state; 204 171 int ret, reg_ret; ··· 286 319 "Failed to disable regulator: %d\n", reg_ret); 287 320 } 288 321 322 + return ret; 323 + } 324 + 325 + static int lm3692x_brightness_set(struct led_classdev *led_cdev, 326 + enum led_brightness brt_val) 327 + { 328 + struct lm3692x_led *led = 329 + container_of(led_cdev, struct lm3692x_led, led_dev); 330 + int ret; 331 + int led_brightness_lsb = (brt_val >> 5); 332 + 333 + mutex_lock(&led->lock); 334 + 335 + ret = lm3692x_fault_check(led); 336 + if (ret) { 337 + dev_err(&led->client->dev, "Cannot read/clear faults: %d\n", 338 + ret); 339 + goto out; 340 + } 341 + 342 + ret = regmap_write(led->regmap, LM3692X_BRT_MSB, brt_val); 343 + if (ret) { 344 + dev_err(&led->client->dev, "Cannot write MSB: %d\n", ret); 345 + goto out; 346 + } 347 + 348 + ret = regmap_write(led->regmap, LM3692X_BRT_LSB, led_brightness_lsb); 349 + if (ret) { 350 + dev_err(&led->client->dev, "Cannot write LSB: %d\n", ret); 351 + goto out; 352 + } 353 + out: 354 + mutex_unlock(&led->lock); 289 355 return ret; 290 356 } 291 357 ··· 451 451 if (ret) 452 452 return ret; 453 453 454 - ret = lm3692x_init(led); 454 + ret = lm3692x_leds_enable(led); 455 455 if (ret) 456 456 return ret; 457 457