16 files changed, 19 insertions, 19 deletions

diff --git a/drivers/video/cfbimgblt.c b/drivers/video/cfbimgblt.c
index baed57d3cfff..a2bb276a8b24 100644
--- a/drivers/video/cfbimgblt.c
+++ b/drivers/video/cfbimgblt.c
@@ -181,7 +181,7 @@ static inline void slow_imageblit(const struct fb_image *image, struct fb_info *
                         }
                         shift += bpp;
                         shift &= (32 - 1);
-                        if (!l) { l = 8; s++; };
+                        if (!l) { l = 8; s++; }
                 }
 
                 /* write trailing bits */
diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c
index 9626488a69c5..c79745b136bb 100644
--- a/drivers/video/cg14.c
+++ b/drivers/video/cg14.c
@@ -330,7 +330,7 @@ static int cg14_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
                 default:
                         ret = -ENOSYS;
                         break;
-                };
+                }
                 if (!ret) {
                         sbus_writeb(cur_mode, &regs->mcr);
                         par->mode = mode;
@@ -343,7 +343,7 @@ static int cg14_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
                                           FBTYPE_MDICOLOR, 8,
                                           info->fix.smem_len);
                 break;
-        };
+        }
 
         return ret;
 }
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c
index f070ec3b0f0a..70781fea092a 100644
--- a/drivers/video/cg6.c
+++ b/drivers/video/cg6.c
@@ -624,7 +624,7 @@ static void cg6_init_fix(struct fb_info *info, int linebytes)
         default:
                 cg6_cpu_name = "i386";
                 break;
-        };
+        }
         if (((conf >> CG6_FHC_REV_SHIFT) & CG6_FHC_REV_MASK) >= 11) {
                 if (info->fix.smem_len <= 0x100000)
                         cg6_card_name = "TGX";
diff --git a/drivers/video/exynos/exynos_mipi_dsi_common.c b/drivers/video/exynos/exynos_mipi_dsi_common.c
index 520fc9bd887b..9b321652b810 100644
--- a/drivers/video/exynos/exynos_mipi_dsi_common.c
+++ b/drivers/video/exynos/exynos_mipi_dsi_common.c
@@ -667,7 +667,7 @@ int exynos_mipi_dsi_init_dsim(struct mipi_dsim_device *dsim)
         default:
                 dev_info(dsim->dev, "data lane is invalid.\n");
                 return -EINVAL;
-        };
+        }
 
         exynos_mipi_dsi_sw_reset(dsim);
         exynos_mipi_dsi_func_reset(dsim);
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index 6dd72250111e..6c71bb6b9a6d 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -1102,7 +1102,7 @@ static int fsl_diu_cursor(struct fb_info *info, struct fb_cursor *cursor)
 
                 fsl_diu_load_cursor_image(info, image, bg, fg,
                         cursor->image.width, cursor->image.height);
-        };
+        }
 
         /*
          * Show or hide the cursor.  The cursor data is always stored in the
diff --git a/drivers/video/leo.c b/drivers/video/leo.c
index c0f61aa37696..2c7f7d479fe2 100644
--- a/drivers/video/leo.c
+++ b/drivers/video/leo.c
@@ -469,7 +469,7 @@ static void leo_wid_put(struct fb_info *info, struct fb_wid_list *wl)
 
                 default:
                         continue;
-                };
+                }
                 sbus_writel(0x5800 + j, &lx_krn->krn_type);
                 sbus_writel(wi->wi_values[0], &lx_krn->krn_value);
         }
diff --git a/drivers/video/matrox/matroxfb_DAC1064.c b/drivers/video/matrox/matroxfb_DAC1064.c
index 1717623aabc0..a01147fdf270 100644
--- a/drivers/video/matrox/matroxfb_DAC1064.c
+++ b/drivers/video/matrox/matroxfb_DAC1064.c
@@ -494,7 +494,7 @@ static int m1064_compute(void* out, struct my_timming* m) {
                         if (inDAC1064(minfo, M1064_XPIXPLLSTAT) & 0x40)
                                 break;
                         udelay(10);
-                };
+                }
 
                 CRITEND
 
@@ -639,7 +639,7 @@ static void MGAG100_progPixClock(const struct matrox_fb_info *minfo, int flags,
                 if (inDAC1064(minfo, M1064_XPIXPLLSTAT) & 0x40)
                         break;
                 udelay(10);
-        };
+        }
         if (!clk)
                 printk(KERN_ERR "matroxfb: Pixel PLL%c not locked after usual time\n", (reg-M1064_XPIXPLLAM-2)/4 + 'A');
         selClk = inDAC1064(minfo, M1064_XPIXCLKCTRL) & ~M1064_XPIXCLKCTRL_SRC_MASK;
diff --git a/drivers/video/matrox/matroxfb_Ti3026.c b/drivers/video/matrox/matroxfb_Ti3026.c
index 9a44cec394b5..195ad7cac1ba 100644
--- a/drivers/video/matrox/matroxfb_Ti3026.c
+++ b/drivers/video/matrox/matroxfb_Ti3026.c
@@ -473,7 +473,7 @@ static void ti3026_setMCLK(struct matrox_fb_info *minfo, int fout)
                 if (inTi3026(minfo, TVP3026_XPIXPLLDATA) & 0x40)
                         break;
                 udelay(10);
-        };
+        }
         if (!tmout)
                 printk(KERN_ERR "matroxfb: Temporary pixel PLL not locked after 5 secs\n");
 
diff --git a/drivers/video/nvidia/nv_hw.c b/drivers/video/nvidia/nv_hw.c
index ed20a9871b33..81c80ac3c76f 100644
--- a/drivers/video/nvidia/nv_hw.c
+++ b/drivers/video/nvidia/nv_hw.c
@@ -1300,7 +1300,7 @@ void NVLoadStateExt(struct nvidia_par *par, RIVA_HW_STATE * state)
                                         break;
                                 default:
                                         break;
-                                };
+                                }
 
                                 NV_WR32(par->PGRAPH, 0x0b38, 0x2ffff800);
                                 NV_WR32(par->PGRAPH, 0x0b3c, 0x00006000);
diff --git a/drivers/video/omap2/displays-new/panel-dsi-cm.c b/drivers/video/omap2/displays-new/panel-dsi-cm.c
index aaaea6469cd9..b7baafe83aa3 100644
--- a/drivers/video/omap2/displays-new/panel-dsi-cm.c
+++ b/drivers/video/omap2/displays-new/panel-dsi-cm.c
@@ -599,7 +599,7 @@ static int dsicm_power_on(struct panel_drv_data *ddata)
         if (r) {
                 dev_err(&ddata->pdev->dev, "failed to configure DSI pins\n");
                 goto err0;
-        };
+        }
 
         r = in->ops.dsi->set_config(in, &dsi_config);
         if (r) {
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 8fbeb299fac3..91c687fd002e 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -2918,7 +2918,7 @@ static void _dispc_mgr_set_lcd_timings(enum omap_channel channel, int hsw,
                 break;
         default:
                 BUG();
-        };
+        }
 
         l = dispc_read_reg(DISPC_POL_FREQ(channel));
         l |= FLD_VAL(onoff, 17, 17);
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index 64b1a81b3afc..6056b27cf73c 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -4066,7 +4066,7 @@ static int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel)
                 default:
                         r = -EINVAL;
                         goto err_pix_fmt;
-                };
+                }
 
                 dsi_if_enable(dsidev, false);
                 dsi_vc_enable(dsidev, channel, false);
diff --git a/drivers/video/sbuslib.c b/drivers/video/sbuslib.c
index 296afae442f4..a350209ffbd3 100644
--- a/drivers/video/sbuslib.c
+++ b/drivers/video/sbuslib.c
@@ -186,7 +186,7 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg,
         }
         default:
                 return -EINVAL;
-        };
+        }
 }
 EXPORT_SYMBOL(sbusfb_ioctl_helper);
 
diff --git a/drivers/video/sysimgblt.c b/drivers/video/sysimgblt.c
index 186c6f607be2..a4d05b1b17d7 100644
--- a/drivers/video/sysimgblt.c
+++ b/drivers/video/sysimgblt.c
@@ -152,7 +152,7 @@ static void slow_imageblit(const struct fb_image *image, struct fb_info *p,
                         }
                         shift += bpp;
                         shift &= (32 - 1);
-                        if (!l) { l = 8; s++; };
+                        if (!l) { l = 8; s++; }
                 }
 
                 /* write trailing bits */
diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c
index 1f3a3271f3dd..7fb2d696fac7 100644
--- a/drivers/video/tcx.c
+++ b/drivers/video/tcx.c
@@ -232,7 +232,7 @@ tcx_blank(int blank, struct fb_info *info)
 
         case FB_BLANK_POWERDOWN: /* Poweroff */
                 break;
-        };
+        }
 
         sbus_writel(val, &thc->thc_misc);
 
@@ -434,7 +434,7 @@ static int tcx_probe(struct platform_device *op)
                 default:
                         j = i;
                         break;
-                };
+                }
                 par->mmap_map[i].poff = op->resource[j].start;
         }
 
diff --git a/drivers/video/vt8500lcdfb.c b/drivers/video/vt8500lcdfb.c
index 897484903c30..b30e5a439d1f 100644
--- a/drivers/video/vt8500lcdfb.c
+++ b/drivers/video/vt8500lcdfb.c
@@ -365,7 +365,7 @@ static int vt8500lcd_probe(struct platform_device *pdev)
         if (!fb_mem_virt) {
                 pr_err("%s: Failed to allocate framebuffer\n", __func__);
                 return -ENOMEM;
-        };
+        }
 
         fbi->fb.fix.smem_start  = fb_mem_phys;
         fbi->fb.fix.smem_len    = fb_mem_len;