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

backlight: omap1: 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>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.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
c76d1022 0561c179

+2 -12
+2 -12
drivers/video/backlight/omap1_bl.c
··· 146 146 memset(&props, 0, sizeof(struct backlight_properties)); 147 147 props.type = BACKLIGHT_RAW; 148 148 props.max_brightness = OMAPBL_MAX_INTENSITY; 149 - dev = backlight_device_register("omap-bl", &pdev->dev, bl, &omapbl_ops, 150 - &props); 149 + dev = devm_backlight_device_register(&pdev->dev, "omap-bl", &pdev->dev, 150 + bl, &omapbl_ops, &props); 151 151 if (IS_ERR(dev)) 152 152 return PTR_ERR(dev); 153 153 ··· 170 170 return 0; 171 171 } 172 172 173 - static int omapbl_remove(struct platform_device *pdev) 174 - { 175 - struct backlight_device *dev = platform_get_drvdata(pdev); 176 - 177 - backlight_device_unregister(dev); 178 - 179 - return 0; 180 - } 181 - 182 173 static SIMPLE_DEV_PM_OPS(omapbl_pm_ops, omapbl_suspend, omapbl_resume); 183 174 184 175 static struct platform_driver omapbl_driver = { 185 176 .probe = omapbl_probe, 186 - .remove = omapbl_remove, 187 177 .driver = { 188 178 .name = "omap-bl", 189 179 .pm = &omapbl_pm_ops,