aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManu Abraham <abraham.manu@gmail.com>2008-01-25 20:28:46 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-29 17:53:22 -0200
commit85eabac439ff6b60775e3d6458702dcb6c479e05 (patch)
tree34c5f1f5b5b6babd82dcf29748e7619e1e7c55f4
parentd6812086508a38ccb48ed9d5bc9f50732dc818db (diff)
V4L/DVB (9453): stb0899: fix compilation warnings
Cleanup/Optimization: * Fix compile warnings * The compile warnings helped to identify 2 unnecessary I/O operations Signed-off-by: Manu Abraham <manu@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/dvb/frontends/stb0899_algo.c8
-rw-r--r--drivers/media/dvb/frontends/stb0899_drv.c2
-rw-r--r--drivers/media/dvb/frontends/stb0899_priv.h2
3 files changed, 4 insertions, 8 deletions
diff --git a/drivers/media/dvb/frontends/stb0899_algo.c b/drivers/media/dvb/frontends/stb0899_algo.c
index f1432cb2926..65bc032964b 100644
--- a/drivers/media/dvb/frontends/stb0899_algo.c
+++ b/drivers/media/dvb/frontends/stb0899_algo.c
@@ -199,9 +199,7 @@ static enum stb0899_status stb0899_check_tmg(struct stb0899_state *state)
msleep(internal->t_timing);
- reg = stb0899_read_reg(state, STB0899_RTF);
- STB0899_SETFIELD_VAL(RTF_TIMING_LOOP_FREQ, reg, 0xf2);
- stb0899_write_reg(state, STB0899_RTF, reg);
+ stb0899_write_reg(state, STB0899_RTF, 0xf2);
reg = stb0899_read_reg(state, STB0899_TLIR);
lock = STB0899_GETFIELD(TLIR_TMG_LOCK_IND, reg);
timing = stb0899_read_reg(state, STB0899_RTF);
@@ -603,9 +601,7 @@ enum stb0899_status stb0899_dvbs_algo(struct stb0899_state *state)
cfr[0] = cfr[1] = 0;
stb0899_write_regs(state, STB0899_CFRM, cfr, 2); /* RESET derotator frequency */
- reg = stb0899_read_reg(state, STB0899_RTF);
- STB0899_SETFIELD_VAL(RTF_TIMING_LOOP_FREQ, reg, 0);
- stb0899_write_reg(state, STB0899_RTF, reg);
+ stb0899_write_reg(state, STB0899_RTF, 0);
reg = stb0899_read_reg(state, STB0899_CFD);
STB0899_SETFIELD_VAL(CFD_ON, reg, 1);
stb0899_write_reg(state, STB0899_CFD, reg);
diff --git a/drivers/media/dvb/frontends/stb0899_drv.c b/drivers/media/dvb/frontends/stb0899_drv.c
index 2caa192a8e7..6e7db991274 100644
--- a/drivers/media/dvb/frontends/stb0899_drv.c
+++ b/drivers/media/dvb/frontends/stb0899_drv.c
@@ -495,7 +495,7 @@ err:
return status < 0 ? status : -EREMOTEIO;
}
-int stb0899_write_regs(struct stb0899_state *state, unsigned int reg, u8 *data, size_t count)
+int stb0899_write_regs(struct stb0899_state *state, unsigned int reg, u8 *data, u32 count)
{
int ret;
u8 buf[2 + count];
diff --git a/drivers/media/dvb/frontends/stb0899_priv.h b/drivers/media/dvb/frontends/stb0899_priv.h
index 73790b4e345..da7fddb4e6b 100644
--- a/drivers/media/dvb/frontends/stb0899_priv.h
+++ b/drivers/media/dvb/frontends/stb0899_priv.h
@@ -242,7 +242,7 @@ extern int stb0899_read_regs(struct stb0899_state *state,
extern int stb0899_write_regs(struct stb0899_state *state,
unsigned int reg, u8 *data,
- size_t count);
+ u32 count);
extern int stb0899_write_reg(struct stb0899_state *state,
unsigned int reg,