Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7aa92c42 authored by Dan Gopstein's avatar Dan Gopstein Committed by Mauro Carvalho Chehab
Browse files

media: ABS macro parameter parenthesization 



Replace usages of the locally defined ABS() macro with calls to the
canonical abs() from kernel.h and remove the old definitions of ABS()

This change was originally motivated by two local definitions of the
ABS (absolute value) macro that fail to parenthesize their parameter
properly. This can lead to a bad expansion for low-precedence
expression arguments.

For example: ABS(1-2) currently expands to ((1-2) < 0 ? (-1-2) : (1-2))
which evaluates to -3. But the correct expansion would be
((1-2) < 0 ? -(1-2) : (1-2)) which evaluates to 1.

Signed-off-by: default avatarDan Gopstein <dgopstein@nyu.edu>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 62474660

drivers/media/dvb-frontends/dib0090.c

+2 −2
Original line number Diff line number Diff line
@@ -1285,7 +1285,7 @@ int dib0090_gain_control(struct dvb_frontend *fe) 
#endif



			if (*tune_state == CT_AGC_STEP_1) {	/* quickly go to the correct range of the ADC power */

				if (ABS(adc_error) < 50 || state->agc_step++ > 5) {

				if (abs(adc_error) < 50 || state->agc_step++ > 5) {



#ifdef CONFIG_STANDARD_DAB

					if (state->fe->dtv_property_cache.delivery_system == STANDARD_DAB) {
@@ -1754,7 +1754,7 @@ static int dib0090_dc_offset_calibration(struct dib0090_state *state, enum front 
			*tune_state = CT_TUNER_STEP_1;

		} else {

			/* the minimum was what we have seen in the step before */

			if (ABS(state->adc_diff) > ABS(state->min_adc_diff)) {

			if (abs(state->adc_diff) > abs(state->min_adc_diff)) {

				dprintk("Since adc_diff N = %d  > adc_diff step N-1 = %d, Come back one step\n", state->adc_diff, state->min_adc_diff);

				state->step--;

			}

drivers/media/dvb-frontends/dib7000p.c

+1 −1
Original line number Diff line number Diff line
@@ -809,7 +809,7 @@ static int dib7000p_set_dds(struct dib7000p_state *state, s32 offset_khz) 
{

	u32 internal = dib7000p_get_internal_freq(state);

	s32 unit_khz_dds_val;

	u32 abs_offset_khz = ABS(offset_khz);

	u32 abs_offset_khz = abs(offset_khz);

	u32 dds = state->cfg.bw->ifreq & 0x1ffffff;

	u8 invert = !!(state->cfg.bw->ifreq & (1 << 25));

	if (internal == 0) {

drivers/media/dvb-frontends/dib8000.c

+1 −1
Original line number Diff line number Diff line
@@ -2677,7 +2677,7 @@ static void dib8000_viterbi_state(struct dib8000_state *state, u8 onoff) 
static void dib8000_set_dds(struct dib8000_state *state, s32 offset_khz)

{

	s16 unit_khz_dds_val;

	u32 abs_offset_khz = ABS(offset_khz);

	u32 abs_offset_khz = abs(offset_khz);

	u32 dds = state->cfg.pll->ifreq & 0x1ffffff;

	u8 invert = !!(state->cfg.pll->ifreq & (1 << 25));

	u8 ratio;

drivers/media/dvb-frontends/dibx000_common.h

+0 −2
Original line number Diff line number Diff line
@@ -223,8 +223,6 @@ struct dvb_frontend_parametersContext { 


#define FE_CALLBACK_TIME_NEVER 0xffffffff



#define ABS(x) ((x < 0) ? (-x) : (x))



#define DATA_BUS_ACCESS_MODE_8BIT                 0x01

#define DATA_BUS_ACCESS_MODE_16BIT                0x02

#define DATA_BUS_ACCESS_MODE_NO_ADDRESS_INCREMENT 0x10

drivers/media/dvb-frontends/mb86a16.c

+3 −5
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ 
static unsigned int verbose = 5;

module_param(verbose, int, 0644);



#define ABS(x)		((x) < 0 ? (-x) : (x))



struct mb86a16_state {

	struct i2c_adapter		*i2c_adap;

	const struct mb86a16_config	*config;
@@ -1202,12 +1200,12 @@ static int mb86a16_set_fe(struct mb86a16_state *state) 


			signal_dupl = 0;

			for (j = 0; j < prev_freq_num; j++) {

				if ((ABS(prev_swp_freq[j] - swp_freq)) < (swp_ofs * 3 / 2)) {

				if ((abs(prev_swp_freq[j] - swp_freq)) < (swp_ofs * 3 / 2)) {

					signal_dupl = 1;

					dprintk(verbose, MB86A16_INFO, 1, "Probably Duplicate Signal, j = %d", j);

				}

			}

			if ((signal_dupl == 0) && (swp_freq > 0) && (ABS(swp_freq - state->frequency * 1000) < fcp + state->srate / 6)) {

			if ((signal_dupl == 0) && (swp_freq > 0) && (abs(swp_freq - state->frequency * 1000) < fcp + state->srate / 6)) {

				dprintk(verbose, MB86A16_DEBUG, 1, "------ Signal detect ------ [swp_freq=[%07d, srate=%05d]]", swp_freq, state->srate);

				prev_swp_freq[prev_freq_num] = swp_freq;

				prev_freq_num++;
@@ -1381,7 +1379,7 @@ static int mb86a16_set_fe(struct mb86a16_state *state) 
			dprintk(verbose, MB86A16_INFO, 1, "SWEEP Frequency = %d", swp_freq);

			swp_freq += delta_freq;

			dprintk(verbose, MB86A16_INFO, 1, "Adjusting .., DELTA Freq = %d, SWEEP Freq=%d", delta_freq, swp_freq);

			if (ABS(state->frequency * 1000 - swp_freq) > 3800) {

			if (abs(state->frequency * 1000 - swp_freq) > 3800) {

				dprintk(verbose, MB86A16_INFO, 1, "NO  --  SIGNAL !");

			} else {