Skip to content

Commit

Permalink
backlight: lms283gf05: use devm_ functions
Browse files Browse the repository at this point in the history
The devm_ functions allocate memory that is released when a driver
detaches.  This patch uses devm_kzalloc of these functions.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Jingoo Han authored and Linus Torvalds committed May 29, 2012
1 parent 86f6be4 commit 26f2b35
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions drivers/video/backlight/lms283gf05.c
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,8 @@ static int __devinit lms283gf05_probe(struct spi_device *spi)
goto err;
}

st = kzalloc(sizeof(struct lms283gf05_state), GFP_KERNEL);
st = devm_kzalloc(&spi->dev, sizeof(struct lms283gf05_state),
GFP_KERNEL);
if (st == NULL) {
dev_err(&spi->dev, "No memory for device state\n");
ret = -ENOMEM;
Expand All @@ -178,7 +179,7 @@ static int __devinit lms283gf05_probe(struct spi_device *spi)
ld = lcd_device_register("lms283gf05", &spi->dev, st, &lms_ops);
if (IS_ERR(ld)) {
ret = PTR_ERR(ld);
goto err2;
goto err;
}

st->spi = spi;
Expand All @@ -193,8 +194,6 @@ static int __devinit lms283gf05_probe(struct spi_device *spi)

return 0;

err2:
kfree(st);
err:
if (pdata != NULL)
gpio_free(pdata->reset_gpio);
Expand All @@ -212,8 +211,6 @@ static int __devexit lms283gf05_remove(struct spi_device *spi)
if (pdata != NULL)
gpio_free(pdata->reset_gpio);

kfree(st);

return 0;
}

Expand Down

0 comments on commit 26f2b35

Please sign in to comment.