backlight: hx8357: use devm_lcd_device_register()
Subsystems (2)
PATCH 1/8 backlight: hx8357: use devm_lcd_device_register()
Use devm_lcd_device_register() to make cleanup paths simpler, and remove unnecessary remove().
--- drivers/video/backlight/hx8357.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-)
drivers/video/backlight/hx8357.c +3 -15
@@ -648,7 +648,8 @@ static int hx8357_probe(struct spi_device *spi) lcd->use_im_pins =0 ; } - lcdev =lcd_device_register ("mxsfb" , &spi->dev, lcd, &hx8357_ops); + lcdev =devm_lcd_device_register (&spi->dev,"mxsfb" , &spi->dev, lcd, + &hx8357_ops);if (IS_ERR (lcdev)) { ret =PTR_ERR (lcdev);return ret;
@@ -660,29 +661,16 @@ static int hx8357_probe(struct spi_device *spi) ret = ((int (*)(struct lcd_device *))match->data)(lcdev);if (ret) {dev_err (&spi->dev,"Couldn't initialize panel\n" ); - goto init_error; +return ret; }dev_info (&spi->dev,"Panel probed\n" );return 0 ; - -init_error: -lcd_device_unregister (lcdev); -return ret; -} - -static int hx8357_remove (struct spi_device *spi) -{ -struct lcd_device *lcdev =spi_get_drvdata (spi); - -lcd_device_unregister (lcdev); -return 0 ; }static struct spi_driver hx8357_driver = { .probe = hx8357_probe, - .remove = hx8357_remove, .driver = { .name ="hx8357" , .of_match_table =of_match_ptr (hx8357_dt_ids),
Signature · 1 line
1.7.10.4
PATCH 2/8 backlight: ili922x: use devm_lcd_device_register()
Use devm_lcd_device_register() to make cleanup paths simpler.
--- drivers/video/backlight/ili922x.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/video/backlight/ili922x.c +2 -5
@@ -513,8 +513,8 @@ static int ili922x_probe(struct spi_device *spi) ili->power =FB_BLANK_POWERDOWN ; - lcd =lcd_device_register ("ili922xlcd" , &spi->dev, ili, - &ili922x_ops); + lcd =devm_lcd_device_register (&spi->dev,"ili922xlcd" , &spi->dev, ili, + &ili922x_ops);if (IS_ERR (lcd)) {dev_err (&spi->dev,"cannot register LCD\n" );return PTR_ERR (lcd);
@@ -530,10 +530,7 @@ static int ili922x_probe(struct spi_device *spi)static int ili922x_remove (struct spi_device *spi) { -struct ili922x *ili =spi_get_drvdata (spi); -ili922x_poweroff (spi); -lcd_device_unregister (ili->ld);return 0 ; }
Signature · 1 line
1.7.10.4
PATCH 3/8 backlight: ili9320: use devm_lcd_device_register()
In reply to Jingoo HanUse devm_lcd_device_register() to make cleanup paths simpler.
--- drivers/video/backlight/ili9320.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
drivers/video/backlight/ili9320.c +3 -10
@@ -235,7 +235,8 @@ int ili9320_probe_spi(struct spi_device *spi,ili9320_setup_spi (ili, spi); - lcd =lcd_device_register ("ili9320" , dev, ili, &ili9320_ops); + lcd =devm_lcd_device_register (&spi->dev,"ili9320" , dev, ili, + &ili9320_ops);if (IS_ERR (lcd)) {dev_err (dev,"failed to register lcd device\n" );return PTR_ERR (lcd);
@@ -248,24 +249,16 @@ int ili9320_probe_spi(struct spi_device *spi, ret =ili9320_power (ili,FB_BLANK_UNBLANK );if (ret !=0 ) {dev_err (dev,"failed to set lcd power state\n" ); - goto err_unregister; +return ret; }return 0 ; - - err_unregister: -lcd_device_unregister (lcd); - -return ret; }EXPORT_SYMBOL_GPL (ili9320_probe_spi);int ili9320_remove (struct ili9320 *ili) {ili9320_power (ili,FB_BLANK_POWERDOWN ); - -lcd_device_unregister (ili->lcd); -return 0 ; }EXPORT_SYMBOL_GPL (ili9320_remove);
Signature · 1 line
1.7.10.4
PATCH 4/8 backlight: lms283gf05: use devm_lcd_device_register()
In reply to Jingoo HanUse devm_lcd_device_register() to make cleanup paths simpler, and remove unnecessary remove().
--- drivers/video/backlight/lms283gf05.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
drivers/video/backlight/lms283gf05.c +2 -11
@@ -173,7 +173,8 @@ static int lms283gf05_probe(struct spi_device *spi)return -ENOMEM ; } - ld =lcd_device_register ("lms283gf05" , &spi->dev, st, &lms_ops); + ld =devm_lcd_device_register (&spi->dev,"lms283gf05" , &spi->dev, st, + &lms_ops);if (IS_ERR (ld))return PTR_ERR (ld);
@@ -190,22 +191,12 @@ static int lms283gf05_probe(struct spi_device *spi)return 0 ; } -static int lms283gf05_remove (struct spi_device *spi) -{ -struct lms283gf05_state *st =spi_get_drvdata (spi); - -lcd_device_unregister (st->ld); - -return 0 ; -} -static struct spi_driver lms283gf05_driver = { .driver = { .name ="lms283gf05" , .owner =THIS_MODULE , }, .probe = lms283gf05_probe, - .remove = lms283gf05_remove, };module_spi_driver (lms283gf05_driver);
Signature · 1 line
1.7.10.4
PATCH 5/8 backlight: lms501kf03: use devm_lcd_device_register()
In reply to Jingoo HanUse devm_lcd_device_register() to make cleanup paths simpler.
--- drivers/video/backlight/lms501kf03.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/video/backlight/lms501kf03.c +2 -4
@@ -350,8 +350,8 @@ static int lms501kf03_probe(struct spi_device *spi)return -EINVAL ; } - ld =lcd_device_register ("lms501kf03" , &spi->dev, lcd, - &lms501kf03_lcd_ops); + ld =devm_lcd_device_register (&spi->dev,"lms501kf03" , &spi->dev, lcd, + &lms501kf03_lcd_ops);if (IS_ERR (ld))return PTR_ERR (ld);
@@ -382,8 +382,6 @@ static int lms501kf03_remove(struct spi_device *spi)struct lms501kf03 *lcd =spi_get_drvdata (spi);lms501kf03_power (lcd,FB_BLANK_POWERDOWN ); -lcd_device_unregister (lcd->ld); -return 0 ; }
Signature · 1 line
1.7.10.4
PATCH 6/8 backlight: ltv350qv: use devm_lcd_device_register()
In reply to Jingoo HanUse devm_lcd_device_register() to make cleanup paths simpler.
--- drivers/video/backlight/ltv350qv.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/video/backlight/ltv350qv.c +3 -8
@@ -242,7 +242,8 @@ static int ltv350qv_probe(struct spi_device *spi)if (!lcd->buffer)return -ENOMEM ; - ld =lcd_device_register ("ltv350qv" , &spi->dev, lcd, <v_ops); + ld =devm_lcd_device_register (&spi->dev,"ltv350qv" , &spi->dev, lcd, + <v_ops);if (IS_ERR (ld))return PTR_ERR (ld);
@@ -250,15 +251,11 @@ static int ltv350qv_probe(struct spi_device *spi) ret =ltv350qv_power (lcd,FB_BLANK_UNBLANK );if (ret) - goto out_unregister; +return ret;spi_set_drvdata (spi, lcd);return 0 ; - -out_unregister: -lcd_device_unregister (ld); -return ret; }static int ltv350qv_remove (struct spi_device *spi)
@@ -266,8 +263,6 @@ static int ltv350qv_remove(struct spi_device *spi)struct ltv350qv *lcd =spi_get_drvdata (spi);ltv350qv_power (lcd,FB_BLANK_POWERDOWN ); -lcd_device_unregister (lcd->ld); -return 0 ; }
Signature · 1 line
1.7.10.4
PATCH 7/8 backlight: platform_lcd: use devm_lcd_device_register()
In reply to Jingoo HanUse devm_lcd_device_register() to make cleanup paths simpler, and remove unnecessary remove().
--- drivers/video/backlight/platform_lcd.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-)
drivers/video/backlight/platform_lcd.c +3 -17
@@ -101,30 +101,17 @@ static int platform_lcd_probe(struct platform_device *pdev) plcd->us = dev; plcd->pdata = pdata; - plcd->lcd =lcd_device_register (dev_name (dev), dev, - plcd, &platform_lcd_ops); + plcd->lcd =devm_lcd_device_register (&pdev->dev,dev_name (dev), dev, + plcd, &platform_lcd_ops);if (IS_ERR (plcd->lcd)) {dev_err (dev,"cannot register lcd device\n" ); - err =PTR_ERR (plcd->lcd); - goto err; +return PTR_ERR (plcd->lcd); }platform_set_drvdata (pdev, plcd);platform_lcd_set_power (plcd->lcd,FB_BLANK_NORMAL );return 0 ; - - err: -return err; -} - -static int platform_lcd_remove (struct platform_device *pdev) -{ -struct platform_lcd *plcd =platform_get_drvdata (pdev); - -lcd_device_unregister (plcd->lcd); - -return 0 ; }#ifdef CONFIG_PM_SLEEP
@@ -168,7 +155,6 @@ static struct platform_driver platform_lcd_driver = { .of_match_table = of_match_ptr(platform_lcd_of_match), }, .probe = platform_lcd_probe, - .remove = platform_lcd_remove, };module_platform_driver (platform_lcd_driver);
Signature · 1 line
1.7.10.4
PATCH 8/8 backlight: tdo24m: use devm_lcd_device_register()
In reply to Jingoo HanUse devm_lcd_device_register() to make cleanup paths simpler.
--- drivers/video/backlight/tdo24m.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/video/backlight/tdo24m.c +3 -9
@@ -385,21 +385,17 @@ static int tdo24m_probe(struct spi_device *spi)return -EINVAL ; } - lcd->lcd_dev =lcd_device_register ("tdo24m" , &spi->dev, - lcd, &tdo24m_ops); + lcd->lcd_dev =devm_lcd_device_register (&spi->dev,"tdo24m" , &spi->dev, + lcd, &tdo24m_ops);if (IS_ERR (lcd->lcd_dev))return PTR_ERR (lcd->lcd_dev);spi_set_drvdata (spi, lcd); err =tdo24m_power (lcd,FB_BLANK_UNBLANK );if (err) - goto out_unregister; +return err;return 0 ; - -out_unregister: -lcd_device_unregister (lcd->lcd_dev); -return err; }static int tdo24m_remove (struct spi_device *spi)
@@ -407,8 +403,6 @@ static int tdo24m_remove(struct spi_device *spi)struct tdo24m *lcd =spi_get_drvdata (spi);tdo24m_power (lcd,FB_BLANK_POWERDOWN ); -lcd_device_unregister (lcd->lcd_dev); -return 0 ; }
Signature · 1 line
1.7.10.4