backlight: ams369fg06: use devm_{backlight,lcd}_device_register()
Subsystems (2)
PATCH 1/5 backlight: ams369fg06: use devm_{backlight,lcd}_device_register()
Use devm_backlight_device_register() and devm_lcd_device_register() to make cleanup paths simpler.
--- drivers/video/backlight/ams369fg06.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)
drivers/video/backlight/ams369fg06.c +7 -15
@@ -477,8 +477,8 @@ static int ams369fg06_probe(struct spi_device *spi)return -EINVAL ; } - ld =lcd_device_register ("ams369fg06" , &spi->dev, lcd, - &ams369fg06_lcd_ops); + ld =devm_lcd_device_register (&spi->dev,"ams369fg06" , &spi->dev, lcd, + &ams369fg06_lcd_ops);if (IS_ERR (ld))return PTR_ERR (ld);
@@ -488,12 +488,11 @@ static int ams369fg06_probe(struct spi_device *spi) props.type =BACKLIGHT_RAW ; props.max_brightness =MAX_BRIGHTNESS ; - bd =backlight_device_register ("ams369fg06-bl" , &spi->dev, lcd, - &ams369fg06_backlight_ops, &props); -if (IS_ERR (bd)) { - ret =PTR_ERR (bd); - goto out_lcd_unregister; - } + bd =devm_backlight_device_register (&spi->dev,"ams369fg06-bl" , + &spi->dev, lcd, + &ams369fg06_backlight_ops, &props); +if (IS_ERR (bd)) +return PTR_ERR (bd); bd->props.brightness =DEFAULT_BRIGHTNESS ; lcd->bd = bd;
@@ -516,10 +515,6 @@ static int ams369fg06_probe(struct spi_device *spi)dev_info (&spi->dev,"ams369fg06 panel driver has been probed.\n" );return 0 ; - -out_lcd_unregister: -lcd_device_unregister (ld); -return ret; }static int ams369fg06_remove (struct spi_device *spi)
@@ -527,9 +522,6 @@ static int ams369fg06_remove(struct spi_device *spi)struct ams369fg06 *lcd =spi_get_drvdata (spi);ams369fg06_power (lcd,FB_BLANK_POWERDOWN ); -backlight_device_unregister (lcd->bd); -lcd_device_unregister (lcd->ld); -return 0 ; }
Signature · 1 line
1.7.10.4
PATCH 2/5 backlight: ld9040: use devm_{backlight,lcd}_device_register()
Use devm_backlight_device_register() and devm_lcd_device_register() to make cleanup paths simpler.
--- drivers/video/backlight/ld9040.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-)
drivers/video/backlight/ld9040.c +6 -15
@@ -716,7 +716,8 @@ static int ld9040_probe(struct spi_device *spi)return ret; } - ld =lcd_device_register ("ld9040" , &spi->dev, lcd, &ld9040_lcd_ops); + ld =devm_lcd_device_register (&spi->dev,"ld9040" , &spi->dev, lcd, + &ld9040_lcd_ops);if (IS_ERR (ld))return PTR_ERR (ld);
@@ -726,12 +727,10 @@ static int ld9040_probe(struct spi_device *spi) props.type =BACKLIGHT_RAW ; props.max_brightness =MAX_BRIGHTNESS ; - bd =backlight_device_register ("ld9040-bl" , &spi->dev, - lcd, &ld9040_backlight_ops, &props); -if (IS_ERR (bd)) { - ret =PTR_ERR (bd); - goto out_unregister_lcd; - } + bd =devm_backlight_device_register (&spi->dev,"ld9040-bl" , &spi->dev, + lcd, &ld9040_backlight_ops, &props); +if (IS_ERR (bd)) +return PTR_ERR (bd); bd->props.brightness =MAX_BRIGHTNESS ; lcd->bd = bd;
@@ -757,11 +756,6 @@ static int ld9040_probe(struct spi_device *spi)dev_info (&spi->dev,"ld9040 panel driver has been probed.\n" );return 0 ; - -out_unregister_lcd: -lcd_device_unregister (lcd->ld); - -return ret; }static int ld9040_remove (struct spi_device *spi)
@@ -769,9 +763,6 @@ static int ld9040_remove(struct spi_device *spi)struct ld9040 *lcd =spi_get_drvdata (spi);ld9040_power (lcd,FB_BLANK_POWERDOWN ); -backlight_device_unregister (lcd->bd); -lcd_device_unregister (lcd->ld); -return 0 ; }
Signature · 1 line
1.7.10.4
PATCH 3/5 backlight: corgi_lcd: use devm_{backlight,lcd}_device_register()
In reply to Jingoo HanUse devm_backlight_device_register() and devm_lcd_device_register() to make cleanup paths simpler.
--- drivers/video/backlight/corgi_lcd.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-)
drivers/video/backlight/corgi_lcd.c +9 -19
@@ -550,8 +550,8 @@ static int corgi_lcd_probe(struct spi_device *spi) lcd->spi_dev = spi; - lcd->lcd_dev =lcd_device_register ("corgi_lcd" , &spi->dev, - lcd, &corgi_lcd_ops); + lcd->lcd_dev =devm_lcd_device_register (&spi->dev,"corgi_lcd" , + &spi->dev, lcd, &corgi_lcd_ops);if (IS_ERR (lcd->lcd_dev))return PTR_ERR (lcd->lcd_dev);
@@ -561,18 +561,18 @@ static int corgi_lcd_probe(struct spi_device *spi)memset (&props,0 ,sizeof (struct backlight_properties )); props.type =BACKLIGHT_RAW ; props.max_brightness = pdata->max_intensity; - lcd->bl_dev =backlight_device_register ("corgi_bl" , &spi->dev, lcd, - &corgi_bl_ops, &props); -if (IS_ERR (lcd->bl_dev)) { - ret =PTR_ERR (lcd->bl_dev); - goto err_unregister_lcd; - } + lcd->bl_dev =devm_backlight_device_register (&spi->dev,"corgi_bl" , + &spi->dev, lcd, &corgi_bl_ops, + &props); +if (IS_ERR (lcd->bl_dev)) +return PTR_ERR (lcd->bl_dev); + lcd->bl_dev->props.brightness = pdata->default_intensity; lcd->bl_dev->props.power =FB_BLANK_UNBLANK ; ret =setup_gpio_backlight (lcd, pdata);if (ret) - goto err_unregister_bl; +return ret; lcd->kick_battery = pdata->kick_battery;
@@ -583,12 +583,6 @@ static int corgi_lcd_probe(struct spi_device *spi) lcd->limit_mask = pdata->limit_mask; the_corgi_lcd = lcd;return 0 ; - -err_unregister_bl: -backlight_device_unregister (lcd->bl_dev); -err_unregister_lcd: -lcd_device_unregister (lcd->lcd_dev); -return ret; }static int corgi_lcd_remove (struct spi_device *spi)
@@ -598,11 +592,7 @@ static int corgi_lcd_remove(struct spi_device *spi) lcd->bl_dev->props.power =FB_BLANK_UNBLANK ; lcd->bl_dev->props.brightness =0 ;backlight_update_status (lcd->bl_dev); -backlight_device_unregister (lcd->bl_dev); -corgi_lcd_set_power (lcd->lcd_dev,FB_BLANK_POWERDOWN ); -lcd_device_unregister (lcd->lcd_dev); -return 0 ; }
Signature · 1 line
1.7.10.4
PATCH 4/5 backlight: cr_bllcd: use devm_{backlight,lcd}_device_register()
In reply to Jingoo HanUse devm_backlight_device_register() and devm_lcd_device_register() to make cleanup paths simpler.
--- drivers/video/backlight/cr_bllcd.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
drivers/video/backlight/cr_bllcd.c +5 -8
@@ -195,16 +195,17 @@ static int cr_backlight_probe(struct platform_device *pdev)memset (&props,0 ,sizeof (struct backlight_properties )); props.type =BACKLIGHT_RAW ; - bdp =backlight_device_register ("cr-backlight" , &pdev->dev,NULL , - &cr_backlight_ops, &props); + bdp =devm_backlight_device_register (&pdev->dev,"cr-backlight" , + &pdev->dev,NULL , &cr_backlight_ops, + &props);if (IS_ERR (bdp)) {pci_dev_put (lpc_dev);return PTR_ERR (bdp); } - ldp =lcd_device_register ("cr-lcd" , &pdev->dev,NULL , &cr_lcd_ops); + ldp =devm_lcd_device_register (&pdev->dev,"cr-lcd" , &pdev->dev,NULL , + &cr_lcd_ops);if (IS_ERR (ldp)) { -backlight_device_unregister (bdp);pci_dev_put (lpc_dev);return PTR_ERR (ldp); }
@@ -215,8 +216,6 @@ static int cr_backlight_probe(struct platform_device *pdev) crp =devm_kzalloc (&pdev->dev,sizeof (*crp),GFP_KERNEL );if (!crp) { -lcd_device_unregister (ldp); -backlight_device_unregister (bdp);pci_dev_put (lpc_dev);return -ENOMEM ; }
@@ -241,8 +240,6 @@ static int cr_backlight_remove(struct platform_device *pdev) crp->cr_backlight_device->props.max_brightness =0 ;cr_backlight_set_intensity (crp->cr_backlight_device);cr_lcd_set_power (crp->cr_lcd_device,FB_BLANK_POWERDOWN ); -backlight_device_unregister (crp->cr_backlight_device); -lcd_device_unregister (crp->cr_lcd_device);pci_dev_put (lpc_dev);return 0 ;
Signature · 1 line
1.7.10.4
PATCH 5/5 backlight: s6e63m0: use devm_{backlight,lcd}_device_register()
In reply to Jingoo HanUse devm_backlight_device_register() and devm_lcd_device_register() to make cleanup paths simpler.
--- drivers/video/backlight/s6e63m0.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)
drivers/video/backlight/s6e63m0.c +7 -13
@@ -741,7 +741,8 @@ static int s6e63m0_probe(struct spi_device *spi)return -EINVAL ; } - ld =lcd_device_register ("s6e63m0" , &spi->dev, lcd, &s6e63m0_lcd_ops); + ld =devm_lcd_device_register (&spi->dev,"s6e63m0" , &spi->dev, lcd, + &s6e63m0_lcd_ops);if (IS_ERR (ld))return PTR_ERR (ld);
@@ -751,12 +752,11 @@ static int s6e63m0_probe(struct spi_device *spi) props.type =BACKLIGHT_RAW ; props.max_brightness =MAX_BRIGHTNESS ; - bd =backlight_device_register ("s6e63m0bl-bl" , &spi->dev, lcd, - &s6e63m0_backlight_ops, &props); -if (IS_ERR (bd)) { - ret =PTR_ERR (bd); - goto out_lcd_unregister; - } + bd =devm_backlight_device_register (&spi->dev,"s6e63m0bl-bl" , + &spi->dev, lcd, &s6e63m0_backlight_ops, + &props); +if (IS_ERR (bd)) +return PTR_ERR (bd); bd->props.brightness =MAX_BRIGHTNESS ; lcd->bd = bd;
@@ -798,10 +798,6 @@ static int s6e63m0_probe(struct spi_device *spi)dev_info (&spi->dev,"s6e63m0 panel driver has been probed.\n" );return 0 ; - -out_lcd_unregister: -lcd_device_unregister (ld); -return ret; }static int s6e63m0_remove (struct spi_device *spi)
@@ -811,8 +807,6 @@ static int s6e63m0_remove(struct spi_device *spi)s6e63m0_power (lcd,FB_BLANK_POWERDOWN );device_remove_file (&spi->dev, &dev_attr_gamma_table);device_remove_file (&spi->dev, &dev_attr_gamma_mode); -backlight_device_unregister (lcd->bd); -lcd_device_unregister (lcd->ld);return 0 ; }
Signature · 1 line
1.7.10.4