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

backlight: adp5520: use devm_backlight_device_register()

Use devm_backlight_device_register() to make cleanup paths simpler.

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
5f652c71 c7a2bf3b

+4 -5
+4 -5
drivers/video/backlight/adp5520_bl.c
··· 312 312 memset(&props, 0, sizeof(struct backlight_properties)); 313 313 props.type = BACKLIGHT_RAW; 314 314 props.max_brightness = ADP5020_MAX_BRIGHTNESS; 315 - bl = backlight_device_register(pdev->name, data->master, data, 316 - &adp5520_bl_ops, &props); 315 + bl = devm_backlight_device_register(&pdev->dev, pdev->name, 316 + data->master, data, &adp5520_bl_ops, 317 + &props); 317 318 if (IS_ERR(bl)) { 318 319 dev_err(&pdev->dev, "failed to register backlight\n"); 319 320 return PTR_ERR(bl); ··· 327 326 328 327 if (ret) { 329 328 dev_err(&pdev->dev, "failed to register sysfs\n"); 330 - backlight_device_unregister(bl); 329 + return ret; 331 330 } 332 331 333 332 platform_set_drvdata(pdev, bl); ··· 347 346 if (data->pdata->en_ambl_sens) 348 347 sysfs_remove_group(&bl->dev.kobj, 349 348 &adp5520_bl_attr_group); 350 - 351 - backlight_device_unregister(bl); 352 349 353 350 return 0; 354 351 }