aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiu Ying <Ying.Liu@freescale.com>2014-03-11 02:15:33 -0400
committerNitin Garg <nitin.garg@freescale.com>2014-04-16 09:57:57 -0400
commitb8cc2d947d30dc68640d9b82cec6f68ec364b1c9 (patch)
tree0cfd2093981479a51e101e4ec3d0fc7778517951
parent18f2e4442dd83863a4725051af12f8fb675ececf (diff)
ENGR00302472-9 video: mxc disp: Drop post_init callback
Since there is no encoder driver using the post_init callback, let's drop it. Signed-off-by: Liu Ying <Ying.Liu@freescale.com>
-rw-r--r--drivers/video/mxc/mxc_dispdrv.c2
-rw-r--r--drivers/video/mxc/mxc_dispdrv.h2
-rw-r--r--drivers/video/mxc/mxc_ipuv3_fb.c11
3 files changed, 0 insertions, 15 deletions
diff --git a/drivers/video/mxc/mxc_dispdrv.c b/drivers/video/mxc/mxc_dispdrv.c
index def260f7841b..805c1c98b0f9 100644
--- a/drivers/video/mxc/mxc_dispdrv.c
+++ b/drivers/video/mxc/mxc_dispdrv.c
@@ -18,8 +18,6 @@
18 * A display device driver could call mxc_dispdrv_register(drv) in its dev_probe() function. 18 * A display device driver could call mxc_dispdrv_register(drv) in its dev_probe() function.
19 * Move all dev_probe() things into mxc_dispdrv_driver->init(), init() function should init 19 * Move all dev_probe() things into mxc_dispdrv_driver->init(), init() function should init
20 * and feedback setting; 20 * and feedback setting;
21 * Necessary deferred operations can be done in mxc_dispdrv_driver->post_init(),
22 * after dev_id and disp_id pass usage check;
23 * Move all dev_remove() things into mxc_dispdrv_driver->deinit(); 21 * Move all dev_remove() things into mxc_dispdrv_driver->deinit();
24 * Move all dev_suspend() things into fb_notifier for SUSPEND, if there is; 22 * Move all dev_suspend() things into fb_notifier for SUSPEND, if there is;
25 * Move all dev_resume() things into fb_notifier for RESUME, if there is; 23 * Move all dev_resume() things into fb_notifier for RESUME, if there is;
diff --git a/drivers/video/mxc/mxc_dispdrv.h b/drivers/video/mxc/mxc_dispdrv.h
index 3be09353911b..58d8a07d3380 100644
--- a/drivers/video/mxc/mxc_dispdrv.h
+++ b/drivers/video/mxc/mxc_dispdrv.h
@@ -33,8 +33,6 @@ struct mxc_dispdrv_setting {
33struct mxc_dispdrv_driver { 33struct mxc_dispdrv_driver {
34 const char *name; 34 const char *name;
35 int (*init) (struct mxc_dispdrv_handle *, struct mxc_dispdrv_setting *); 35 int (*init) (struct mxc_dispdrv_handle *, struct mxc_dispdrv_setting *);
36 /* deferred operations after dev_id and disp_id pass usage check */
37 int (*post_init) (struct mxc_dispdrv_handle *, int dev_id, int disp_id);
38 void (*deinit) (struct mxc_dispdrv_handle *); 36 void (*deinit) (struct mxc_dispdrv_handle *);
39 /* display driver enable function for extension */ 37 /* display driver enable function for extension */
40 int (*enable) (struct mxc_dispdrv_handle *, struct fb_info *); 38 int (*enable) (struct mxc_dispdrv_handle *, struct fb_info *);
diff --git a/drivers/video/mxc/mxc_ipuv3_fb.c b/drivers/video/mxc/mxc_ipuv3_fb.c
index b197be4ef878..ff9c318a3932 100644
--- a/drivers/video/mxc/mxc_ipuv3_fb.c
+++ b/drivers/video/mxc/mxc_ipuv3_fb.c
@@ -2407,16 +2407,6 @@ static int mxcfb_probe(struct platform_device *pdev)
2407 goto ipu_in_busy; 2407 goto ipu_in_busy;
2408 } 2408 }
2409 2409
2410 if (mxcfbi->dispdrv->drv->post_init) {
2411 ret = mxcfbi->dispdrv->drv->post_init(mxcfbi->dispdrv,
2412 mxcfbi->ipu_id,
2413 mxcfbi->ipu_di);
2414 if (ret < 0) {
2415 dev_err(&pdev->dev, "post init failed\n");
2416 goto post_init_failed;
2417 }
2418 }
2419
2420 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 2410 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
2421 if (res && res->start && res->end) { 2411 if (res && res->start && res->end) {
2422 fbi->fix.smem_len = res->end - res->start + 1; 2412 fbi->fix.smem_len = res->end - res->start + 1;
@@ -2505,7 +2495,6 @@ static int mxcfb_probe(struct platform_device *pdev)
2505mxcfb_setupoverlay_failed: 2495mxcfb_setupoverlay_failed:
2506mxcfb_register_failed: 2496mxcfb_register_failed:
2507get_ipu_failed: 2497get_ipu_failed:
2508post_init_failed:
2509 ipu_clear_usage(mxcfbi->ipu_id, mxcfbi->ipu_di); 2498 ipu_clear_usage(mxcfbi->ipu_id, mxcfbi->ipu_di);
2510ipu_in_busy: 2499ipu_in_busy:
2511init_dispdrv_failed: 2500init_dispdrv_failed: