diff options
| author | Jayarami Reddy <jayarami.reddy@stericsson.com> | 2011-09-27 10:41:28 +0530 |
|---|---|---|
| committer | Rabin VINCENT <rabin.vincent@stericsson.com> | 2011-10-04 07:16:08 +0200 |
| commit | 4057cb94d7956249fc2601b82bcaaf9d8f0ca5d5 (patch) | |
| tree | 895ef9c0a5b79c5c4c6a8c4f5e41f54a395b93dd | |
| parent | 0208a1c8a0f7f465963aec091d87fa2cba169c14 (diff) | |
arm: ux500: fix compilation errors
fix compilation errors when HDMI_FB_AUTO_CREATE
is not set for db5500
ST-Ericsson ID: 365167
ST-Ericsson Linux next: Not tested, ER 282779
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I3d1b79b350c2672671a4d71b11a3103ec603d6de
Signed-off-by: Jayarami Reddy <jayarami.reddy@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32193
Reviewed-by: Per PERSSON <per.xb.persson@stericsson.com>
Reviewed-by: Jimmy RUBIN <jimmy.rubin@stericsson.com>
Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com>
| -rw-r--r-- | arch/arm/mach-ux500/board-u5500-mcde.c | 65 |
1 files changed, 33 insertions, 32 deletions
diff --git a/arch/arm/mach-ux500/board-u5500-mcde.c b/arch/arm/mach-ux500/board-u5500-mcde.c index 581ecc700de..7327813fbcc 100644 --- a/arch/arm/mach-ux500/board-u5500-mcde.c +++ b/arch/arm/mach-ux500/board-u5500-mcde.c @@ -280,6 +280,9 @@ static int display_postregistered_callback(struct notifier_block *nb, u32 rotate = FB_ROTATE_UR; u32 rotate_angle = 0; struct fb_info *fbi; +#ifdef CONFIG_DISPDEV + struct mcde_fb *mfb; +#endif struct mcde_display_sony_acx424akp_platform_data *pdata = ddev->dev.platform_data; @@ -335,46 +338,44 @@ static int display_postregistered_callback(struct notifier_block *nb, virtual_height = height * 3; #endif #ifdef CONFIG_DISPLAY_AV8100_TERTIARY - if (ddev->id == AV8100_DISPLAY_ID) + if (ddev->id == AV8100_DISPLAY_ID) { #ifdef CONFIG_MCDE_DISPLAY_HDMI_FB_AUTO_CREATE hdmi_fb_onoff(ddev, 1, 0, 0); #endif /* CONFIG_MCDE_DISPLAY_HDMI_FB_AUTO_CREATE */ - else + goto out; + } #endif /* CONFIG_DISPLAY_AV8100_TERTIARY */ - { - struct mcde_fb *mfb; - /* Create frame buffer */ - fbi = mcde_fb_create(ddev, - width, height, - virtual_width, virtual_height, - ddev->default_pixel_format, - rotate); - - if (IS_ERR(fbi)) { - dev_warn(&ddev->dev, - "Failed to create fb for display %s\n", - ddev->name); - goto display_postregistered_callback_err; - } else { - dev_info(&ddev->dev, "Framebuffer created (%s)\n", - ddev->name); - } + + /* Create frame buffer */ + fbi = mcde_fb_create(ddev, + width, height, + virtual_width, virtual_height, + ddev->default_pixel_format, + rotate); + + if (IS_ERR(fbi)) { + dev_warn(&ddev->dev, + "Failed to create fb for display %s\n", ddev->name); + goto display_postregistered_callback_err; + } else { + dev_info(&ddev->dev, "Framebuffer created (%s)\n", ddev->name); + } #ifdef CONFIG_DISPDEV - mfb = to_mcde_fb(fbi); - /* Create a dispdev overlay for this display */ - if (dispdev_create(ddev, true, mfb->ovlys[0]) < 0) { - dev_warn(&ddev->dev, - "Failed to create disp for display %s\n", - ddev->name); - goto display_postregistered_callback_err; - } else { - dev_info(&ddev->dev, "Disp dev created for (%s)\n", - ddev->name); - } -#endif + mfb = to_mcde_fb(fbi); + /* Create a dispdev overlay for this display */ + if (dispdev_create(ddev, true, mfb->ovlys[0]) < 0) { + dev_warn(&ddev->dev, + "Failed to create disp for display %s\n", ddev->name); + goto display_postregistered_callback_err; + } else { + dev_info(&ddev->dev, "Disp dev created for (%s)\n", ddev->name); } +#endif +#ifdef CONFIG_DISPLAY_AV8100_TERTIARY +out: +#endif return 0; display_postregistered_callback_err: |