Commit 5becbc58 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

[media] v4l/dvb: fix compiler warnings

media_build/v4l/drxk_hard.c: In function 'DownloadMicrocode':
media_build/v4l/drxk_hard.c:1388:6: warning: variable 'BlockCRC' set but not used [-Wunused-but-set-variable]
media_build/v4l/drxk_hard.c:1384:6: warning: variable 'Drain' set but not used [-Wunused-but-set-variable]
media_build/v4l/drxk_hard.c:1383:6: warning: variable 'Flags' set but not used [-Wunused-but-set-variable]
media_build/v4l/lmedm04.c: In function 'lme2510_probe':
media_build/v4l/lmedm04.c:1208:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable]
media_build/v4l/hopper_cards.c: In function 'hopper_irq_handler':
media_build/v4l/hopper_cards.c:68:26: warning: variable 'lstat' set but not used [-Wunused-but-set-variable]
media_build/v4l/mantis_cards.c: In function 'mantis_irq_handler':
media_build/v4l/mantis_cards.c:76:26: warning: variable 'lstat' set but not used [-Wunused-but-set-variable]
media_build/v4l/mantis_dma.c: In function 'mantis_dma_stop':
media_build/v4l/mantis_dma.c:202:16: warning: variable 'mask' set but not used [-Wunused-but-set-variable]
media_build/v4l/mantis_dma.c:202:6: warning: variable 'stat' set but not used [-Wunused-but-set-variable]
media_build/v4l/mantis_evm.c: In function 'mantis_hifevm_work':
media_build/v4l/mantis_evm.c:44:17: warning: variable 'gpif_mask' set but not used [-Wunused-but-set-variable]
media_build/v4l/stb0899_drv.c: In function 'stb0899_init_calc':
media_build/v4l/stb0899_drv.c:640:5: warning: variable 'agc1cn' set but not used [-Wunused-but-set-variable]
media_build/v4l/stb0899_drv.c: In function 'stb0899_diseqc_init':
media_build/v4l/stb0899_drv.c:830:13: warning: variable 'f22_rx' set but not used [-Wunused-but-set-variable]
media_build/v4l/stb0899_drv.c:826:31: warning: variable 'tx_data' set but not used [-Wunused-but-set-variable]
media_build/v4l/stv0900_sw.c: In function 'stv0900_track_optimization':
media_build/v4l/stv0900_sw.c:838:26: warning: variable 'rolloff' set but not used [-Wunused-but-set-variable]
media_build/v4l/ir-sanyo-decoder.c: In function 'ir_sanyo_decode':
media_build/v4l/ir-sanyo-decoder.c:59:14: warning: variable 'not_address' set but not used [-Wunused-but-set-variable]
media_build/v4l/mceusb.c: In function 'mceusb_dev_printdata':
media_build/v4l/mceusb.c:523:46: warning: variable 'data5' set but not used [-Wunused-but-set-variable]
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent fdf07b02
...@@ -1205,14 +1205,13 @@ static int lme2510_probe(struct usb_interface *intf, ...@@ -1205,14 +1205,13 @@ static int lme2510_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
{ {
struct usb_device *udev = interface_to_usbdev(intf); struct usb_device *udev = interface_to_usbdev(intf);
int ret = 0;
usb_reset_configuration(udev); usb_reset_configuration(udev);
usb_set_interface(udev, intf->cur_altsetting->desc.bInterfaceNumber, 1); usb_set_interface(udev, intf->cur_altsetting->desc.bInterfaceNumber, 1);
if (udev->speed != USB_SPEED_HIGH) { if (udev->speed != USB_SPEED_HIGH) {
ret = usb_reset_device(udev); usb_reset_device(udev);
info("DEV Failed to connect in HIGH SPEED mode"); info("DEV Failed to connect in HIGH SPEED mode");
return -ENODEV; return -ENODEV;
} }
......
...@@ -1380,20 +1380,20 @@ static int DownloadMicrocode(struct drxk_state *state, ...@@ -1380,20 +1380,20 @@ static int DownloadMicrocode(struct drxk_state *state,
const u8 pMCImage[], u32 Length) const u8 pMCImage[], u32 Length)
{ {
const u8 *pSrc = pMCImage; const u8 *pSrc = pMCImage;
u16 Flags;
u16 Drain;
u32 Address; u32 Address;
u16 nBlocks; u16 nBlocks;
u16 BlockSize; u16 BlockSize;
u16 BlockCRC;
u32 offset = 0; u32 offset = 0;
u32 i; u32 i;
int status = 0; int status = 0;
dprintk(1, "\n"); dprintk(1, "\n");
/* down the drain (we don care about MAGIC_WORD) */ /* down the drain (we don't care about MAGIC_WORD) */
#if 0
/* For future reference */
Drain = (pSrc[0] << 8) | pSrc[1]; Drain = (pSrc[0] << 8) | pSrc[1];
#endif
pSrc += sizeof(u16); pSrc += sizeof(u16);
offset += sizeof(u16); offset += sizeof(u16);
nBlocks = (pSrc[0] << 8) | pSrc[1]; nBlocks = (pSrc[0] << 8) | pSrc[1];
...@@ -1410,11 +1410,17 @@ static int DownloadMicrocode(struct drxk_state *state, ...@@ -1410,11 +1410,17 @@ static int DownloadMicrocode(struct drxk_state *state,
pSrc += sizeof(u16); pSrc += sizeof(u16);
offset += sizeof(u16); offset += sizeof(u16);
#if 0
/* For future reference */
Flags = (pSrc[0] << 8) | pSrc[1]; Flags = (pSrc[0] << 8) | pSrc[1];
#endif
pSrc += sizeof(u16); pSrc += sizeof(u16);
offset += sizeof(u16); offset += sizeof(u16);
#if 0
/* For future reference */
BlockCRC = (pSrc[0] << 8) | pSrc[1]; BlockCRC = (pSrc[0] << 8) | pSrc[1];
#endif
pSrc += sizeof(u16); pSrc += sizeof(u16);
offset += sizeof(u16); offset += sizeof(u16);
......
...@@ -637,11 +637,9 @@ static void stb0899_init_calc(struct stb0899_state *state) ...@@ -637,11 +637,9 @@ static void stb0899_init_calc(struct stb0899_state *state)
struct stb0899_internal *internal = &state->internal; struct stb0899_internal *internal = &state->internal;
int master_clk; int master_clk;
u8 agc[2]; u8 agc[2];
u8 agc1cn;
u32 reg; u32 reg;
/* Read registers (in burst mode) */ /* Read registers (in burst mode) */
agc1cn = stb0899_read_reg(state, STB0899_AGC1CN);
stb0899_read_regs(state, STB0899_AGC1REF, agc, 2); /* AGC1R and AGC2O */ stb0899_read_regs(state, STB0899_AGC1REF, agc, 2); /* AGC1R and AGC2O */
/* Initial calculations */ /* Initial calculations */
...@@ -823,15 +821,12 @@ static int stb0899_send_diseqc_burst(struct dvb_frontend *fe, fe_sec_mini_cmd_t ...@@ -823,15 +821,12 @@ static int stb0899_send_diseqc_burst(struct dvb_frontend *fe, fe_sec_mini_cmd_t
static int stb0899_diseqc_init(struct stb0899_state *state) static int stb0899_diseqc_init(struct stb0899_state *state)
{ {
struct dvb_diseqc_master_cmd tx_data;
/* /*
struct dvb_diseqc_slave_reply rx_data; struct dvb_diseqc_slave_reply rx_data;
*/ */
u8 f22_tx, f22_rx, reg; u8 f22_tx, reg;
u32 mclk, tx_freq = 22000;/* count = 0, i; */ u32 mclk, tx_freq = 22000;/* count = 0, i; */
tx_data.msg[0] = 0xe2;
tx_data.msg_len = 3;
reg = stb0899_read_reg(state, STB0899_DISCNTRL2); reg = stb0899_read_reg(state, STB0899_DISCNTRL2);
STB0899_SETFIELD_VAL(ONECHIP_TRX, reg, 0); STB0899_SETFIELD_VAL(ONECHIP_TRX, reg, 0);
stb0899_write_reg(state, STB0899_DISCNTRL2, reg); stb0899_write_reg(state, STB0899_DISCNTRL2, reg);
...@@ -849,7 +844,6 @@ static int stb0899_diseqc_init(struct stb0899_state *state) ...@@ -849,7 +844,6 @@ static int stb0899_diseqc_init(struct stb0899_state *state)
f22_tx = mclk / (tx_freq * 32); f22_tx = mclk / (tx_freq * 32);
stb0899_write_reg(state, STB0899_DISF22, f22_tx); /* DiSEqC Tx freq */ stb0899_write_reg(state, STB0899_DISF22, f22_tx); /* DiSEqC Tx freq */
state->rx_freq = 20000; state->rx_freq = 20000;
f22_rx = mclk / (state->rx_freq * 32);
return 0; return 0;
} }
......
...@@ -835,7 +835,6 @@ static void stv0900_track_optimization(struct dvb_frontend *fe) ...@@ -835,7 +835,6 @@ static void stv0900_track_optimization(struct dvb_frontend *fe)
blind_tun_sw = 0, blind_tun_sw = 0,
modulation; modulation;
enum fe_stv0900_rolloff rolloff;
enum fe_stv0900_modcode foundModcod; enum fe_stv0900_modcode foundModcod;
dprintk("%s\n", __func__); dprintk("%s\n", __func__);
...@@ -940,7 +939,6 @@ static void stv0900_track_optimization(struct dvb_frontend *fe) ...@@ -940,7 +939,6 @@ static void stv0900_track_optimization(struct dvb_frontend *fe)
freq1 = stv0900_read_reg(intp, CFR2); freq1 = stv0900_read_reg(intp, CFR2);
freq0 = stv0900_read_reg(intp, CFR1); freq0 = stv0900_read_reg(intp, CFR1);
rolloff = stv0900_get_bits(intp, ROLLOFF_STATUS);
if (intp->srch_algo[demod] == STV0900_BLIND_SEARCH) { if (intp->srch_algo[demod] == STV0900_BLIND_SEARCH) {
stv0900_write_reg(intp, SFRSTEP, 0x00); stv0900_write_reg(intp, SFRSTEP, 0x00);
stv0900_write_bits(intp, SCAN_ENABLE, 0); stv0900_write_bits(intp, SCAN_ENABLE, 0);
......
...@@ -65,7 +65,7 @@ static int devs; ...@@ -65,7 +65,7 @@ static int devs;
static irqreturn_t hopper_irq_handler(int irq, void *dev_id) static irqreturn_t hopper_irq_handler(int irq, void *dev_id)
{ {
u32 stat = 0, mask = 0, lstat = 0; u32 stat = 0, mask = 0;
u32 rst_stat = 0, rst_mask = 0; u32 rst_stat = 0, rst_mask = 0;
struct mantis_pci *mantis; struct mantis_pci *mantis;
...@@ -80,7 +80,6 @@ static irqreturn_t hopper_irq_handler(int irq, void *dev_id) ...@@ -80,7 +80,6 @@ static irqreturn_t hopper_irq_handler(int irq, void *dev_id)
stat = mmread(MANTIS_INT_STAT); stat = mmread(MANTIS_INT_STAT);
mask = mmread(MANTIS_INT_MASK); mask = mmread(MANTIS_INT_MASK);
lstat = stat & ~MANTIS_INT_RISCSTAT;
if (!(stat & mask)) if (!(stat & mask))
return IRQ_NONE; return IRQ_NONE;
......
...@@ -73,7 +73,7 @@ static char *label[10] = { ...@@ -73,7 +73,7 @@ static char *label[10] = {
static irqreturn_t mantis_irq_handler(int irq, void *dev_id) static irqreturn_t mantis_irq_handler(int irq, void *dev_id)
{ {
u32 stat = 0, mask = 0, lstat = 0; u32 stat = 0, mask = 0;
u32 rst_stat = 0, rst_mask = 0; u32 rst_stat = 0, rst_mask = 0;
struct mantis_pci *mantis; struct mantis_pci *mantis;
...@@ -88,7 +88,6 @@ static irqreturn_t mantis_irq_handler(int irq, void *dev_id) ...@@ -88,7 +88,6 @@ static irqreturn_t mantis_irq_handler(int irq, void *dev_id)
stat = mmread(MANTIS_INT_STAT); stat = mmread(MANTIS_INT_STAT);
mask = mmread(MANTIS_INT_MASK); mask = mmread(MANTIS_INT_MASK);
lstat = stat & ~MANTIS_INT_RISCSTAT;
if (!(stat & mask)) if (!(stat & mask))
return IRQ_NONE; return IRQ_NONE;
......
...@@ -199,10 +199,6 @@ void mantis_dma_start(struct mantis_pci *mantis) ...@@ -199,10 +199,6 @@ void mantis_dma_start(struct mantis_pci *mantis)
void mantis_dma_stop(struct mantis_pci *mantis) void mantis_dma_stop(struct mantis_pci *mantis)
{ {
u32 stat = 0, mask = 0;
stat = mmread(MANTIS_INT_STAT);
mask = mmread(MANTIS_INT_MASK);
dprintk(MANTIS_DEBUG, 1, "Mantis Stop DMA engine"); dprintk(MANTIS_DEBUG, 1, "Mantis Stop DMA engine");
mmwrite((mmread(MANTIS_GPIF_ADDR) & (~(MANTIS_GPIF_HIFRDWRN))), MANTIS_GPIF_ADDR); mmwrite((mmread(MANTIS_GPIF_ADDR) & (~(MANTIS_GPIF_HIFRDWRN))), MANTIS_GPIF_ADDR);
......
...@@ -41,10 +41,9 @@ static void mantis_hifevm_work(struct work_struct *work) ...@@ -41,10 +41,9 @@ static void mantis_hifevm_work(struct work_struct *work)
struct mantis_ca *ca = container_of(work, struct mantis_ca, hif_evm_work); struct mantis_ca *ca = container_of(work, struct mantis_ca, hif_evm_work);
struct mantis_pci *mantis = ca->ca_priv; struct mantis_pci *mantis = ca->ca_priv;
u32 gpif_stat, gpif_mask; u32 gpif_stat;
gpif_stat = mmread(MANTIS_GPIF_STATUS); gpif_stat = mmread(MANTIS_GPIF_STATUS);
gpif_mask = mmread(MANTIS_GPIF_IRQCFG);
if (gpif_stat & MANTIS_GPIF_DETSTAT) { if (gpif_stat & MANTIS_GPIF_DETSTAT) {
if (gpif_stat & MANTIS_CARD_PLUGIN) { if (gpif_stat & MANTIS_CARD_PLUGIN) {
......
...@@ -56,7 +56,7 @@ static int ir_sanyo_decode(struct rc_dev *dev, struct ir_raw_event ev) ...@@ -56,7 +56,7 @@ static int ir_sanyo_decode(struct rc_dev *dev, struct ir_raw_event ev)
{ {
struct sanyo_dec *data = &dev->raw->sanyo; struct sanyo_dec *data = &dev->raw->sanyo;
u32 scancode; u32 scancode;
u8 address, not_address, command, not_command; u8 address, command, not_command;
if (!(dev->raw->enabled_protocols & RC_TYPE_SANYO)) if (!(dev->raw->enabled_protocols & RC_TYPE_SANYO))
return 0; return 0;
...@@ -154,7 +154,7 @@ static int ir_sanyo_decode(struct rc_dev *dev, struct ir_raw_event ev) ...@@ -154,7 +154,7 @@ static int ir_sanyo_decode(struct rc_dev *dev, struct ir_raw_event ev)
break; break;
address = bitrev16((data->bits >> 29) & 0x1fff) >> 3; address = bitrev16((data->bits >> 29) & 0x1fff) >> 3;
not_address = bitrev16((data->bits >> 16) & 0x1fff) >> 3; /* not_address = bitrev16((data->bits >> 16) & 0x1fff) >> 3; */
command = bitrev8((data->bits >> 8) & 0xff); command = bitrev8((data->bits >> 8) & 0xff);
not_command = bitrev8((data->bits >> 0) & 0xff); not_command = bitrev8((data->bits >> 0) & 0xff);
......
...@@ -520,7 +520,7 @@ static void mceusb_dev_printdata(struct mceusb_dev *ir, char *buf, ...@@ -520,7 +520,7 @@ static void mceusb_dev_printdata(struct mceusb_dev *ir, char *buf,
{ {
char codes[USB_BUFLEN * 3 + 1]; char codes[USB_BUFLEN * 3 + 1];
char inout[9]; char inout[9];
u8 cmd, subcmd, data1, data2, data3, data4, data5; u8 cmd, subcmd, data1, data2, data3, data4;
struct device *dev = ir->dev; struct device *dev = ir->dev;
int i, start, skip = 0; int i, start, skip = 0;
u32 carrier, period; u32 carrier, period;
...@@ -553,7 +553,6 @@ static void mceusb_dev_printdata(struct mceusb_dev *ir, char *buf, ...@@ -553,7 +553,6 @@ static void mceusb_dev_printdata(struct mceusb_dev *ir, char *buf,
data2 = buf[start + 3] & 0xff; data2 = buf[start + 3] & 0xff;
data3 = buf[start + 4] & 0xff; data3 = buf[start + 4] & 0xff;
data4 = buf[start + 5] & 0xff; data4 = buf[start + 5] & 0xff;
data5 = buf[start + 6] & 0xff;
switch (cmd) { switch (cmd) {
case MCE_CMD_NULL: case MCE_CMD_NULL:
......
...@@ -45,7 +45,6 @@ static int videobuf_dvb_thread(void *data) ...@@ -45,7 +45,6 @@ static int videobuf_dvb_thread(void *data)
struct videobuf_dvb *dvb = data; struct videobuf_dvb *dvb = data;
struct videobuf_buffer *buf; struct videobuf_buffer *buf;
unsigned long flags; unsigned long flags;
int err;
void *outp; void *outp;
dprintk("dvb thread started\n"); dprintk("dvb thread started\n");
...@@ -57,7 +56,7 @@ static int videobuf_dvb_thread(void *data) ...@@ -57,7 +56,7 @@ static int videobuf_dvb_thread(void *data)
buf = list_entry(dvb->dvbq.stream.next, buf = list_entry(dvb->dvbq.stream.next,
struct videobuf_buffer, stream); struct videobuf_buffer, stream);
list_del(&buf->stream); list_del(&buf->stream);
err = videobuf_waiton(&dvb->dvbq, buf, 0, 1); videobuf_waiton(&dvb->dvbq, buf, 0, 1);
/* no more feeds left or stop_feed() asked us to quit */ /* no more feeds left or stop_feed() asked us to quit */
if (0 == dvb->nfeeds) if (0 == dvb->nfeeds)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment