Commit 541f936f authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds

backlight: s6e63m0: use devm_ functions

The devm_ functions allocate memory that is released when a driver
detaches.  This patch uses devm_kzalloc of these functions.
Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Cc: InKi Dae <inki.dae@samsung.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ab03e047
...@@ -741,7 +741,7 @@ static int __devinit s6e63m0_probe(struct spi_device *spi) ...@@ -741,7 +741,7 @@ static int __devinit s6e63m0_probe(struct spi_device *spi)
struct backlight_device *bd = NULL; struct backlight_device *bd = NULL;
struct backlight_properties props; struct backlight_properties props;
lcd = kzalloc(sizeof(struct s6e63m0), GFP_KERNEL); lcd = devm_kzalloc(&spi->dev, sizeof(struct s6e63m0), GFP_KERNEL);
if (!lcd) if (!lcd)
return -ENOMEM; return -ENOMEM;
...@@ -751,7 +751,7 @@ static int __devinit s6e63m0_probe(struct spi_device *spi) ...@@ -751,7 +751,7 @@ static int __devinit s6e63m0_probe(struct spi_device *spi)
ret = spi_setup(spi); ret = spi_setup(spi);
if (ret < 0) { if (ret < 0) {
dev_err(&spi->dev, "spi setup failed.\n"); dev_err(&spi->dev, "spi setup failed.\n");
goto out_free_lcd; return ret;
} }
lcd->spi = spi; lcd->spi = spi;
...@@ -760,14 +760,12 @@ static int __devinit s6e63m0_probe(struct spi_device *spi) ...@@ -760,14 +760,12 @@ static int __devinit s6e63m0_probe(struct spi_device *spi)
lcd->lcd_pd = (struct lcd_platform_data *)spi->dev.platform_data; lcd->lcd_pd = (struct lcd_platform_data *)spi->dev.platform_data;
if (!lcd->lcd_pd) { if (!lcd->lcd_pd) {
dev_err(&spi->dev, "platform data is NULL.\n"); dev_err(&spi->dev, "platform data is NULL.\n");
goto out_free_lcd; return -EFAULT;
} }
ld = lcd_device_register("s6e63m0", &spi->dev, lcd, &s6e63m0_lcd_ops); ld = lcd_device_register("s6e63m0", &spi->dev, lcd, &s6e63m0_lcd_ops);
if (IS_ERR(ld)) { if (IS_ERR(ld))
ret = PTR_ERR(ld); return PTR_ERR(ld);
goto out_free_lcd;
}
lcd->ld = ld; lcd->ld = ld;
...@@ -824,8 +822,6 @@ static int __devinit s6e63m0_probe(struct spi_device *spi) ...@@ -824,8 +822,6 @@ static int __devinit s6e63m0_probe(struct spi_device *spi)
out_lcd_unregister: out_lcd_unregister:
lcd_device_unregister(ld); lcd_device_unregister(ld);
out_free_lcd:
kfree(lcd);
return ret; return ret;
} }
...@@ -838,7 +834,6 @@ static int __devexit s6e63m0_remove(struct spi_device *spi) ...@@ -838,7 +834,6 @@ static int __devexit s6e63m0_remove(struct spi_device *spi)
device_remove_file(&spi->dev, &dev_attr_gamma_mode); device_remove_file(&spi->dev, &dev_attr_gamma_mode);
backlight_device_unregister(lcd->bd); backlight_device_unregister(lcd->bd);
lcd_device_unregister(lcd->ld); lcd_device_unregister(lcd->ld);
kfree(lcd);
return 0; return 0;
} }
......
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