The patch number 12197 was added via Douglas Schilling Landgraf
<dougsl...@redhat.com>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <linux-me...@vger.kernel.org>
------
From: Joe Perches <j...@perches.com>
Remove unnecessary semicolons
Priority: normal
Signed-off-by: Joe Perches <j...@perches.com>
CC: Patrick Boettcher <patrick.boettc...@desy.de>
CC: Steven Toth <st...@linuxtv.org>
CC: Igor M. Liplianin <liplia...@netup.ru>
CC: Srinivasa Deevi <srinivasa.de...@conexant.com>
Signed-off-by: Douglas Schilling Landgraf <dougsl...@redhat.com>
---
linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 2 +-
linux/drivers/media/dvb/dvb-usb/dib0700_devices.c | 2 +-
linux/drivers/media/dvb/frontends/cx24123.c | 2 +-
linux/drivers/media/dvb/frontends/dib0070.c | 2 +-
linux/drivers/media/dvb/frontends/stv0900_sw.c | 2 +-
linux/drivers/media/video/cx231xx/cx231xx-video.c | 4 ++--
linux/drivers/media/video/cx23885/cx23885.h | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff -r 1ca5794e4384 -r cc1b11137dbf
linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
--- a/linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c Thu Jul 02 13:52:46
2009 -0300
+++ b/linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c Thu Jul 02 15:57:09
2009 -0300
@@ -410,7 +410,7 @@ static int skystar2_rev28_attach(struct
if (!fc->fe)
return 0;
- i2c_tuner = cx24123_get_tuner_i2c_adapter(fc->fe);;
+ i2c_tuner = cx24123_get_tuner_i2c_adapter(fc->fe);
if (!i2c_tuner)
return 0;
diff -r 1ca5794e4384 -r cc1b11137dbf
linux/drivers/media/dvb/dvb-usb/dib0700_devices.c
--- a/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c Thu Jul 02 13:52:46
2009 -0300
+++ b/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c Thu Jul 02 15:57:09
2009 -0300
@@ -310,7 +310,7 @@ static int stk7700d_tuner_attach(struct
struct i2c_adapter *tun_i2c;
tun_i2c = dib7000p_get_i2c_master(adap->fe,
DIBX000_I2C_INTERFACE_TUNER, 1);
return dvb_attach(mt2266_attach, adap->fe, tun_i2c,
- &stk7700d_mt2266_config[adap->id]) == NULL ? -ENODEV : 0;;
+ &stk7700d_mt2266_config[adap->id]) == NULL ? -ENODEV : 0;
}
/* STK7700-PH: Digital/Analog Hybrid Tuner, e.h. Cinergy HT USB HE */
diff -r 1ca5794e4384 -r cc1b11137dbf linux/drivers/media/dvb/frontends/cx24123.c
--- a/linux/drivers/media/dvb/frontends/cx24123.c Thu Jul 02 13:52:46
2009 -0300
+++ b/linux/drivers/media/dvb/frontends/cx24123.c Thu Jul 02 15:57:09
2009 -0300
@@ -470,7 +470,7 @@ static int cx24123_set_symbolrate(struct
/* check if symbol rate is within limits */
if ((srate > state->frontend.ops.info.symbol_rate_max) ||
(srate < state->frontend.ops.info.symbol_rate_min))
- return -EOPNOTSUPP;;
+ return -EOPNOTSUPP;
/* choose the sampling rate high enough for the required operation,
while optimizing the power consumed by the demodulator */
diff -r 1ca5794e4384 -r cc1b11137dbf linux/drivers/media/dvb/frontends/dib0070.c
--- a/linux/drivers/media/dvb/frontends/dib0070.c Thu Jul 02 13:52:46
2009 -0300
+++ b/linux/drivers/media/dvb/frontends/dib0070.c Thu Jul 02 15:57:09
2009 -0300
@@ -168,7 +168,7 @@ static int dib0070_tune_digital(struct d
break;
case BAND_SBAND:
LO4_SET_VCO_HFDIV(lo4, 0, 0);
- LO4_SET_CTRIM(lo4, 1);;
+ LO4_SET_CTRIM(lo4, 1);
c = 1;
break;
case BAND_UHF:
diff -r 1ca5794e4384 -r cc1b11137dbf
linux/drivers/media/dvb/frontends/stv0900_sw.c
--- a/linux/drivers/media/dvb/frontends/stv0900_sw.c Thu Jul 02 13:52:46
2009 -0300
+++ b/linux/drivers/media/dvb/frontends/stv0900_sw.c Thu Jul 02 15:57:09
2009 -0300
@@ -1721,7 +1721,7 @@ static enum fe_stv0900_signal_type stv09
s32 srate, demod_timeout,
fec_timeout, freq1, freq0;
- enum fe_stv0900_signal_type signal_type = STV0900_NODATA;;
+ enum fe_stv0900_signal_type signal_type = STV0900_NODATA;
switch (demod) {
case STV0900_DEMOD_1:
diff -r 1ca5794e4384 -r cc1b11137dbf
linux/drivers/media/video/cx231xx/cx231xx-video.c
--- a/linux/drivers/media/video/cx231xx/cx231xx-video.c Thu Jul 02 13:52:46
2009 -0300
+++ b/linux/drivers/media/video/cx231xx/cx231xx-video.c Thu Jul 02 15:57:09
2009 -0300
@@ -923,8 +923,8 @@ static int vidioc_g_fmt_vid_cap(struct f
f->fmt.pix.width = dev->width;
f->fmt.pix.height = dev->height;
- f->fmt.pix.pixelformat = dev->format->fourcc;;
- f->fmt.pix.bytesperline = (dev->width * dev->format->depth + 7) >> 3;;
+ f->fmt.pix.pixelformat = dev->format->fourcc;
+ f->fmt.pix.bytesperline = (dev->width * dev->format->depth + 7) >> 3;
f->fmt.pix.sizeimage = f->fmt.pix.bytesperline * dev->height;
f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
diff -r 1ca5794e4384 -r cc1b11137dbf linux/drivers/media/video/cx23885/cx23885.h
--- a/linux/drivers/media/video/cx23885/cx23885.h Thu Jul 02 13:52:46
2009 -0300
+++ b/linux/drivers/media/video/cx23885/cx23885.h Thu Jul 02 15:57:09
2009 -0300
@@ -396,7 +396,7 @@ struct sram_channel {
u32 cmds_start;
u32 ctrl_start;
u32 cdt;
- u32 fifo_start;;
+ u32 fifo_start;
u32 fifo_size;
u32 ptr1_reg;
u32 ptr2_reg;
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/cc1b11137dbfaaee59231174d6c9b4b9c32d755f
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
