diff options
author | Jingoo Han <jg1.han@samsung.com> | 2014-01-23 18:54:30 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-23 19:36:57 -0500 |
commit | 0f53449d69b99f0455ecd3e3a73a38aa7555b174 (patch) | |
tree | 880920775706d65f06015e82364ccf383fb5aa17 /drivers/video/backlight | |
parent | 7dd78077369ebe7db031d9de1d6b4c766b3b4f7d (diff) |
backlight: tosa: use devm_lcd_device_register()
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>
Diffstat (limited to 'drivers/video/backlight')
-rw-r--r-- | drivers/video/backlight/tosa_lcd.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/backlight/tosa_lcd.c b/drivers/video/backlight/tosa_lcd.c index be5d636764bf..f08d641ccd01 100644 --- a/drivers/video/backlight/tosa_lcd.c +++ b/drivers/video/backlight/tosa_lcd.c | |||
@@ -206,8 +206,8 @@ static int tosa_lcd_probe(struct spi_device *spi) | |||
206 | 206 | ||
207 | tosa_lcd_tg_on(data); | 207 | tosa_lcd_tg_on(data); |
208 | 208 | ||
209 | data->lcd = lcd_device_register("tosa-lcd", &spi->dev, data, | 209 | data->lcd = devm_lcd_device_register(&spi->dev, "tosa-lcd", &spi->dev, |
210 | &tosa_lcd_ops); | 210 | data, &tosa_lcd_ops); |
211 | 211 | ||
212 | if (IS_ERR(data->lcd)) { | 212 | if (IS_ERR(data->lcd)) { |
213 | ret = PTR_ERR(data->lcd); | 213 | ret = PTR_ERR(data->lcd); |
@@ -226,8 +226,6 @@ static int tosa_lcd_remove(struct spi_device *spi) | |||
226 | { | 226 | { |
227 | struct tosa_lcd_data *data = spi_get_drvdata(spi); | 227 | struct tosa_lcd_data *data = spi_get_drvdata(spi); |
228 | 228 | ||
229 | lcd_device_unregister(data->lcd); | ||
230 | |||
231 | if (data->i2c) | 229 | if (data->i2c) |
232 | i2c_unregister_device(data->i2c); | 230 | i2c_unregister_device(data->i2c); |
233 | 231 | ||