Commit c8515294 authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds
Browse files

backlight: tosa_lcd: 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: Dmitry Baryshkov <dbaryshkov@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 f072c890
Loading
Loading
Loading
Loading
+3 −5
Original line number Diff line number Diff line
@@ -174,7 +174,8 @@ static int __devinit tosa_lcd_probe(struct spi_device *spi)
	int ret;
	struct tosa_lcd_data *data;

	data = kzalloc(sizeof(struct tosa_lcd_data), GFP_KERNEL);
	data = devm_kzalloc(&spi->dev, sizeof(struct tosa_lcd_data),
				GFP_KERNEL);
	if (!data)
		return -ENOMEM;

@@ -187,7 +188,7 @@ static int __devinit tosa_lcd_probe(struct spi_device *spi)

	ret = spi_setup(spi);
	if (ret < 0)
		goto err_spi;
		return ret;

	data->spi = spi;
	dev_set_drvdata(&spi->dev, data);
@@ -224,8 +225,6 @@ err_gpio_dir:
	gpio_free(TOSA_GPIO_TG_ON);
err_gpio_tg:
	dev_set_drvdata(&spi->dev, NULL);
err_spi:
	kfree(data);
	return ret;
}

@@ -242,7 +241,6 @@ static int __devexit tosa_lcd_remove(struct spi_device *spi)

	gpio_free(TOSA_GPIO_TG_ON);
	dev_set_drvdata(&spi->dev, NULL);
	kfree(data);

	return 0;
}