* [PATCH 8/8] [media] streamzap: Fix a compilation warning when compiled builtin
[not found] <cover.1293466891.git.mchehab@redhat.com>
@ 2010-12-27 16:22 ` Mauro Carvalho Chehab
2010-12-27 16:22 ` [PATCH 7/8] [media] af9013: Fix a compilation warning Mauro Carvalho Chehab
` (6 subsequent siblings)
7 siblings, 0 replies; 8+ messages in thread
From: Mauro Carvalho Chehab @ 2010-12-27 16:22 UTC (permalink / raw)
Cc: Linux Media Mailing List
drivers/media/rc/streamzap.c: In function ‘streamzap_probe’:
drivers/media/rc/streamzap.c:460:2: warning: statement with no effect
Cc: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/rc/streamzap.c b/drivers/media/rc/streamzap.c
index 7f82f55..6e2911c 100644
--- a/drivers/media/rc/streamzap.c
+++ b/drivers/media/rc/streamzap.c
@@ -73,7 +73,7 @@ MODULE_DEVICE_TABLE(usb, streamzap_table);
#ifdef CONFIG_IR_RC5_SZ_DECODER_MODULE
#define load_rc5_sz_decode() request_module("ir-rc5-sz-decoder")
#else
-#define load_rc5_sz_decode() 0
+#define load_rc5_sz_decode() {}
#endif
enum StreamzapDecoderState {
--
1.7.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 7/8] [media] af9013: Fix a compilation warning
[not found] <cover.1293466891.git.mchehab@redhat.com>
2010-12-27 16:22 ` [PATCH 8/8] [media] streamzap: Fix a compilation warning when compiled builtin Mauro Carvalho Chehab
@ 2010-12-27 16:22 ` Mauro Carvalho Chehab
2010-12-27 16:22 ` [PATCH 6/8] [media] stv090x: Fix some compilation warnings Mauro Carvalho Chehab
` (5 subsequent siblings)
7 siblings, 0 replies; 8+ messages in thread
From: Mauro Carvalho Chehab @ 2010-12-27 16:22 UTC (permalink / raw)
Cc: Linux Media Mailing List
drivers/media/dvb/frontends/af9013.c: In function ‘af9013_update_signal_strength.clone.0’:
drivers/media/dvb/frontends/af9013.c:967:6: warning: ‘ret’ may be used uninitialized in this function
Cc: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/dvb/frontends/af9013.c b/drivers/media/dvb/frontends/af9013.c
index e2a95c0..ce22205 100644
--- a/drivers/media/dvb/frontends/af9013.c
+++ b/drivers/media/dvb/frontends/af9013.c
@@ -964,7 +964,7 @@ error:
static int af9013_update_signal_strength(struct dvb_frontend *fe)
{
struct af9013_state *state = fe->demodulator_priv;
- int ret;
+ int ret = 0;
u8 rf_gain, if_gain;
int signal_strength;
--
1.7.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 6/8] [media] stv090x: Fix some compilation warnings
[not found] <cover.1293466891.git.mchehab@redhat.com>
2010-12-27 16:22 ` [PATCH 8/8] [media] streamzap: Fix a compilation warning when compiled builtin Mauro Carvalho Chehab
2010-12-27 16:22 ` [PATCH 7/8] [media] af9013: Fix a compilation warning Mauro Carvalho Chehab
@ 2010-12-27 16:22 ` Mauro Carvalho Chehab
2010-12-27 16:22 ` [PATCH 5/8] [media] gspca: Fix a warning for using len before filling it Mauro Carvalho Chehab
` (4 subsequent siblings)
7 siblings, 0 replies; 8+ messages in thread
From: Mauro Carvalho Chehab @ 2010-12-27 16:22 UTC (permalink / raw)
Cc: Linux Media Mailing List
A few typos at the driver are causing the following warnings:
drivers/media/dvb/frontends/stv090x.c: In function ‘stv090x_start_search’:
drivers/media/dvb/frontends/stv090x.c:1486:27: warning: comparison between ‘enum stv090x_search’ and ‘enum stv090x_delsys’
drivers/media/dvb/frontends/stv090x.c:1487:24: warning: comparison between ‘enum stv090x_search’ and ‘enum stv090x_delsys’
drivers/media/dvb/frontends/stv090x.c: In function ‘stv090x_optimize_track’:
drivers/media/dvb/frontends/stv090x.c:2943:2: warning: case value ‘4’ not in enumerated type ‘enum stv090x_delsys’
The first two are due to the lack of using the delsys types
STV090x_DVBS1/STV090x_DSS
instead of
STV090x_SEARCH_DVBS1/STV090x_SEARCH_DSS
The second one is due to the usage of STV090x_UNKNOWN (enum stv090x_modulation)
instead of STV090x_ERROR (enum stv090x_delsys).
Cc: Manu Abraham <abraham.manu@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/dvb/frontends/stv090x.c b/drivers/media/dvb/frontends/stv090x.c
index 425e7a4..4e0fc2c 100644
--- a/drivers/media/dvb/frontends/stv090x.c
+++ b/drivers/media/dvb/frontends/stv090x.c
@@ -1483,8 +1483,8 @@ static int stv090x_start_search(struct stv090x_state *state)
if (STV090x_WRITE_DEMOD(state, FFECFG, 0x41) < 0)
goto err;
- if ((state->search_mode == STV090x_DVBS1) ||
- (state->search_mode == STV090x_DSS) ||
+ if ((state->search_mode == STV090x_SEARCH_DVBS1) ||
+ (state->search_mode == STV090x_SEARCH_DSS) ||
(state->search_mode == STV090x_SEARCH_AUTO)) {
if (STV090x_WRITE_DEMOD(state, VITSCALE, 0x82) < 0)
@@ -2940,7 +2940,7 @@ static int stv090x_optimize_track(struct stv090x_state *state)
STV090x_WRITE_DEMOD(state, ERRCTRL1, 0x67); /* PER */
break;
- case STV090x_UNKNOWN:
+ case STV090x_ERROR:
default:
reg = STV090x_READ_DEMOD(state, DMDCFGMD);
STV090x_SETFIELD_Px(reg, DVBS1_ENABLE_FIELD, 1);
--
1.7.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 5/8] [media] gspca: Fix a warning for using len before filling it
[not found] <cover.1293466891.git.mchehab@redhat.com>
` (2 preceding siblings ...)
2010-12-27 16:22 ` [PATCH 6/8] [media] stv090x: Fix some compilation warnings Mauro Carvalho Chehab
@ 2010-12-27 16:22 ` Mauro Carvalho Chehab
2010-12-27 16:22 ` [PATCH 4/8] [media] dib7000m/dib7000p: Add support for TRANSMISSION_MODE_4K Mauro Carvalho Chehab
` (3 subsequent siblings)
7 siblings, 0 replies; 8+ messages in thread
From: Mauro Carvalho Chehab @ 2010-12-27 16:22 UTC (permalink / raw)
Cc: Linux Media Mailing List
The check for status errors is now before the check for len. That's
ok. However, the error printk's for the status error prints the URB
length. This generates this error:
drivers/media/video/gspca/gspca.c: In function ‘fill_frame’:
drivers/media/video/gspca/gspca.c:305:9: warning: ‘len’ may be used uninitialized in this function
The fix is as simple as moving the len init to happen before the checks.
Cc: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 92b5dfb..80b31eb 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -318,6 +318,7 @@ static void fill_frame(struct gspca_dev *gspca_dev,
}
pkt_scan = gspca_dev->sd_desc->pkt_scan;
for (i = 0; i < urb->number_of_packets; i++) {
+ len = urb->iso_frame_desc[i].actual_length;
/* check the packet status and length */
st = urb->iso_frame_desc[i].status;
@@ -327,7 +328,6 @@ static void fill_frame(struct gspca_dev *gspca_dev,
gspca_dev->last_packet_type = DISCARD_PACKET;
continue;
}
- len = urb->iso_frame_desc[i].actual_length;
if (len == 0) {
if (gspca_dev->empty_packet == 0)
gspca_dev->empty_packet = 1;
--
1.7.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4/8] [media] dib7000m/dib7000p: Add support for TRANSMISSION_MODE_4K
[not found] <cover.1293466891.git.mchehab@redhat.com>
` (3 preceding siblings ...)
2010-12-27 16:22 ` [PATCH 5/8] [media] gspca: Fix a warning for using len before filling it Mauro Carvalho Chehab
@ 2010-12-27 16:22 ` Mauro Carvalho Chehab
2010-12-27 16:22 ` [PATCH 3/8] [media] lirc_zilog: Fix a warning Mauro Carvalho Chehab
` (2 subsequent siblings)
7 siblings, 0 replies; 8+ messages in thread
From: Mauro Carvalho Chehab @ 2010-12-27 16:22 UTC (permalink / raw)
Cc: Linux Media Mailing List
Fixes several warnings:
drivers/media/dvb/frontends/dib7000m.c: In function ‘dib7000m_set_channel’:
drivers/media/dvb/frontends/dib7000m.c:808:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’
drivers/media/dvb/frontends/dib7000m.c:869:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’
drivers/media/dvb/frontends/dib7000m.c: In function ‘dib7000m_tune’:
drivers/media/dvb/frontends/dib7000m.c:1023:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’
drivers/media/dvb/frontends/dib7000m.c:1033:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’
drivers/media/dvb/frontends/dib7000m.c:1043:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’
drivers/media/dvb/frontends/dib7000p.c: In function ‘dib7000p_set_channel’:
drivers/media/dvb/frontends/dib7000p.c:720:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’
drivers/media/dvb/frontends/dib7000p.c:773:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’
drivers/media/dvb/frontends/dib7000p.c: In function ‘dib7000p_tune’:
drivers/media/dvb/frontends/dib7000p.c:997:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’
drivers/media/dvb/frontends/dib7000p.c:1007:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’
drivers/media/dvb/frontends/dib7000p.c:1017:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’
The drivers were prepared to support 4K carriers, but as the define were added
later, they were using a "magic" value of 255.
Cc: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/dvb/frontends/dib7000m.c b/drivers/media/dvb/frontends/dib7000m.c
index 0f09fd3..c7f5ccf 100644
--- a/drivers/media/dvb/frontends/dib7000m.c
+++ b/drivers/media/dvb/frontends/dib7000m.c
@@ -805,7 +805,7 @@ static void dib7000m_set_channel(struct dib7000m_state *state, struct dvb_fronte
value = 0;
switch (ch->u.ofdm.transmission_mode) {
case TRANSMISSION_MODE_2K: value |= (0 << 7); break;
- case /* 4K MODE */ 255: value |= (2 << 7); break;
+ case TRANSMISSION_MODE_4K: value |= (2 << 7); break;
default:
case TRANSMISSION_MODE_8K: value |= (1 << 7); break;
}
@@ -866,7 +866,7 @@ static void dib7000m_set_channel(struct dib7000m_state *state, struct dvb_fronte
/* P_dvsy_sync_wait */
switch (ch->u.ofdm.transmission_mode) {
case TRANSMISSION_MODE_8K: value = 256; break;
- case /* 4K MODE */ 255: value = 128; break;
+ case TRANSMISSION_MODE_4K: value = 128; break;
case TRANSMISSION_MODE_2K:
default: value = 64; break;
}
@@ -1020,7 +1020,7 @@ static int dib7000m_tune(struct dvb_frontend *demod, struct dvb_frontend_paramet
value = (6 << 8) | 0x80;
switch (ch->u.ofdm.transmission_mode) {
case TRANSMISSION_MODE_2K: value |= (7 << 12); break;
- case /* 4K MODE */ 255: value |= (8 << 12); break;
+ case TRANSMISSION_MODE_4K: value |= (8 << 12); break;
default:
case TRANSMISSION_MODE_8K: value |= (9 << 12); break;
}
@@ -1030,7 +1030,7 @@ static int dib7000m_tune(struct dvb_frontend *demod, struct dvb_frontend_paramet
value = (0 << 4);
switch (ch->u.ofdm.transmission_mode) {
case TRANSMISSION_MODE_2K: value |= 0x6; break;
- case /* 4K MODE */ 255: value |= 0x7; break;
+ case TRANSMISSION_MODE_4K: value |= 0x7; break;
default:
case TRANSMISSION_MODE_8K: value |= 0x8; break;
}
@@ -1040,7 +1040,7 @@ static int dib7000m_tune(struct dvb_frontend *demod, struct dvb_frontend_paramet
value = (0 << 4);
switch (ch->u.ofdm.transmission_mode) {
case TRANSMISSION_MODE_2K: value |= 0x6; break;
- case /* 4K MODE */ 255: value |= 0x7; break;
+ case TRANSMISSION_MODE_4K: value |= 0x7; break;
default:
case TRANSMISSION_MODE_8K: value |= 0x8; break;
}
diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c
index 3aed0d4..6aa02cb 100644
--- a/drivers/media/dvb/frontends/dib7000p.c
+++ b/drivers/media/dvb/frontends/dib7000p.c
@@ -717,7 +717,7 @@ static void dib7000p_set_channel(struct dib7000p_state *state, struct dvb_fronte
value = 0;
switch (ch->u.ofdm.transmission_mode) {
case TRANSMISSION_MODE_2K: value |= (0 << 7); break;
- case /* 4K MODE */ 255: value |= (2 << 7); break;
+ case TRANSMISSION_MODE_4K: value |= (2 << 7); break;
default:
case TRANSMISSION_MODE_8K: value |= (1 << 7); break;
}
@@ -770,7 +770,7 @@ static void dib7000p_set_channel(struct dib7000p_state *state, struct dvb_fronte
/* P_dvsy_sync_wait */
switch (ch->u.ofdm.transmission_mode) {
case TRANSMISSION_MODE_8K: value = 256; break;
- case /* 4K MODE */ 255: value = 128; break;
+ case TRANSMISSION_MODE_4K: value = 128; break;
case TRANSMISSION_MODE_2K:
default: value = 64; break;
}
@@ -994,7 +994,7 @@ static int dib7000p_tune(struct dvb_frontend *demod, struct dvb_frontend_paramet
tmp = (6 << 8) | 0x80;
switch (ch->u.ofdm.transmission_mode) {
case TRANSMISSION_MODE_2K: tmp |= (7 << 12); break;
- case /* 4K MODE */ 255: tmp |= (8 << 12); break;
+ case TRANSMISSION_MODE_4K: tmp |= (8 << 12); break;
default:
case TRANSMISSION_MODE_8K: tmp |= (9 << 12); break;
}
@@ -1004,7 +1004,7 @@ static int dib7000p_tune(struct dvb_frontend *demod, struct dvb_frontend_paramet
tmp = (0 << 4);
switch (ch->u.ofdm.transmission_mode) {
case TRANSMISSION_MODE_2K: tmp |= 0x6; break;
- case /* 4K MODE */ 255: tmp |= 0x7; break;
+ case TRANSMISSION_MODE_4K: tmp |= 0x7; break;
default:
case TRANSMISSION_MODE_8K: tmp |= 0x8; break;
}
@@ -1014,7 +1014,7 @@ static int dib7000p_tune(struct dvb_frontend *demod, struct dvb_frontend_paramet
tmp = (0 << 4);
switch (ch->u.ofdm.transmission_mode) {
case TRANSMISSION_MODE_2K: tmp |= 0x6; break;
- case /* 4K MODE */ 255: tmp |= 0x7; break;
+ case TRANSMISSION_MODE_4K: tmp |= 0x7; break;
default:
case TRANSMISSION_MODE_8K: tmp |= 0x8; break;
}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/8] [media] lirc_zilog: Fix a warning
[not found] <cover.1293466891.git.mchehab@redhat.com>
` (4 preceding siblings ...)
2010-12-27 16:22 ` [PATCH 4/8] [media] dib7000m/dib7000p: Add support for TRANSMISSION_MODE_4K Mauro Carvalho Chehab
@ 2010-12-27 16:22 ` Mauro Carvalho Chehab
2010-12-27 16:22 ` [PATCH 2/8] [media] radio-wl1273: Fix two warnings Mauro Carvalho Chehab
2010-12-27 16:22 ` [PATCH 1/8] [media] dmxdev: Fix a compilation warning due to a bad type Mauro Carvalho Chehab
7 siblings, 0 replies; 8+ messages in thread
From: Mauro Carvalho Chehab @ 2010-12-27 16:22 UTC (permalink / raw)
Cc: Linux Media Mailing List
drivers/staging/lirc/lirc_zilog.c: In function ‘send_code’:
drivers/staging/lirc/lirc_zilog.c:886:1: warning: label ‘done’ defined but not used
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/staging/lirc/lirc_zilog.c b/drivers/staging/lirc/lirc_zilog.c
index f0076eb..52be6de 100644
--- a/drivers/staging/lirc/lirc_zilog.c
+++ b/drivers/staging/lirc/lirc_zilog.c
@@ -883,7 +883,6 @@ static int send_code(struct IR *ir, unsigned int code, unsigned int key)
return -EFAULT;
}
-done:
/* Oh good, it worked */
dprintk("sent code %u, key %u\n", code, key);
return 0;
--
1.7.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/8] [media] radio-wl1273: Fix two warnings
[not found] <cover.1293466891.git.mchehab@redhat.com>
` (5 preceding siblings ...)
2010-12-27 16:22 ` [PATCH 3/8] [media] lirc_zilog: Fix a warning Mauro Carvalho Chehab
@ 2010-12-27 16:22 ` Mauro Carvalho Chehab
2010-12-27 16:22 ` [PATCH 1/8] [media] dmxdev: Fix a compilation warning due to a bad type Mauro Carvalho Chehab
7 siblings, 0 replies; 8+ messages in thread
From: Mauro Carvalho Chehab @ 2010-12-27 16:22 UTC (permalink / raw)
Cc: Linux Media Mailing List
drivers/media/radio/radio-wl1273.c: In function ‘wl1273_fm_upload_firmware_patch’:
drivers/media/radio/radio-wl1273.c:675:2: warning: ‘n’ may be used uninitialized in this function
drivers/media/radio/radio-wl1273.c:675:2: warning: ‘i’ may be used uninitialized in this function
Those vars are never initialized, and the debug message makes no sense, as it
will show just two random values.
Cc: Matti J. Aaltonen <matti.j.aaltonen@nokia.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c
index 1813790..dd6bd36 100644
--- a/drivers/media/radio/radio-wl1273.c
+++ b/drivers/media/radio/radio-wl1273.c
@@ -645,7 +645,7 @@ static int wl1273_fm_upload_firmware_patch(struct wl1273_device *radio)
const char *fw_name = "radio-wl1273-fw.bin";
struct device *dev = radio->dev;
__u8 *ptr;
- int i, n, r;
+ int r;
dev_dbg(dev, "%s:\n", __func__);
@@ -672,7 +672,6 @@ static int wl1273_fm_upload_firmware_patch(struct wl1273_device *radio)
/* ignore possible error here */
wl1273_fm_write_cmd(core, WL1273_RESET, 0);
- dev_dbg(dev, "n: %d, i: %d\n", n, i);
dev_dbg(dev, "%s - download OK, r: %d\n", __func__, r);
out:
release_firmware(fw_p);
--
1.7.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 1/8] [media] dmxdev: Fix a compilation warning due to a bad type
[not found] <cover.1293466891.git.mchehab@redhat.com>
` (6 preceding siblings ...)
2010-12-27 16:22 ` [PATCH 2/8] [media] radio-wl1273: Fix two warnings Mauro Carvalho Chehab
@ 2010-12-27 16:22 ` Mauro Carvalho Chehab
7 siblings, 0 replies; 8+ messages in thread
From: Mauro Carvalho Chehab @ 2010-12-27 16:22 UTC (permalink / raw)
Cc: Linux Media Mailing List
drivers/media/dvb/dvb-core/dmxdev.c: In function ‘dvb_dmxdev_start_feed’:
drivers/media/dvb/dvb-core/dmxdev.c:583:13: warning: comparison between ‘enum dmx_ts_pes’ and ‘enum <anonymous>’
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c
index ad1f61d..e4b5c03 100644
--- a/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/drivers/media/dvb/dvb-core/dmxdev.c
@@ -572,13 +572,13 @@ static int dvb_dmxdev_start_feed(struct dmxdev *dmxdev,
dmx_output_t otype;
int ret;
int ts_type;
- enum dmx_ts_pes ts_pes;
+ dmx_pes_type_t ts_pes;
struct dmx_ts_feed *tsfeed;
feed->ts = NULL;
otype = para->output;
- ts_pes = (enum dmx_ts_pes)para->pes_type;
+ ts_pes = para->pes_type;
if (ts_pes < DMX_PES_OTHER)
ts_type = TS_DECODER;
--
1.7.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread