[media] drivers/media: Remove unnecessary semicolon
authorPeter Senna Tschudin <peter.senna@gmail.com>
Fri, 28 Sep 2012 08:37:22 +0000 (05:37 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sun, 7 Oct 2012 12:15:18 +0000 (09:15 -0300)
A simplified version of the semantic patch that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@r1@
statement S;
position p,p1;
@@
S@p1;@p
@script:python r2@
p << r1.p;
p1 << r1.p1;
@@
if p[0].line != p1[0].line_end:
        cocci.include_match(False)
@@
position r1.p;
@@
-;@p
// </smpl>

[mchehab@redhat.com: some hunks got bitroted; applied only the
 ones that succeeds]
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
[crope@iki.fi: For my drivers a8293, af9013, af9015, af9035]
Acked-by: Antti Palosaari <crope@iki.fi>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
29 files changed:
drivers/media/dvb-core/dvb_frontend.c
drivers/media/dvb-frontends/a8293.c
drivers/media/dvb-frontends/af9013.c
drivers/media/dvb-frontends/bcm3510.c
drivers/media/dvb-frontends/cx24110.c
drivers/media/dvb-frontends/drxd_hard.c
drivers/media/dvb-frontends/isl6405.c
drivers/media/dvb-frontends/isl6421.c
drivers/media/dvb-frontends/lnbp21.c
drivers/media/dvb-frontends/lnbp22.c
drivers/media/dvb-frontends/si21xx.c
drivers/media/dvb-frontends/sp887x.c
drivers/media/dvb-frontends/stv0299.c
drivers/media/dvb-frontends/stv0900_core.c
drivers/media/dvb-frontends/tda8083.c
drivers/media/i2c/cx25840/cx25840-core.c
drivers/media/pci/bt8xx/dst_ca.c
drivers/media/pci/cx23885/altera-ci.c
drivers/media/pci/cx23885/cimax2.c
drivers/media/pci/cx88/cx88-dvb.c
drivers/media/pci/cx88/cx88-mpeg.c
drivers/media/pci/cx88/cx88-tvaudio.c
drivers/media/pci/cx88/cx88-video.c
drivers/media/pci/saa7134/saa7134-video.c
drivers/media/platform/exynos-gsc/gsc-regs.c
drivers/media/radio/si470x/radio-si470x-i2c.c
drivers/media/radio/si470x/radio-si470x-usb.c
drivers/media/usb/dvb-usb-v2/af9015.c
drivers/media/usb/dvb-usb-v2/af9035.c

index 8f58f241c10dfa7047f92423cb917c67d908f4b1..41af996c413f8957e14c562fcd7fe07097015a20 100644 (file)
@@ -2309,7 +2309,7 @@ static int dvb_frontend_ioctl_legacy(struct file *file,
                fepriv->tune_mode_flags = (unsigned long) parg;
                err = 0;
                break;
-       };
+       }
 
        return err;
 }
index cff44a389b404c1c492fe7e25d7925a29b076d05..74fbb5d58bed73a28d2c1f7356f0b732b78b67a5 100644 (file)
@@ -90,7 +90,7 @@ static int a8293_set_voltage(struct dvb_frontend *fe,
        default:
                ret = -EINVAL;
                goto err;
-       };
+       }
 
        ret = a8293_wr(priv, &priv->reg[0], 1);
        if (ret)
index e9f04a36577b582849f5f5d9ae29f7466462dac0..a204f2828820412f94152928f9ba20e9126b25e6 100644 (file)
@@ -241,7 +241,7 @@ static int af9013_set_gpio(struct af9013_state *state, u8 gpio, u8 gpioval)
                                KBUILD_MODNAME, gpio);
                ret = -EINVAL;
                goto err;
-       };
+       }
 
        switch (gpio) {
        case 0:
@@ -253,7 +253,7 @@ static int af9013_set_gpio(struct af9013_state *state, u8 gpio, u8 gpioval)
        default:
                pos = 4;
                break;
-       };
+       }
 
        ret = af9013_wr_reg_bits(state, addr, pos, 4, gpioval);
        if (ret)
@@ -726,7 +726,7 @@ static int af9013_set_frontend(struct dvb_frontend *fe)
        default:
                dev_dbg(&state->i2c->dev, "%s: invalid hierarchy\n", __func__);
                auto_mode = 1;
-       };
+       }
 
        switch (c->modulation) {
        case QAM_AUTO:
index 033cd7ad3ca2cb9d76f7bace048fdb1f72974bdd..1b77909c0c7116c3cff03b6788912a29c2f240f3 100644 (file)
@@ -527,7 +527,7 @@ static int bcm3510_set_frontend(struct dvb_frontend *fe)
                        cmd.ACQUIRE1.IF_FREQ = 0x0;
                default:
                        return -EINVAL;
-       };
+       }
        cmd.ACQUIRE0.OFFSET = 0;
        cmd.ACQUIRE0.NTSCSWEEP = 1;
        cmd.ACQUIRE0.FA = 1;
index 3180f5b2a6a60d8bf3930876e788b3217efa8814..0cd6927e654c110b804def49677b71f8b26cc1a9 100644 (file)
@@ -218,7 +218,7 @@ static int cx24110_set_fec (struct cx24110_state* state, fe_code_rate_t fec)
           } else
                   return -EOPNOTSUPP;
 /* fixme (low): which is the correct return code? */
-       };
+       }
        return 0;
 }
 
@@ -275,7 +275,7 @@ static int cx24110_set_symbolrate (struct cx24110_state* state, u32 srate)
                cx24110_writereg(state,0x07,tmp|0x3);
                cx24110_writereg(state,0x06,0x78);
                fclk=90999000UL;
-       };
+       }
        dprintk("cx24110 debug: fclk %d Hz\n",fclk);
        /* we need to divide two integers with approx. 27 bits in 32 bit
           arithmetic giving a 25 bit result */
@@ -362,7 +362,7 @@ static int cx24110_initfe(struct dvb_frontend* fe)
 
        for(i = 0; i < ARRAY_SIZE(cx24110_regdata); i++) {
                cx24110_writereg(state, cx24110_regdata[i].reg, cx24110_regdata[i].data);
-       };
+       }
 
        return 0;
 }
index f380eb43e9d5a66137fcff49615c1342040d158a..6d9853750d2b6dd96080dc68fb0dc1496626ddf4 100644 (file)
@@ -991,7 +991,7 @@ static int HI_Command(struct drxd_state *state, u16 cmd, u16 * pResult)
                if (nrRetries > DRXD_MAX_RETRIES) {
                        status = -1;
                        break;
-               };
+               }
                status = Read16(state, HI_RA_RAM_SRV_CMD__A, &waitCmd, 0);
        } while (waitCmd != 0);
 
index 33d33f4d8867a409d15e32bbc4d45991efdd14c9..0c642a5bf8235462da1a26d3b407a58432dc6138 100644 (file)
@@ -77,7 +77,7 @@ static int isl6405_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage
                        break;
                default:
                        return -EINVAL;
-               };
+               }
        }
        isl6405->config |= isl6405->override_or;
        isl6405->config &= isl6405->override_and;
index 684c8ec166cbc7bfbdaed883a18c664ec59dd428..0cb3f0f74c9c9040b48f586212fae0680ad02145 100644 (file)
@@ -63,7 +63,7 @@ static int isl6421_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage
                break;
        default:
                return -EINVAL;
-       };
+       }
 
        isl6421->config |= isl6421->override_or;
        isl6421->config &= isl6421->override_and;
index 13437259eeac211d69ef8c0cd8f4c96ce9103998..f3ba7b5faa2ed9fdfcda57391dfdaac73a189287 100644 (file)
@@ -65,7 +65,7 @@ static int lnbp21_set_voltage(struct dvb_frontend *fe,
                break;
        default:
                return -EINVAL;
-       };
+       }
 
        lnbp21->config |= lnbp21->override_or;
        lnbp21->config &= lnbp21->override_and;
@@ -108,7 +108,7 @@ static int lnbp21_set_tone(struct dvb_frontend *fe,
                break;
        default:
                return -EINVAL;
-       };
+       }
 
        lnbp21->config |= lnbp21->override_or;
        lnbp21->config &= lnbp21->override_and;
index 84ad0390a4a12db9a6c201f2749bed749b97011b..c463da7f6dcceb53b77a7cd5f3360238d8ebde59 100644 (file)
@@ -73,7 +73,7 @@ static int lnbp22_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
                break;
        default:
                return -EINVAL;
-       };
+       }
 
        dprintk(1, "%s: 0x%02x)\n", __func__, lnbp22->config[3]);
        return (i2c_transfer(lnbp22->i2c, &msg, 1) == 1) ? 0 : -EIO;
index a68a64800df77ff7123ae6d18434820d6c95a2b4..73b47cc6a13b3b8c2f6ca85d0ee1d9eee71120c1 100644 (file)
@@ -343,7 +343,7 @@ static int si21xx_wait_diseqc_idle(struct si21xx_state *state, int timeout)
                        return -ETIMEDOUT;
                }
                msleep(10);
-       };
+       }
 
        return 0;
 }
@@ -472,7 +472,7 @@ static int si21xx_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t volt)
                break;
        default:
                return -EINVAL;
-       };
+       }
 }
 
 static int si21xx_init(struct dvb_frontend *fe)
index f4096ccb226e4b76146e001a4d78db1f52d7d756..1bb81b5ae6e0c69516ed4b7a65c9bef1280459ab 100644 (file)
@@ -229,7 +229,7 @@ static int configure_reg0xc05(struct dtv_frontend_properties *p, u16 *reg0xc05)
                break;
        default:
                return -EINVAL;
-       };
+       }
 
        switch (p->hierarchy) {
        case HIERARCHY_NONE:
@@ -248,7 +248,7 @@ static int configure_reg0xc05(struct dtv_frontend_properties *p, u16 *reg0xc05)
                break;
        default:
                return -EINVAL;
-       };
+       }
 
        switch (p->code_rate_HP) {
        case FEC_1_2:
@@ -270,7 +270,7 @@ static int configure_reg0xc05(struct dtv_frontend_properties *p, u16 *reg0xc05)
                break;
        default:
                return -EINVAL;
-       };
+       }
 
        if (known_parameters)
                *reg0xc05 |= (2 << 1);  /* use specified parameters */
index 057b5f8effc0dec16c24f3753329bf8ed354e8bb..92a6075cd82f343f0f91fcd0b6cb13b4f07972fd 100644 (file)
@@ -199,7 +199,7 @@ static int stv0299_wait_diseqc_fifo (struct stv0299_state* state, int timeout)
                        return -ETIMEDOUT;
                }
                msleep(10);
-       };
+       }
 
        return 0;
 }
@@ -216,7 +216,7 @@ static int stv0299_wait_diseqc_idle (struct stv0299_state* state, int timeout)
                        return -ETIMEDOUT;
                }
                msleep(10);
-       };
+       }
 
        return 0;
 }
@@ -387,7 +387,7 @@ static int stv0299_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltag
                break;
        default:
                return -EINVAL;
-       };
+       }
 
        if (state->config->op0_off)
                reg0x0c &= ~0x10;
index 7f1badaf0d03044b2c2e4779ed746e2d03bbae0c..262dfa503c2a3e2db6cca50a5028d57ca46736df 100644 (file)
@@ -1552,8 +1552,8 @@ static int stv0900_status(struct stv0900_internal *intp,
                bitrate = (stv0900_get_mclk_freq(intp, intp->quartz)/1000000)
                        * (tsbitrate1_val << 8 | tsbitrate0_val);
                bitrate /= 16384;
-               dprintk("TS bitrate = %d Mbit/sec \n", bitrate);
-       };
+               dprintk("TS bitrate = %d Mbit/sec\n", bitrate);
+       }
 
        return locked;
 }
index 15912c96926adde19a7fbb7c50663efb146ccdf3..9d08350fe4b035cca635d3368d75591897e4e035 100644 (file)
@@ -175,7 +175,7 @@ static void tda8083_wait_diseqc_fifo (struct tda8083_state* state, int timeout)
               !(tda8083_readreg(state, 0x02) & 0x80))
        {
                msleep(50);
-       };
+       }
 }
 
 static int tda8083_set_tone (struct tda8083_state* state, fe_sec_tone_mode_t tone)
@@ -215,7 +215,7 @@ static int tda8083_send_diseqc_burst (struct tda8083_state* state, fe_sec_mini_c
                break;
        default:
                return -EINVAL;
-       };
+       }
 
        tda8083_wait_diseqc_fifo (state, 100);
 
index d8eac3e30a7ea99217e5b149de79752e73f594cf..2cee69e34184304b7824752aadfd14d4b1d205b8 100644 (file)
@@ -599,7 +599,7 @@ static void cx23885_initialize(struct i2c_client *client)
                cx25840_write4(client, 0x114, 0x01bf0c9e);
                cx25840_write4(client, 0x110, 0x000a030c);
                break;
-       };
+       }
 
        /* ADC2 input select */
        cx25840_write(client, 0x102, 0x10);
index ee3884fbc9ce3e95120e2e421724833629c6cb11..7d96fab7d2463bd8ba6254581547a258a61329bc 100644 (file)
@@ -646,7 +646,7 @@ static long dst_ca_ioctl(struct file *file, unsigned int cmd, unsigned long ioct
                dprintk(verbose, DST_CA_INFO, 1, " -->CA_SET_PID Success !");
        default:
                result = -EOPNOTSUPP;
-       };
+       }
  free_mem_and_exit:
        kfree (p_ca_message);
        kfree (p_ca_slot_info);
index aee7f0dacff11a8a61764c274559bf5454909fad..495781ee47113e88e792199d2ce4181e8bf1b953 100644 (file)
@@ -416,7 +416,7 @@ static void netup_read_ci_status(struct work_struct *work)
                                DVB_CA_EN50221_POLL_CAM_READY : 0);
                ci_dbg_print("%s: setting CI[1] status = 0x%x\n",
                                __func__, inter->state[1]->status);
-       };
+       }
 
        if (inter->state[0] != NULL) {
                inter->state[0]->status =
@@ -425,7 +425,7 @@ static void netup_read_ci_status(struct work_struct *work)
                                DVB_CA_EN50221_POLL_CAM_READY : 0);
                ci_dbg_print("%s: setting CI[0] status = 0x%x\n",
                                __func__, inter->state[0]->status);
-       };
+       }
 }
 
 /* CI irq handler */
index c9f15d6dec40ffa0cc4844313b6a5f7ce56d6946..6617774a326a38f98bd611816003a4907e596aff 100644 (file)
@@ -193,7 +193,7 @@ int netup_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot,
                                0, &store, 1);
                if (ret != 0)
                        return ret;
-       };
+       }
        state->current_ci_flag = flag;
 
        mutex_lock(&dev->gpio_lock);
index d803bba09525206e9710d401829251d829e04ede..666f83b2f3c01da335a825d7d7a567211a58b90d 100644 (file)
@@ -896,7 +896,7 @@ static int samsung_smt_7020_set_voltage(struct dvb_frontend *fe,
                break;
        default:
                return -EINVAL;
-       };
+       }
 
        return (i2c_transfer(&dev->core->i2c_adap, &msg, 1) == 1) ? 0 : -EIO;
 }
index cd5386ee210cf02f79fbfb4abaeb86895e88ab99..95c0c47718fbe939a85fe54471f48503c8189359 100644 (file)
@@ -450,7 +450,7 @@ static irqreturn_t cx8802_irq(int irq, void *dev_id)
                        cx88_core_irq(core,status);
                if (status & PCI_INT_TSINT)
                        cx8802_mpeg_irq(dev);
-       };
+       }
        if (MAX_IRQ_LOOP == loop) {
                dprintk( 0, "clearing mask\n" );
                printk(KERN_WARNING "%s/0: irq loop -- clearing mask\n",
index 770ec05b5e9b7da789db5f1ae3a2823066be1f23..424fd97495dcc8144852ee15417c991e30c10a89 100644 (file)
@@ -373,7 +373,7 @@ static void set_audio_standard_NICAM(struct cx88_core *core, u32 mode)
                set_audio_registers(core, nicam_bgdki_common);
                set_audio_registers(core, nicam_default);
                break;
-       };
+       }
 
        mode |= EN_DMTRX_LR | EN_DMTRX_BYPASS;
        set_audio_finish(core, mode);
@@ -639,7 +639,7 @@ static void set_audio_standard_A2(struct cx88_core *core, u32 mode)
                dprintk("%s Warning: wrong value\n", __func__);
                return;
                break;
-       };
+       }
 
        mode |= EN_FMRADIO_EN_RDS | EN_DMTRX_SUMDIFF;
        set_audio_finish(core, mode);
index a146d50d77952fda04871e9a51c3136818d45f22..05171457bf282e42c47dfe00c4410c33cde74518 100644 (file)
@@ -1535,7 +1535,7 @@ static irqreturn_t cx8800_irq(int irq, void *dev_id)
                        cx88_core_irq(core,status);
                if (status & PCI_INT_VIDINT)
                        cx8800_vid_irq(dev);
-       };
+       }
        if (10 == loop) {
                printk(KERN_WARNING "%s/0: irq loop -- clearing mask\n",
                       core->name);
index 22f8758d047f247084814db5e70a75a3b6edd6a6..4a77124ee70e2cbda80a414413a85346b7a832c3 100644 (file)
@@ -1204,7 +1204,7 @@ int saa7134_s_ctrl_internal(struct saa7134_dev *dev,  struct saa7134_fh *fh, str
                break;
        default:
                /* nothing */;
-       };
+       }
        switch (c->id) {
        case V4L2_CID_BRIGHTNESS:
                dev->ctl_bright = c->value;
index 0d8625f03a32f9099920586a47e5f82ae0384332..0146b354dc22a785961dfe0e1dd5df6214311c53 100644 (file)
@@ -212,7 +212,7 @@ void gsc_hw_set_in_image_format(struct gsc_ctx *ctx)
                else
                        cfg |= GSC_IN_YUV422_3P;
                break;
-       };
+       }
 
        writel(cfg, dev->regs + GSC_IN_CON);
 }
@@ -332,7 +332,7 @@ void gsc_hw_set_out_image_format(struct gsc_ctx *ctx)
        case 3:
                cfg |= GSC_OUT_YUV420_3P;
                break;
-       };
+       }
 
 end_set:
        writel(cfg, dev->regs + GSC_OUT_CON);
index e5024cfd27a713ffa77403471275b62e6ba264e3..4ef55ec8045e432fcc9576e130e902bc92446bed 100644 (file)
@@ -308,7 +308,7 @@ static irqreturn_t si470x_i2c_interrupt(int irq, void *dev_id)
                                        READCHAN_BLERD) >> 10;
                        rds = radio->registers[RDSD];
                        break;
-               };
+               }
 
                /* Fill the V4L2 RDS buffer */
                put_unaligned_le16(rds, &tmpbuf);
index be076f7181e728b1ab177ca340290a2c1ae29dc4..62f3edec39bc262022f5b6310b19a9efb3502497 100644 (file)
@@ -446,7 +446,7 @@ static void si470x_int_in_callback(struct urb *urb)
                                                READCHAN_BLERD) >> 10;
                                rds = radio->registers[RDSD];
                                break;
-                       };
+                       }
 
                        /* Fill the V4L2 RDS buffer */
                        put_unaligned_le16(rds, &tmpbuf);
index 824f1911ee21bcdcf3282ef33ffece13a1f3b654..3d7526e28d426f8ca119f4d3b1326abd469b7622 100644 (file)
@@ -500,7 +500,7 @@ static int af9015_read_config(struct dvb_usb_device *d)
                case 3:
                        state->af9013_config[i].clock = 25000000;
                        break;
-               };
+               }
                dev_dbg(&d->udev->dev, "%s: [%d] xtal=%d set clock=%d\n",
                                __func__, i, val,
                                state->af9013_config[i].clock);
@@ -568,7 +568,7 @@ static int af9015_read_config(struct dvb_usb_device *d)
                                        "supported, please report!\n",
                                        KBUILD_MODNAME, val);
                        return -ENODEV;
-               };
+               }
 
                state->af9013_config[i].tuner = val;
                dev_dbg(&d->udev->dev, "%s: [%d] tuner id=%d\n",
index aabd3fc03ea7e1594c00aab276364b857e9459ff..ea27eaff4e34fdc77d9739d82b4620698a58fca7 100644 (file)
@@ -520,7 +520,7 @@ static int af9035_read_config(struct dvb_usb_device *d)
                        dev_warn(&d->udev->dev, "%s: tuner id=%02x not " \
                                        "supported, please report!",
                                        KBUILD_MODNAME, tmp);
-               };
+               }
 
                /* tuner IF frequency */
                ret = af9035_rd_reg(d, EEPROM_1_IFFREQ_L + eeprom_shift, &tmp);