aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManu Abraham <abraham.manu@gmail.com>2009-04-08 20:30:29 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-06-16 18:20:40 -0300
commitda4b9059c948ce35ce9d34b982b6a9934a9251ef (patch)
tree39c645ced9e29d6825a5184549062fd750ed1aec
parent5f99feffc0426f88db07e2d777d9dd4aa2205c2f (diff)
V4L/DVB (11591): stv090x: code simplification
Signed-off-by: Manu Abraham <manu@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/dvb/frontends/stv090x.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/media/dvb/frontends/stv090x.c b/drivers/media/dvb/frontends/stv090x.c
index b3a02790c9a..3e0acd7cc82 100644
--- a/drivers/media/dvb/frontends/stv090x.c
+++ b/drivers/media/dvb/frontends/stv090x.c
@@ -2222,23 +2222,22 @@ static enum stv090x_delsys stv090x_get_std(struct stv090x_state *state)
static s32 stv090x_get_car_freq(struct stv090x_state *state, u32 mclk)
{
s32 derot, int_1, int_2, tmp_1, tmp_2;
- u32 pow2;
derot = STV090x_READ_DEMOD(state, CFR2) << 16;
derot |= STV090x_READ_DEMOD(state, CFR1) << 8;
derot |= STV090x_READ_DEMOD(state, CFR0);
derot = comp2(derot, 24);
- pow2 = 1 << 12;
- int_1 = state->mclk / pow2;
- int_2 = derot / pow2;
+ int_1 = state->mclk >> 12;
+ int_2 = derot >> 12;
- tmp_1 = state->mclk % pow2;
- tmp_2 = derot % pow2;
+ /* carrier_frequency = MasterClock * Reg / 2^24 */
+ tmp_1 = state->mclk % 0x1000;
+ tmp_2 = derot % 0x1000;
derot = (int_1 * int_2) +
- ((int_1 * tmp_2) / pow2) +
- ((int_1 * tmp_1) / pow2);
+ ((int_1 * tmp_2) >> 12) +
+ ((int_1 * tmp_1) >> 12);
return derot;
}