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

backlight: as3711_bl: use devm_backlight_device_register()

Use devm_backlight_device_register() to make cleanup paths simpler, and
remove unnecessary remove().

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Jingoo Han and committed by
Linus Torvalds
83dedc05 568ee6c3

+5 -21
+5 -21
drivers/video/backlight/as3711_bl.c
··· 240 240 /* max tuning I = 31uA for voltage- and 38250uA for current-feedback */ 241 241 props.max_brightness = max_brightness; 242 242 243 - bl = backlight_device_register(su->type == AS3711_BL_SU1 ? 243 + bl = devm_backlight_device_register(&pdev->dev, 244 + su->type == AS3711_BL_SU1 ? 244 245 "as3711-su1" : "as3711-su2", 245 246 &pdev->dev, su, 246 247 &as3711_bl_ops, &props); ··· 433 432 case AS3711_SU2_LX_SD4: 434 433 break; 435 434 default: 436 - ret = -EINVAL; 437 - goto esu2; 435 + return -EINVAL; 438 436 } 439 437 440 438 switch (pdata->su2_feedback) { ··· 447 447 max_brightness = min(pdata->su2_max_uA / 150, 255); 448 448 break; 449 449 default: 450 - ret = -EINVAL; 451 - goto esu2; 450 + return -EINVAL; 452 451 } 453 452 454 453 ret = as3711_bl_init_su2(supply); ··· 456 457 457 458 ret = as3711_bl_register(pdev, max_brightness, su); 458 459 if (ret < 0) 459 - goto esu2; 460 + return ret; 460 461 } 461 462 462 463 platform_set_drvdata(pdev, supply); 463 - 464 - return 0; 465 - 466 - esu2: 467 - backlight_device_unregister(supply->su1.bl); 468 - return ret; 469 - } 470 - 471 - static int as3711_backlight_remove(struct platform_device *pdev) 472 - { 473 - struct as3711_bl_supply *supply = platform_get_drvdata(pdev); 474 - 475 - backlight_device_unregister(supply->su1.bl); 476 - backlight_device_unregister(supply->su2.bl); 477 464 478 465 return 0; 479 466 } ··· 470 485 .owner = THIS_MODULE, 471 486 }, 472 487 .probe = as3711_backlight_probe, 473 - .remove = as3711_backlight_remove, 474 488 }; 475 489 476 490 module_platform_driver(as3711_backlight_driver);