Commit ea5092c8 authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds

backlight: hx8357: use devm_lcd_device_register()

Use devm_lcd_device_register() to make cleanup paths simpler, and remove
unnecessary remove().
Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f369e664
...@@ -648,7 +648,8 @@ static int hx8357_probe(struct spi_device *spi) ...@@ -648,7 +648,8 @@ static int hx8357_probe(struct spi_device *spi)
lcd->use_im_pins = 0; 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)) { if (IS_ERR(lcdev)) {
ret = PTR_ERR(lcdev); ret = PTR_ERR(lcdev);
return ret; return ret;
...@@ -660,29 +661,16 @@ static int hx8357_probe(struct spi_device *spi) ...@@ -660,29 +661,16 @@ static int hx8357_probe(struct spi_device *spi)
ret = ((int (*)(struct lcd_device *))match->data)(lcdev); ret = ((int (*)(struct lcd_device *))match->data)(lcdev);
if (ret) { if (ret) {
dev_err(&spi->dev, "Couldn't initialize panel\n"); dev_err(&spi->dev, "Couldn't initialize panel\n");
goto init_error; return ret;
} }
dev_info(&spi->dev, "Panel probed\n"); dev_info(&spi->dev, "Panel probed\n");
return 0; 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 = { static struct spi_driver hx8357_driver = {
.probe = hx8357_probe, .probe = hx8357_probe,
.remove = hx8357_remove,
.driver = { .driver = {
.name = "hx8357", .name = "hx8357",
.of_match_table = of_match_ptr(hx8357_dt_ids), .of_match_table = of_match_ptr(hx8357_dt_ids),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment