Commit a25fc871 authored by Sachin Kamat's avatar Sachin Kamat Committed by Linus Torvalds

drivers/video/exynos/s6e8ax0.c: use devm_* APIs in s6e8ax0.c

devm_* APIs are device managed and make error handling and code cleanup
simpler.
Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Acked-by: default avatarDonghwa Lee <dh09.lee@samsung.com>
Cc: Inki Dae <inki.dae@samsung.com>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d04d2681
...@@ -776,7 +776,7 @@ static int s6e8ax0_probe(struct mipi_dsim_lcd_device *dsim_dev) ...@@ -776,7 +776,7 @@ static int s6e8ax0_probe(struct mipi_dsim_lcd_device *dsim_dev)
int ret; int ret;
u8 mtp_id[3] = {0, }; u8 mtp_id[3] = {0, };
lcd = kzalloc(sizeof(struct s6e8ax0), GFP_KERNEL); lcd = devm_kzalloc(&dsim_dev->dev, sizeof(struct s6e8ax0), GFP_KERNEL);
if (!lcd) { if (!lcd) {
dev_err(&dsim_dev->dev, "failed to allocate s6e8ax0 structure.\n"); dev_err(&dsim_dev->dev, "failed to allocate s6e8ax0 structure.\n");
return -ENOMEM; return -ENOMEM;
...@@ -788,18 +788,17 @@ static int s6e8ax0_probe(struct mipi_dsim_lcd_device *dsim_dev) ...@@ -788,18 +788,17 @@ static int s6e8ax0_probe(struct mipi_dsim_lcd_device *dsim_dev)
mutex_init(&lcd->lock); mutex_init(&lcd->lock);
ret = regulator_bulk_get(lcd->dev, ARRAY_SIZE(supplies), supplies); ret = devm_regulator_bulk_get(lcd->dev, ARRAY_SIZE(supplies), supplies);
if (ret) { if (ret) {
dev_err(lcd->dev, "Failed to get regulators: %d\n", ret); dev_err(lcd->dev, "Failed to get regulators: %d\n", ret);
goto err_lcd_register; return ret;
} }
lcd->ld = lcd_device_register("s6e8ax0", lcd->dev, lcd, lcd->ld = lcd_device_register("s6e8ax0", lcd->dev, lcd,
&s6e8ax0_lcd_ops); &s6e8ax0_lcd_ops);
if (IS_ERR(lcd->ld)) { if (IS_ERR(lcd->ld)) {
dev_err(lcd->dev, "failed to register lcd ops.\n"); dev_err(lcd->dev, "failed to register lcd ops.\n");
ret = PTR_ERR(lcd->ld); return PTR_ERR(lcd->ld);
goto err_lcd_register;
} }
lcd->bd = backlight_device_register("s6e8ax0-bl", lcd->dev, lcd, lcd->bd = backlight_device_register("s6e8ax0-bl", lcd->dev, lcd,
...@@ -838,11 +837,6 @@ static int s6e8ax0_probe(struct mipi_dsim_lcd_device *dsim_dev) ...@@ -838,11 +837,6 @@ static int s6e8ax0_probe(struct mipi_dsim_lcd_device *dsim_dev)
err_backlight_register: err_backlight_register:
lcd_device_unregister(lcd->ld); lcd_device_unregister(lcd->ld);
err_lcd_register:
regulator_bulk_free(ARRAY_SIZE(supplies), supplies);
kfree(lcd);
return ret; return ret;
} }
......
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