Browse Source

[media] rtl2832_sdr: remove plain 64-bit divisions

Commit 0ba2aeb6dab80920edd9cf5b93b1ea4d6913b8f3
(v4l2-ctrls: increase internal min/max/step/def to 64 bit)
changes v4l2 controls to 64-bit. Driver it not working on 32-bit
arch as it uses directly control 'step' which is changed to 64-bit.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Cc: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Antti Palosaari 11 years ago
parent
commit
a98ccfcf48
1 changed files with 2 additions and 3 deletions
  1. 2 3
      drivers/media/dvb-frontends/rtl2832_sdr.c

+ 2 - 3
drivers/media/dvb-frontends/rtl2832_sdr.c

@@ -1364,17 +1364,16 @@ static int rtl2832_sdr_s_ctrl(struct v4l2_ctrl *ctrl)
 		/* TODO: these controls should be moved to tuner drivers */
 		/* TODO: these controls should be moved to tuner drivers */
 		if (s->bandwidth_auto->val) {
 		if (s->bandwidth_auto->val) {
 			/* Round towards the closest legal value */
 			/* Round towards the closest legal value */
-			s32 val = s->f_adc + s->bandwidth->step / 2;
+			s32 val = s->f_adc + div_u64(s->bandwidth->step, 2);
 			u32 offset;
 			u32 offset;
 
 
 			val = clamp_t(s32, val, s->bandwidth->minimum,
 			val = clamp_t(s32, val, s->bandwidth->minimum,
 				      s->bandwidth->maximum);
 				      s->bandwidth->maximum);
 			offset = val - s->bandwidth->minimum;
 			offset = val - s->bandwidth->minimum;
 			offset = s->bandwidth->step *
 			offset = s->bandwidth->step *
-				(offset / s->bandwidth->step);
+				div_u64(offset, s->bandwidth->step);
 			s->bandwidth->val = s->bandwidth->minimum + offset;
 			s->bandwidth->val = s->bandwidth->minimum + offset;
 		}
 		}
-
 		c->bandwidth_hz = s->bandwidth->val;
 		c->bandwidth_hz = s->bandwidth->val;
 
 
 		if (!test_bit(POWER_ON, &s->flags))
 		if (!test_bit(POWER_ON, &s->flags))