Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[media] drivers/media: Remove unnecessary semicolon

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>

authored by

Peter Senna Tschudin and committed by
Mauro Carvalho Chehab
c2c1b415 54fd321e

+45 -45
+1 -1
drivers/media/dvb-core/dvb_frontend.c
··· 2309 2309 fepriv->tune_mode_flags = (unsigned long) parg; 2310 2310 err = 0; 2311 2311 break; 2312 - }; 2312 + } 2313 2313 2314 2314 return err; 2315 2315 }
+1 -1
drivers/media/dvb-frontends/a8293.c
··· 90 90 default: 91 91 ret = -EINVAL; 92 92 goto err; 93 - }; 93 + } 94 94 95 95 ret = a8293_wr(priv, &priv->reg[0], 1); 96 96 if (ret)
+3 -3
drivers/media/dvb-frontends/af9013.c
··· 241 241 KBUILD_MODNAME, gpio); 242 242 ret = -EINVAL; 243 243 goto err; 244 - }; 244 + } 245 245 246 246 switch (gpio) { 247 247 case 0: ··· 253 253 default: 254 254 pos = 4; 255 255 break; 256 - }; 256 + } 257 257 258 258 ret = af9013_wr_reg_bits(state, addr, pos, 4, gpioval); 259 259 if (ret) ··· 726 726 default: 727 727 dev_dbg(&state->i2c->dev, "%s: invalid hierarchy\n", __func__); 728 728 auto_mode = 1; 729 - }; 729 + } 730 730 731 731 switch (c->modulation) { 732 732 case QAM_AUTO:
+1 -1
drivers/media/dvb-frontends/bcm3510.c
··· 527 527 cmd.ACQUIRE1.IF_FREQ = 0x0; 528 528 default: 529 529 return -EINVAL; 530 - }; 530 + } 531 531 cmd.ACQUIRE0.OFFSET = 0; 532 532 cmd.ACQUIRE0.NTSCSWEEP = 1; 533 533 cmd.ACQUIRE0.FA = 1;
+3 -3
drivers/media/dvb-frontends/cx24110.c
··· 218 218 } else 219 219 return -EOPNOTSUPP; 220 220 /* fixme (low): which is the correct return code? */ 221 - }; 221 + } 222 222 return 0; 223 223 } 224 224 ··· 275 275 cx24110_writereg(state,0x07,tmp|0x3); 276 276 cx24110_writereg(state,0x06,0x78); 277 277 fclk=90999000UL; 278 - }; 278 + } 279 279 dprintk("cx24110 debug: fclk %d Hz\n",fclk); 280 280 /* we need to divide two integers with approx. 27 bits in 32 bit 281 281 arithmetic giving a 25 bit result */ ··· 362 362 363 363 for(i = 0; i < ARRAY_SIZE(cx24110_regdata); i++) { 364 364 cx24110_writereg(state, cx24110_regdata[i].reg, cx24110_regdata[i].data); 365 - }; 365 + } 366 366 367 367 return 0; 368 368 }
+1 -1
drivers/media/dvb-frontends/drxd_hard.c
··· 991 991 if (nrRetries > DRXD_MAX_RETRIES) { 992 992 status = -1; 993 993 break; 994 - }; 994 + } 995 995 status = Read16(state, HI_RA_RAM_SRV_CMD__A, &waitCmd, 0); 996 996 } while (waitCmd != 0); 997 997
+1 -1
drivers/media/dvb-frontends/isl6405.c
··· 77 77 break; 78 78 default: 79 79 return -EINVAL; 80 - }; 80 + } 81 81 } 82 82 isl6405->config |= isl6405->override_or; 83 83 isl6405->config &= isl6405->override_and;
+1 -1
drivers/media/dvb-frontends/isl6421.c
··· 63 63 break; 64 64 default: 65 65 return -EINVAL; 66 - }; 66 + } 67 67 68 68 isl6421->config |= isl6421->override_or; 69 69 isl6421->config &= isl6421->override_and;
+2 -2
drivers/media/dvb-frontends/lnbp21.c
··· 65 65 break; 66 66 default: 67 67 return -EINVAL; 68 - }; 68 + } 69 69 70 70 lnbp21->config |= lnbp21->override_or; 71 71 lnbp21->config &= lnbp21->override_and; ··· 108 108 break; 109 109 default: 110 110 return -EINVAL; 111 - }; 111 + } 112 112 113 113 lnbp21->config |= lnbp21->override_or; 114 114 lnbp21->config &= lnbp21->override_and;
+1 -1
drivers/media/dvb-frontends/lnbp22.c
··· 73 73 break; 74 74 default: 75 75 return -EINVAL; 76 - }; 76 + } 77 77 78 78 dprintk(1, "%s: 0x%02x)\n", __func__, lnbp22->config[3]); 79 79 return (i2c_transfer(lnbp22->i2c, &msg, 1) == 1) ? 0 : -EIO;
+2 -2
drivers/media/dvb-frontends/si21xx.c
··· 343 343 return -ETIMEDOUT; 344 344 } 345 345 msleep(10); 346 - }; 346 + } 347 347 348 348 return 0; 349 349 } ··· 472 472 break; 473 473 default: 474 474 return -EINVAL; 475 - }; 475 + } 476 476 } 477 477 478 478 static int si21xx_init(struct dvb_frontend *fe)
+3 -3
drivers/media/dvb-frontends/sp887x.c
··· 229 229 break; 230 230 default: 231 231 return -EINVAL; 232 - }; 232 + } 233 233 234 234 switch (p->hierarchy) { 235 235 case HIERARCHY_NONE: ··· 248 248 break; 249 249 default: 250 250 return -EINVAL; 251 - }; 251 + } 252 252 253 253 switch (p->code_rate_HP) { 254 254 case FEC_1_2: ··· 270 270 break; 271 271 default: 272 272 return -EINVAL; 273 - }; 273 + } 274 274 275 275 if (known_parameters) 276 276 *reg0xc05 |= (2 << 1); /* use specified parameters */
+3 -3
drivers/media/dvb-frontends/stv0299.c
··· 199 199 return -ETIMEDOUT; 200 200 } 201 201 msleep(10); 202 - }; 202 + } 203 203 204 204 return 0; 205 205 } ··· 216 216 return -ETIMEDOUT; 217 217 } 218 218 msleep(10); 219 - }; 219 + } 220 220 221 221 return 0; 222 222 } ··· 387 387 break; 388 388 default: 389 389 return -EINVAL; 390 - }; 390 + } 391 391 392 392 if (state->config->op0_off) 393 393 reg0x0c &= ~0x10;
+2 -2
drivers/media/dvb-frontends/stv0900_core.c
··· 1552 1552 bitrate = (stv0900_get_mclk_freq(intp, intp->quartz)/1000000) 1553 1553 * (tsbitrate1_val << 8 | tsbitrate0_val); 1554 1554 bitrate /= 16384; 1555 - dprintk("TS bitrate = %d Mbit/sec \n", bitrate); 1556 - }; 1555 + dprintk("TS bitrate = %d Mbit/sec\n", bitrate); 1556 + } 1557 1557 1558 1558 return locked; 1559 1559 }
+2 -2
drivers/media/dvb-frontends/tda8083.c
··· 175 175 !(tda8083_readreg(state, 0x02) & 0x80)) 176 176 { 177 177 msleep(50); 178 - }; 178 + } 179 179 } 180 180 181 181 static int tda8083_set_tone (struct tda8083_state* state, fe_sec_tone_mode_t tone) ··· 215 215 break; 216 216 default: 217 217 return -EINVAL; 218 - }; 218 + } 219 219 220 220 tda8083_wait_diseqc_fifo (state, 100); 221 221
+1 -1
drivers/media/i2c/cx25840/cx25840-core.c
··· 599 599 cx25840_write4(client, 0x114, 0x01bf0c9e); 600 600 cx25840_write4(client, 0x110, 0x000a030c); 601 601 break; 602 - }; 602 + } 603 603 604 604 /* ADC2 input select */ 605 605 cx25840_write(client, 0x102, 0x10);
+1 -1
drivers/media/pci/bt8xx/dst_ca.c
··· 646 646 dprintk(verbose, DST_CA_INFO, 1, " -->CA_SET_PID Success !"); 647 647 default: 648 648 result = -EOPNOTSUPP; 649 - }; 649 + } 650 650 free_mem_and_exit: 651 651 kfree (p_ca_message); 652 652 kfree (p_ca_slot_info);
+2 -2
drivers/media/pci/cx23885/altera-ci.c
··· 416 416 DVB_CA_EN50221_POLL_CAM_READY : 0); 417 417 ci_dbg_print("%s: setting CI[1] status = 0x%x\n", 418 418 __func__, inter->state[1]->status); 419 - }; 419 + } 420 420 421 421 if (inter->state[0] != NULL) { 422 422 inter->state[0]->status = ··· 425 425 DVB_CA_EN50221_POLL_CAM_READY : 0); 426 426 ci_dbg_print("%s: setting CI[0] status = 0x%x\n", 427 427 __func__, inter->state[0]->status); 428 - }; 428 + } 429 429 } 430 430 431 431 /* CI irq handler */
+1 -1
drivers/media/pci/cx23885/cimax2.c
··· 193 193 0, &store, 1); 194 194 if (ret != 0) 195 195 return ret; 196 - }; 196 + } 197 197 state->current_ci_flag = flag; 198 198 199 199 mutex_lock(&dev->gpio_lock);
+1 -1
drivers/media/pci/cx88/cx88-dvb.c
··· 896 896 break; 897 897 default: 898 898 return -EINVAL; 899 - }; 899 + } 900 900 901 901 return (i2c_transfer(&dev->core->i2c_adap, &msg, 1) == 1) ? 0 : -EIO; 902 902 }
+1 -1
drivers/media/pci/cx88/cx88-mpeg.c
··· 450 450 cx88_core_irq(core,status); 451 451 if (status & PCI_INT_TSINT) 452 452 cx8802_mpeg_irq(dev); 453 - }; 453 + } 454 454 if (MAX_IRQ_LOOP == loop) { 455 455 dprintk( 0, "clearing mask\n" ); 456 456 printk(KERN_WARNING "%s/0: irq loop -- clearing mask\n",
+2 -2
drivers/media/pci/cx88/cx88-tvaudio.c
··· 373 373 set_audio_registers(core, nicam_bgdki_common); 374 374 set_audio_registers(core, nicam_default); 375 375 break; 376 - }; 376 + } 377 377 378 378 mode |= EN_DMTRX_LR | EN_DMTRX_BYPASS; 379 379 set_audio_finish(core, mode); ··· 639 639 dprintk("%s Warning: wrong value\n", __func__); 640 640 return; 641 641 break; 642 - }; 642 + } 643 643 644 644 mode |= EN_FMRADIO_EN_RDS | EN_DMTRX_SUMDIFF; 645 645 set_audio_finish(core, mode);
+1 -1
drivers/media/pci/cx88/cx88-video.c
··· 1535 1535 cx88_core_irq(core,status); 1536 1536 if (status & PCI_INT_VIDINT) 1537 1537 cx8800_vid_irq(dev); 1538 - }; 1538 + } 1539 1539 if (10 == loop) { 1540 1540 printk(KERN_WARNING "%s/0: irq loop -- clearing mask\n", 1541 1541 core->name);
+1 -1
drivers/media/pci/saa7134/saa7134-video.c
··· 1204 1204 break; 1205 1205 default: 1206 1206 /* nothing */; 1207 - }; 1207 + } 1208 1208 switch (c->id) { 1209 1209 case V4L2_CID_BRIGHTNESS: 1210 1210 dev->ctl_bright = c->value;
+2 -2
drivers/media/platform/exynos-gsc/gsc-regs.c
··· 212 212 else 213 213 cfg |= GSC_IN_YUV422_3P; 214 214 break; 215 - }; 215 + } 216 216 217 217 writel(cfg, dev->regs + GSC_IN_CON); 218 218 } ··· 332 332 case 3: 333 333 cfg |= GSC_OUT_YUV420_3P; 334 334 break; 335 - }; 335 + } 336 336 337 337 end_set: 338 338 writel(cfg, dev->regs + GSC_OUT_CON);
+1 -1
drivers/media/radio/si470x/radio-si470x-i2c.c
··· 308 308 READCHAN_BLERD) >> 10; 309 309 rds = radio->registers[RDSD]; 310 310 break; 311 - }; 311 + } 312 312 313 313 /* Fill the V4L2 RDS buffer */ 314 314 put_unaligned_le16(rds, &tmpbuf);
+1 -1
drivers/media/radio/si470x/radio-si470x-usb.c
··· 446 446 READCHAN_BLERD) >> 10; 447 447 rds = radio->registers[RDSD]; 448 448 break; 449 - }; 449 + } 450 450 451 451 /* Fill the V4L2 RDS buffer */ 452 452 put_unaligned_le16(rds, &tmpbuf);
+2 -2
drivers/media/usb/dvb-usb-v2/af9015.c
··· 500 500 case 3: 501 501 state->af9013_config[i].clock = 25000000; 502 502 break; 503 - }; 503 + } 504 504 dev_dbg(&d->udev->dev, "%s: [%d] xtal=%d set clock=%d\n", 505 505 __func__, i, val, 506 506 state->af9013_config[i].clock); ··· 568 568 "supported, please report!\n", 569 569 KBUILD_MODNAME, val); 570 570 return -ENODEV; 571 - }; 571 + } 572 572 573 573 state->af9013_config[i].tuner = val; 574 574 dev_dbg(&d->udev->dev, "%s: [%d] tuner id=%d\n",
+1 -1
drivers/media/usb/dvb-usb-v2/af9035.c
··· 520 520 dev_warn(&d->udev->dev, "%s: tuner id=%02x not " \ 521 521 "supported, please report!", 522 522 KBUILD_MODNAME, tmp); 523 - }; 523 + } 524 524 525 525 /* tuner IF frequency */ 526 526 ret = af9035_rd_reg(d, EEPROM_1_IFFREQ_L + eeprom_shift, &tmp);