|
@@ -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;
|
|
|
}
|
|
|
|