aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2009-07-02 14:57:09 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-12 11:17:23 -0400
commit1ebcad77078a10571eb194b53cb65006d3daf3c4 (patch)
treea4e400c7ab789a4cc302dc866d3fc3123f438b28
parent32a60955fb6312f19ea4856e66b894bfb6c4e949 (diff)
V4L/DVB (12197): Remove unnecessary semicolons
Cc: Patrick Boettcher <patrick.boettcher@desy.de> Cc: Steven Toth <stoth@linuxtv.org> Cc: Igor M. Liplianin <liplianin@netup.ru> Cc: Srinivasa Deevi <srinivasa.deevi@conexant.com> Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/dvb/b2c2/flexcop-fe-tuner.c2
-rw-r--r--drivers/media/dvb/dvb-usb/dib0700_devices.c2
-rw-r--r--drivers/media/dvb/frontends/cx24123.c2
-rw-r--r--drivers/media/dvb/frontends/dib0070.c2
-rw-r--r--drivers/media/dvb/frontends/stv0900_sw.c2
-rw-r--r--drivers/media/video/cx231xx/cx231xx-video.c4
-rw-r--r--drivers/media/video/cx23885/cx23885.h2
7 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
index 9a6307a347b2..d5e414944a0e 100644
--- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -421,7 +421,7 @@ static int skystar2_rev28_attach(struct flexcop_device *fc,
421 if (!fc->fe) 421 if (!fc->fe)
422 return 0; 422 return 0;
423 423
424 i2c_tuner = cx24123_get_tuner_i2c_adapter(fc->fe);; 424 i2c_tuner = cx24123_get_tuner_i2c_adapter(fc->fe);
425 if (!i2c_tuner) 425 if (!i2c_tuner)
426 return 0; 426 return 0;
427 427
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index 818b2ab584bf..49fd78118a64 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -310,7 +310,7 @@ static int stk7700d_tuner_attach(struct dvb_usb_adapter *adap)
310 struct i2c_adapter *tun_i2c; 310 struct i2c_adapter *tun_i2c;
311 tun_i2c = dib7000p_get_i2c_master(adap->fe, DIBX000_I2C_INTERFACE_TUNER, 1); 311 tun_i2c = dib7000p_get_i2c_master(adap->fe, DIBX000_I2C_INTERFACE_TUNER, 1);
312 return dvb_attach(mt2266_attach, adap->fe, tun_i2c, 312 return dvb_attach(mt2266_attach, adap->fe, tun_i2c,
313 &stk7700d_mt2266_config[adap->id]) == NULL ? -ENODEV : 0;; 313 &stk7700d_mt2266_config[adap->id]) == NULL ? -ENODEV : 0;
314} 314}
315 315
316/* STK7700-PH: Digital/Analog Hybrid Tuner, e.h. Cinergy HT USB HE */ 316/* STK7700-PH: Digital/Analog Hybrid Tuner, e.h. Cinergy HT USB HE */
diff --git a/drivers/media/dvb/frontends/cx24123.c b/drivers/media/dvb/frontends/cx24123.c
index 0592f043ea64..d8f921b6fafd 100644
--- a/drivers/media/dvb/frontends/cx24123.c
+++ b/drivers/media/dvb/frontends/cx24123.c
@@ -458,7 +458,7 @@ static int cx24123_set_symbolrate(struct cx24123_state *state, u32 srate)
458 /* check if symbol rate is within limits */ 458 /* check if symbol rate is within limits */
459 if ((srate > state->frontend.ops.info.symbol_rate_max) || 459 if ((srate > state->frontend.ops.info.symbol_rate_max) ||
460 (srate < state->frontend.ops.info.symbol_rate_min)) 460 (srate < state->frontend.ops.info.symbol_rate_min))
461 return -EOPNOTSUPP;; 461 return -EOPNOTSUPP;
462 462
463 /* choose the sampling rate high enough for the required operation, 463 /* choose the sampling rate high enough for the required operation,
464 while optimizing the power consumed by the demodulator */ 464 while optimizing the power consumed by the demodulator */
diff --git a/drivers/media/dvb/frontends/dib0070.c b/drivers/media/dvb/frontends/dib0070.c
index fe895bf7b18f..da92cbe1b8ea 100644
--- a/drivers/media/dvb/frontends/dib0070.c
+++ b/drivers/media/dvb/frontends/dib0070.c
@@ -167,7 +167,7 @@ static int dib0070_tune_digital(struct dvb_frontend *fe, struct dvb_frontend_par
167 break; 167 break;
168 case BAND_SBAND: 168 case BAND_SBAND:
169 LO4_SET_VCO_HFDIV(lo4, 0, 0); 169 LO4_SET_VCO_HFDIV(lo4, 0, 0);
170 LO4_SET_CTRIM(lo4, 1);; 170 LO4_SET_CTRIM(lo4, 1);
171 c = 1; 171 c = 1;
172 break; 172 break;
173 case BAND_UHF: 173 case BAND_UHF:
diff --git a/drivers/media/dvb/frontends/stv0900_sw.c b/drivers/media/dvb/frontends/stv0900_sw.c
index a5a31536cbcb..962fde1437ce 100644
--- a/drivers/media/dvb/frontends/stv0900_sw.c
+++ b/drivers/media/dvb/frontends/stv0900_sw.c
@@ -1721,7 +1721,7 @@ static enum fe_stv0900_signal_type stv0900_dvbs1_acq_workaround(struct dvb_front
1721 1721
1722 s32 srate, demod_timeout, 1722 s32 srate, demod_timeout,
1723 fec_timeout, freq1, freq0; 1723 fec_timeout, freq1, freq0;
1724 enum fe_stv0900_signal_type signal_type = STV0900_NODATA;; 1724 enum fe_stv0900_signal_type signal_type = STV0900_NODATA;
1725 1725
1726 switch (demod) { 1726 switch (demod) {
1727 case STV0900_DEMOD_1: 1727 case STV0900_DEMOD_1:
diff --git a/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c
index 609bae6098d3..36503725d973 100644
--- a/drivers/media/video/cx231xx/cx231xx-video.c
+++ b/drivers/media/video/cx231xx/cx231xx-video.c
@@ -923,8 +923,8 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
923 923
924 f->fmt.pix.width = dev->width; 924 f->fmt.pix.width = dev->width;
925 f->fmt.pix.height = dev->height; 925 f->fmt.pix.height = dev->height;
926 f->fmt.pix.pixelformat = dev->format->fourcc;; 926 f->fmt.pix.pixelformat = dev->format->fourcc;
927 f->fmt.pix.bytesperline = (dev->width * dev->format->depth + 7) >> 3;; 927 f->fmt.pix.bytesperline = (dev->width * dev->format->depth + 7) >> 3;
928 f->fmt.pix.sizeimage = f->fmt.pix.bytesperline * dev->height; 928 f->fmt.pix.sizeimage = f->fmt.pix.bytesperline * dev->height;
929 f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M; 929 f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
930 930
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index 214a55e943b7..76a51509d8fb 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -395,7 +395,7 @@ struct sram_channel {
395 u32 cmds_start; 395 u32 cmds_start;
396 u32 ctrl_start; 396 u32 ctrl_start;
397 u32 cdt; 397 u32 cdt;
398 u32 fifo_start;; 398 u32 fifo_start;
399 u32 fifo_size; 399 u32 fifo_size;
400 u32 ptr1_reg; 400 u32 ptr1_reg;
401 u32 ptr2_reg; 401 u32 ptr2_reg;