Commit 26f2b35c authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds

backlight: lms283gf05: 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>
Acked-by: default avatarMarek Vasut <marek.vasut@gmail.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 86f6be4f
...@@ -168,7 +168,8 @@ static int __devinit lms283gf05_probe(struct spi_device *spi) ...@@ -168,7 +168,8 @@ static int __devinit lms283gf05_probe(struct spi_device *spi)
goto err; goto err;
} }
st = kzalloc(sizeof(struct lms283gf05_state), GFP_KERNEL); st = devm_kzalloc(&spi->dev, sizeof(struct lms283gf05_state),
GFP_KERNEL);
if (st == NULL) { if (st == NULL) {
dev_err(&spi->dev, "No memory for device state\n"); dev_err(&spi->dev, "No memory for device state\n");
ret = -ENOMEM; ret = -ENOMEM;
...@@ -178,7 +179,7 @@ static int __devinit lms283gf05_probe(struct spi_device *spi) ...@@ -178,7 +179,7 @@ static int __devinit lms283gf05_probe(struct spi_device *spi)
ld = lcd_device_register("lms283gf05", &spi->dev, st, &lms_ops); ld = lcd_device_register("lms283gf05", &spi->dev, st, &lms_ops);
if (IS_ERR(ld)) { if (IS_ERR(ld)) {
ret = PTR_ERR(ld); ret = PTR_ERR(ld);
goto err2; goto err;
} }
st->spi = spi; st->spi = spi;
...@@ -193,8 +194,6 @@ static int __devinit lms283gf05_probe(struct spi_device *spi) ...@@ -193,8 +194,6 @@ static int __devinit lms283gf05_probe(struct spi_device *spi)
return 0; return 0;
err2:
kfree(st);
err: err:
if (pdata != NULL) if (pdata != NULL)
gpio_free(pdata->reset_gpio); gpio_free(pdata->reset_gpio);
...@@ -212,8 +211,6 @@ static int __devexit lms283gf05_remove(struct spi_device *spi) ...@@ -212,8 +211,6 @@ static int __devexit lms283gf05_remove(struct spi_device *spi)
if (pdata != NULL) if (pdata != NULL)
gpio_free(pdata->reset_gpio); gpio_free(pdata->reset_gpio);
kfree(st);
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