diff options
author | Daniel Jeong <gshark.jeong@gmail.com> | 2014-03-13 22:14:00 -0400 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2014-04-08 08:20:41 -0400 |
commit | f1740e4cffede3e919a3511bf4e5113d642f09ec (patch) | |
tree | d0c3c73969a3aee5fbfcaa76aaf2d9cb78eaace3 | |
parent | 9a6adb339e5d1827da5e8b2459b12863d72ed3e7 (diff) |
backlight: lm3639: Use devm_backlight_device_register()
Change to use devm_backlight_device_register() for simple cleanup.
Signed-off-by: Daniel Jeong <gshark.jeong@gmail.com>
Acked-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r-- | drivers/video/backlight/lm3639_bl.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/video/backlight/lm3639_bl.c b/drivers/video/backlight/lm3639_bl.c index 6fd60adf922e..5f36808d214f 100644 --- a/drivers/video/backlight/lm3639_bl.c +++ b/drivers/video/backlight/lm3639_bl.c | |||
@@ -349,8 +349,9 @@ static int lm3639_probe(struct i2c_client *client, | |||
349 | props.brightness = pdata->init_brt_led; | 349 | props.brightness = pdata->init_brt_led; |
350 | props.max_brightness = pdata->max_brt_led; | 350 | props.max_brightness = pdata->max_brt_led; |
351 | pchip->bled = | 351 | pchip->bled = |
352 | backlight_device_register("lm3639_bled", pchip->dev, pchip, | 352 | devm_backlight_device_register(pchip->dev, "lm3639_bled", |
353 | &lm3639_bled_ops, &props); | 353 | pchip->dev, pchip, &lm3639_bled_ops, |
354 | &props); | ||
354 | if (IS_ERR(pchip->bled)) { | 355 | if (IS_ERR(pchip->bled)) { |
355 | dev_err(&client->dev, "fail : backlight register\n"); | 356 | dev_err(&client->dev, "fail : backlight register\n"); |
356 | ret = PTR_ERR(pchip->bled); | 357 | ret = PTR_ERR(pchip->bled); |
@@ -360,7 +361,7 @@ static int lm3639_probe(struct i2c_client *client, | |||
360 | ret = device_create_file(&(pchip->bled->dev), &dev_attr_bled_mode); | 361 | ret = device_create_file(&(pchip->bled->dev), &dev_attr_bled_mode); |
361 | if (ret < 0) { | 362 | if (ret < 0) { |
362 | dev_err(&client->dev, "failed : add sysfs entries\n"); | 363 | dev_err(&client->dev, "failed : add sysfs entries\n"); |
363 | goto err_bled_mode; | 364 | goto err_out; |
364 | } | 365 | } |
365 | 366 | ||
366 | /* flash */ | 367 | /* flash */ |
@@ -391,8 +392,6 @@ err_torch: | |||
391 | led_classdev_unregister(&pchip->cdev_flash); | 392 | led_classdev_unregister(&pchip->cdev_flash); |
392 | err_flash: | 393 | err_flash: |
393 | device_remove_file(&(pchip->bled->dev), &dev_attr_bled_mode); | 394 | device_remove_file(&(pchip->bled->dev), &dev_attr_bled_mode); |
394 | err_bled_mode: | ||
395 | backlight_device_unregister(pchip->bled); | ||
396 | err_out: | 395 | err_out: |
397 | return ret; | 396 | return ret; |
398 | } | 397 | } |
@@ -407,10 +406,8 @@ static int lm3639_remove(struct i2c_client *client) | |||
407 | led_classdev_unregister(&pchip->cdev_torch); | 406 | led_classdev_unregister(&pchip->cdev_torch); |
408 | if (&pchip->cdev_flash) | 407 | if (&pchip->cdev_flash) |
409 | led_classdev_unregister(&pchip->cdev_flash); | 408 | led_classdev_unregister(&pchip->cdev_flash); |
410 | if (pchip->bled) { | 409 | if (pchip->bled) |
411 | device_remove_file(&(pchip->bled->dev), &dev_attr_bled_mode); | 410 | device_remove_file(&(pchip->bled->dev), &dev_attr_bled_mode); |
412 | backlight_device_unregister(pchip->bled); | ||
413 | } | ||
414 | return 0; | 411 | return 0; |
415 | } | 412 | } |
416 | 413 | ||
@@ -432,6 +429,6 @@ static struct i2c_driver lm3639_i2c_driver = { | |||
432 | module_i2c_driver(lm3639_i2c_driver); | 429 | module_i2c_driver(lm3639_i2c_driver); |
433 | 430 | ||
434 | MODULE_DESCRIPTION("Texas Instruments Backlight+Flash LED driver for LM3639"); | 431 | MODULE_DESCRIPTION("Texas Instruments Backlight+Flash LED driver for LM3639"); |
435 | MODULE_AUTHOR("Daniel Jeong <daniel.jeong@ti.com>"); | 432 | MODULE_AUTHOR("Daniel Jeong <gshark.jeong@gmail.com>"); |
436 | MODULE_AUTHOR("G.Shark Jeong <gshark.jeong@gmail.com>"); | 433 | MODULE_AUTHOR("Ldd Mlp <ldd-mlp@list.ti.com>"); |
437 | MODULE_LICENSE("GPL v2"); | 434 | MODULE_LICENSE("GPL v2"); |