Use devm_lcd_device_register() to make cleanup paths simpler.
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>
 
        tosa_lcd_tg_on(data);
 
-       data->lcd = lcd_device_register("tosa-lcd", &spi->dev, data,
-                       &tosa_lcd_ops);
+       data->lcd = devm_lcd_device_register(&spi->dev, "tosa-lcd", &spi->dev,
+                                       data, &tosa_lcd_ops);
 
        if (IS_ERR(data->lcd)) {
                ret = PTR_ERR(data->lcd);
 {
        struct tosa_lcd_data *data = spi_get_drvdata(spi);
 
-       lcd_device_unregister(data->lcd);
-
        if (data->i2c)
                i2c_unregister_device(data->i2c);