projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
[cascardo/linux.git]
/
drivers
/
video
/
backlight
/
tosa_lcd.c
diff --git
a/drivers/video/backlight/tosa_lcd.c
b/drivers/video/backlight/tosa_lcd.c
index
be5d636
..
f08d641
100644
(file)
--- 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)
tosa_lcd_tg_on(data);
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);
if (IS_ERR(data->lcd)) {
ret = PTR_ERR(data->lcd);
@@
-226,8
+226,6
@@
static int tosa_lcd_remove(struct spi_device *spi)
{
struct tosa_lcd_data *data = spi_get_drvdata(spi);
{
struct tosa_lcd_data *data = spi_get_drvdata(spi);
- lcd_device_unregister(data->lcd);
-
if (data->i2c)
i2c_unregister_device(data->i2c);
if (data->i2c)
i2c_unregister_device(data->i2c);