aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/atmel_lcdfb.c
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-09-20 12:02:10 +0530
committerTomi Valkeinen <tomi.valkeinen@ti.com>2013-09-26 13:48:49 +0300
commita36bf192553912dc28230fb852ad13ef078e28a9 (patch)
treec2b6278ae398ce314622d2a00164c253345ff544 /drivers/video/atmel_lcdfb.c
parentvideo: jz4740-fb: Use clk_prepare_enable/clk_disable_unprepare (diff)
downloadlinux-dev-a36bf192553912dc28230fb852ad13ef078e28a9.tar.xz
linux-dev-a36bf192553912dc28230fb852ad13ef078e28a9.zip
video: atmel_lcdfb: Remove redundant dev_set_drvdata
Driver core sets driver data to NULL upon failure or remove. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/atmel_lcdfb.c')
-rw-r--r--drivers/video/atmel_lcdfb.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index df05550b82e6..3f7d6dc3408d 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -1089,7 +1089,7 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
ret = register_framebuffer(info);
if (ret < 0) {
dev_err(dev, "failed to register framebuffer device: %d\n", ret);
- goto reset_drvdata;
+ goto free_cmap;
}
/* add selected videomode to modelist */
@@ -1105,8 +1105,6 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
return 0;
-reset_drvdata:
- dev_set_drvdata(dev, NULL);
free_cmap:
fb_dealloc_cmap(&info->cmap);
unregister_irqs:
@@ -1167,7 +1165,6 @@ static int __exit atmel_lcdfb_remove(struct platform_device *pdev)
atmel_lcdfb_free_video_memory(sinfo);
}
- dev_set_drvdata(dev, NULL);
framebuffer_release(info);
return 0;