forked from Minki/linux
backlight: corgi_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: Jingoo Han <jg1.han@samsung.com> Cc: Eric Miao <eric.y.miao@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>
This commit is contained in:
parent
80629efcae
commit
06c96f189b
@ -544,7 +544,7 @@ static int __devinit corgi_lcd_probe(struct spi_device *spi)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
lcd = kzalloc(sizeof(struct corgi_lcd), GFP_KERNEL);
|
||||
lcd = devm_kzalloc(&spi->dev, sizeof(struct corgi_lcd), GFP_KERNEL);
|
||||
if (!lcd) {
|
||||
dev_err(&spi->dev, "failed to allocate memory\n");
|
||||
return -ENOMEM;
|
||||
@ -554,10 +554,9 @@ static int __devinit corgi_lcd_probe(struct spi_device *spi)
|
||||
|
||||
lcd->lcd_dev = lcd_device_register("corgi_lcd", &spi->dev,
|
||||
lcd, &corgi_lcd_ops);
|
||||
if (IS_ERR(lcd->lcd_dev)) {
|
||||
ret = PTR_ERR(lcd->lcd_dev);
|
||||
goto err_free_lcd;
|
||||
}
|
||||
if (IS_ERR(lcd->lcd_dev))
|
||||
return PTR_ERR(lcd->lcd_dev);
|
||||
|
||||
lcd->power = FB_BLANK_POWERDOWN;
|
||||
lcd->mode = (pdata) ? pdata->init_mode : CORGI_LCD_MODE_VGA;
|
||||
|
||||
@ -591,8 +590,6 @@ err_unregister_bl:
|
||||
backlight_device_unregister(lcd->bl_dev);
|
||||
err_unregister_lcd:
|
||||
lcd_device_unregister(lcd->lcd_dev);
|
||||
err_free_lcd:
|
||||
kfree(lcd);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -613,7 +610,6 @@ static int __devexit corgi_lcd_remove(struct spi_device *spi)
|
||||
|
||||
corgi_lcd_set_power(lcd->lcd_dev, FB_BLANK_POWERDOWN);
|
||||
lcd_device_unregister(lcd->lcd_dev);
|
||||
kfree(lcd);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user