aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/cx88
diff options
context:
space:
mode:
authorPeter Senna Tschudin <peter.senna@gmail.com>2012-09-28 04:37:22 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-10-07 08:15:18 -0400
commitc2c1b4156a447f113ef4d167decce29399c2667c (patch)
tree910e86eb8b64ada851d1c07d99f7885886be1dc2 /drivers/media/pci/cx88
parent54fd321e131587b008c47289e4066ac65935cfb5 (diff)
[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>
Diffstat (limited to 'drivers/media/pci/cx88')
-rw-r--r--drivers/media/pci/cx88/cx88-dvb.c2
-rw-r--r--drivers/media/pci/cx88/cx88-mpeg.c2
-rw-r--r--drivers/media/pci/cx88/cx88-tvaudio.c4
-rw-r--r--drivers/media/pci/cx88/cx88-video.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/pci/cx88/cx88-dvb.c b/drivers/media/pci/cx88/cx88-dvb.c
index d803bba09525..666f83b2f3c0 100644
--- a/drivers/media/pci/cx88/cx88-dvb.c
+++ b/drivers/media/pci/cx88/cx88-dvb.c
@@ -896,7 +896,7 @@ static int samsung_smt_7020_set_voltage(struct dvb_frontend *fe,
896 break; 896 break;
897 default: 897 default:
898 return -EINVAL; 898 return -EINVAL;
899 }; 899 }
900 900
901 return (i2c_transfer(&dev->core->i2c_adap, &msg, 1) == 1) ? 0 : -EIO; 901 return (i2c_transfer(&dev->core->i2c_adap, &msg, 1) == 1) ? 0 : -EIO;
902} 902}
diff --git a/drivers/media/pci/cx88/cx88-mpeg.c b/drivers/media/pci/cx88/cx88-mpeg.c
index cd5386ee210c..95c0c47718fb 100644
--- a/drivers/media/pci/cx88/cx88-mpeg.c
+++ b/drivers/media/pci/cx88/cx88-mpeg.c
@@ -450,7 +450,7 @@ static irqreturn_t cx8802_irq(int irq, void *dev_id)
450 cx88_core_irq(core,status); 450 cx88_core_irq(core,status);
451 if (status & PCI_INT_TSINT) 451 if (status & PCI_INT_TSINT)
452 cx8802_mpeg_irq(dev); 452 cx8802_mpeg_irq(dev);
453 }; 453 }
454 if (MAX_IRQ_LOOP == loop) { 454 if (MAX_IRQ_LOOP == loop) {
455 dprintk( 0, "clearing mask\n" ); 455 dprintk( 0, "clearing mask\n" );
456 printk(KERN_WARNING "%s/0: irq loop -- clearing mask\n", 456 printk(KERN_WARNING "%s/0: irq loop -- clearing mask\n",
diff --git a/drivers/media/pci/cx88/cx88-tvaudio.c b/drivers/media/pci/cx88/cx88-tvaudio.c
index 770ec05b5e9b..424fd97495dc 100644
--- a/drivers/media/pci/cx88/cx88-tvaudio.c
+++ b/drivers/media/pci/cx88/cx88-tvaudio.c
@@ -373,7 +373,7 @@ static void set_audio_standard_NICAM(struct cx88_core *core, u32 mode)
373 set_audio_registers(core, nicam_bgdki_common); 373 set_audio_registers(core, nicam_bgdki_common);
374 set_audio_registers(core, nicam_default); 374 set_audio_registers(core, nicam_default);
375 break; 375 break;
376 }; 376 }
377 377
378 mode |= EN_DMTRX_LR | EN_DMTRX_BYPASS; 378 mode |= EN_DMTRX_LR | EN_DMTRX_BYPASS;
379 set_audio_finish(core, mode); 379 set_audio_finish(core, mode);
@@ -639,7 +639,7 @@ static void set_audio_standard_A2(struct cx88_core *core, u32 mode)
639 dprintk("%s Warning: wrong value\n", __func__); 639 dprintk("%s Warning: wrong value\n", __func__);
640 return; 640 return;
641 break; 641 break;
642 }; 642 }
643 643
644 mode |= EN_FMRADIO_EN_RDS | EN_DMTRX_SUMDIFF; 644 mode |= EN_FMRADIO_EN_RDS | EN_DMTRX_SUMDIFF;
645 set_audio_finish(core, mode); 645 set_audio_finish(core, mode);
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
index a146d50d7795..05171457bf28 100644
--- a/drivers/media/pci/cx88/cx88-video.c
+++ b/drivers/media/pci/cx88/cx88-video.c
@@ -1535,7 +1535,7 @@ static irqreturn_t cx8800_irq(int irq, void *dev_id)
1535 cx88_core_irq(core,status); 1535 cx88_core_irq(core,status);
1536 if (status & PCI_INT_VIDINT) 1536 if (status & PCI_INT_VIDINT)
1537 cx8800_vid_irq(dev); 1537 cx8800_vid_irq(dev);
1538 }; 1538 }
1539 if (10 == loop) { 1539 if (10 == loop) {
1540 printk(KERN_WARNING "%s/0: irq loop -- clearing mask\n", 1540 printk(KERN_WARNING "%s/0: irq loop -- clearing mask\n",
1541 core->name); 1541 core->name);