diff options
Diffstat (limited to 'drivers/media/dvb/frontends/stb0899_algo.c')
| -rw-r--r-- | drivers/media/dvb/frontends/stb0899_algo.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/dvb/frontends/stb0899_algo.c b/drivers/media/dvb/frontends/stb0899_algo.c index a67d1775a43..2da55ec2039 100644 --- a/drivers/media/dvb/frontends/stb0899_algo.c +++ b/drivers/media/dvb/frontends/stb0899_algo.c | |||
| @@ -156,7 +156,7 @@ static void stb0899_first_subrange(struct stb0899_state *state) | |||
| 156 | } | 156 | } |
| 157 | 157 | ||
| 158 | if (range > 0) | 158 | if (range > 0) |
| 159 | internal->sub_range = MIN(internal->srch_range, range); | 159 | internal->sub_range = min(internal->srch_range, range); |
| 160 | else | 160 | else |
| 161 | internal->sub_range = 0; | 161 | internal->sub_range = 0; |
| 162 | 162 | ||
| @@ -185,7 +185,7 @@ static enum stb0899_status stb0899_check_tmg(struct stb0899_state *state) | |||
| 185 | timing = stb0899_read_reg(state, STB0899_RTF); | 185 | timing = stb0899_read_reg(state, STB0899_RTF); |
| 186 | 186 | ||
| 187 | if (lock >= 42) { | 187 | if (lock >= 42) { |
| 188 | if ((lock > 48) && (ABS(timing) >= 110)) { | 188 | if ((lock > 48) && (abs(timing) >= 110)) { |
| 189 | internal->status = ANALOGCARRIER; | 189 | internal->status = ANALOGCARRIER; |
| 190 | dprintk(state->verbose, FE_DEBUG, 1, "-->ANALOG Carrier !"); | 190 | dprintk(state->verbose, FE_DEBUG, 1, "-->ANALOG Carrier !"); |
| 191 | } else { | 191 | } else { |
| @@ -222,7 +222,7 @@ static enum stb0899_status stb0899_search_tmg(struct stb0899_state *state) | |||
| 222 | index++; | 222 | index++; |
| 223 | derot_freq += index * internal->direction * derot_step; /* next derot zig zag position */ | 223 | derot_freq += index * internal->direction * derot_step; /* next derot zig zag position */ |
| 224 | 224 | ||
| 225 | if (ABS(derot_freq) > derot_limit) | 225 | if (abs(derot_freq) > derot_limit) |
| 226 | next_loop--; | 226 | next_loop--; |
| 227 | 227 | ||
| 228 | if (next_loop) { | 228 | if (next_loop) { |
| @@ -298,7 +298,7 @@ static enum stb0899_status stb0899_search_carrier(struct stb0899_state *state) | |||
| 298 | last_derot_freq = derot_freq; | 298 | last_derot_freq = derot_freq; |
| 299 | derot_freq += index * internal->direction * internal->derot_step; /* next zig zag derotator position */ | 299 | derot_freq += index * internal->direction * internal->derot_step; /* next zig zag derotator position */ |
| 300 | 300 | ||
| 301 | if(ABS(derot_freq) > derot_limit) | 301 | if(abs(derot_freq) > derot_limit) |
| 302 | next_loop--; | 302 | next_loop--; |
| 303 | 303 | ||
| 304 | if (next_loop) { | 304 | if (next_loop) { |
| @@ -400,7 +400,7 @@ static enum stb0899_status stb0899_search_data(struct stb0899_state *state) | |||
| 400 | if ((internal->status != CARRIEROK) || (stb0899_check_data(state) != DATAOK)) { | 400 | if ((internal->status != CARRIEROK) || (stb0899_check_data(state) != DATAOK)) { |
| 401 | 401 | ||
| 402 | derot_freq += index * internal->direction * derot_step; /* next zig zag derotator position */ | 402 | derot_freq += index * internal->direction * derot_step; /* next zig zag derotator position */ |
| 403 | if (ABS(derot_freq) > derot_limit) | 403 | if (abs(derot_freq) > derot_limit) |
| 404 | next_loop--; | 404 | next_loop--; |
| 405 | 405 | ||
| 406 | if (next_loop) { | 406 | if (next_loop) { |
| @@ -467,7 +467,7 @@ static void next_sub_range(struct stb0899_state *state) | |||
| 467 | 467 | ||
| 468 | if (internal->sub_dir > 0) { | 468 | if (internal->sub_dir > 0) { |
| 469 | old_sub_range = internal->sub_range; | 469 | old_sub_range = internal->sub_range; |
| 470 | internal->sub_range = MIN((internal->srch_range / 2) - | 470 | internal->sub_range = min((internal->srch_range / 2) - |
| 471 | (internal->tuner_offst + internal->sub_range / 2), | 471 | (internal->tuner_offst + internal->sub_range / 2), |
| 472 | internal->sub_range); | 472 | internal->sub_range); |
| 473 | 473 | ||
| @@ -771,7 +771,7 @@ static long Log2Int(int number) | |||
| 771 | int i; | 771 | int i; |
| 772 | 772 | ||
| 773 | i = 0; | 773 | i = 0; |
| 774 | while ((1 << i) <= ABS(number)) | 774 | while ((1 << i) <= abs(number)) |
| 775 | i++; | 775 | i++; |
| 776 | 776 | ||
| 777 | if (number == 0) | 777 | if (number == 0) |
