* Removed duplicate return statement * General code clean-up My 1st patch. --- diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c index 6a74ea1..a5a6859 100644 --- a/drivers/video/omap2/dss/display.c +++ b/drivers/video/omap2/dss/display.c @@ -340,10 +340,11 @@ int omapdss_default_get_recommended_bpp(struct omap_dss_device *dssdev) return 24; else return 16; + case OMAP_DISPLAY_TYPE_VENC: case OMAP_DISPLAY_TYPE_SDI: return 24; - return 24; + default: BUG(); } diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c index f0ba573..0185782 100644 --- a/drivers/video/omap2/dss/venc.c +++ b/drivers/video/omap2/dss/venc.c @@ -450,10 +450,6 @@ static void venc_power_off(struct omap_dss_device *dssdev) venc_enable_clocks(0); } - - - - /* driver */ static int venc_panel_probe(struct omap_dss_device *dssdev) { @@ -654,8 +650,6 @@ static struct omap_dss_driver venc_driver = { }; /* driver end */ - - int venc_init(struct platform_device *pdev) { u8 rev_id; diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c index 4a76917..6d72784 100644 --- a/drivers/video/omap2/omapfb/omapfb-main.c +++ b/drivers/video/omap2/omapfb/omapfb-main.c @@ -1771,8 +1771,7 @@ static int omapfb_fb_init(struct omapfb2_device *fbdev, struct fb_info *fbi) var->bits_per_pixel = 32; break; default: - dev_err(fbdev->dev, "illegal display " - "bpp\n"); + dev_err(fbdev->dev, "illegal display bpp\n"); return -EINVAL; } } -- 1.6.3.3 -- -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html