[media] dvb: don't use DVBv3 bandwidth macros

+1 -3

drivers/media/common/tuners/mt2266.c

··· 150 150 case 6000000: 151 151 mt2266_writeregs(priv, mt2266_init_6mhz, 152 152 sizeof(mt2266_init_6mhz)); 153 - priv->bandwidth = BANDWIDTH_6_MHZ; 154 153 break; 155 154 case 8000000: 156 155 mt2266_writeregs(priv, mt2266_init_8mhz, 157 156 sizeof(mt2266_init_8mhz)); 158 - priv->bandwidth = BANDWIDTH_8_MHZ; 159 157 break; 160 158 case 7000000: 161 159 default: 162 160 mt2266_writeregs(priv, mt2266_init_7mhz, 163 161 sizeof(mt2266_init_7mhz)); 164 - priv->bandwidth = BANDWIDTH_7_MHZ; 165 162 break; 166 163 } 164 + priv->bandwidth = c->bandwidth_hz; 167 165 168 166 if (band == MT2266_VHF && priv->band == MT2266_UHF) { 169 167 dprintk("Switch from UHF to VHF");

+1 -4

drivers/media/common/tuners/mxl5007t.c

··· 625 625 enum mxl5007t_mode mode; 626 626 int ret; 627 627 u32 freq = c->frequency; 628 - u32 band = BANDWIDTH_6_MHZ; 629 628 630 629 switch (delsys) { 631 630 case SYS_ATSC: ··· 644 645 break; 645 646 case 7000000: 646 647 bw = MxL_BW_7MHz; 647 - band = BANDWIDTH_7_MHZ; 648 648 case 8000000: 649 649 bw = MxL_BW_8MHz; 650 - band = BANDWIDTH_8_MHZ; 651 650 default: 652 651 return -EINVAL; 653 652 } ··· 669 672 goto fail; 670 673 671 674 state->frequency = freq; 672 - state->bandwidth = band; 675 + state->bandwidth = c->bandwidth_hz; 673 676 fail: 674 677 mutex_unlock(&state->lock); 675 678

+1 -6

drivers/media/common/tuners/tda18271-fe.c

··· 934 934 u32 delsys = c->delivery_system; 935 935 u32 bw = c->bandwidth_hz; 936 936 u32 freq = c->frequency; 937 - u32 band = BANDWIDTH_6_MHZ; 938 937 struct tda18271_priv *priv = fe->tuner_priv; 939 938 struct tda18271_std_map *std_map = &priv->std; 940 939 struct tda18271_std_map_item *map; ··· 952 953 map = &std_map->dvbt_6; 953 954 } else if (bw <= 7000000) { 954 955 map = &std_map->dvbt_7; 955 - band = BANDWIDTH_7_MHZ; 956 956 } else { 957 957 map = &std_map->dvbt_8; 958 - band = BANDWIDTH_8_MHZ; 959 958 } 960 959 break; 961 960 case SYS_DVBC_ANNEX_B: ··· 965 968 map = &std_map->qam_6; 966 969 } else if (bw <= 7000000) { 967 970 map = &std_map->qam_7; 968 - band = BANDWIDTH_7_MHZ; 969 971 } else { 970 972 map = &std_map->qam_8; 971 - band = BANDWIDTH_8_MHZ; 972 973 } 973 974 break; 974 975 default: ··· 985 990 986 991 priv->if_freq = map->if_freq; 987 992 priv->frequency = freq; 988 - priv->bandwidth = band; 993 + priv->bandwidth = bw; 989 994 fail: 990 995 return ret; 991 996 }

+2 -12

drivers/media/common/tuners/tda827x.c

··· 158 158 struct tda827x_priv *priv = fe->tuner_priv; 159 159 u8 buf[14]; 160 160 int rc; 161 - u32 band; 162 161 163 162 struct i2c_msg msg = { .addr = priv->i2c_addr, .flags = 0, 164 163 .buf = buf, .len = sizeof(buf) }; ··· 167 168 dprintk("%s:\n", __func__); 168 169 if (c->bandwidth_hz == 0) { 169 170 if_freq = 5000000; 170 - band = BANDWIDTH_8_MHZ; 171 171 } else if (c->bandwidth_hz <= 6000000) { 172 172 if_freq = 4000000; 173 - band = BANDWIDTH_6_MHZ; 174 173 } else if (c->bandwidth_hz <= 7000000) { 175 174 if_freq = 4500000; 176 - band = BANDWIDTH_7_MHZ; 177 175 } else { /* 8 MHz */ 178 176 if_freq = 5000000; 179 - band = BANDWIDTH_8_MHZ; 180 177 } 181 178 tuner_freq = c->frequency; 182 179 ··· 219 224 goto err; 220 225 221 226 priv->frequency = c->frequency; 222 - priv->bandwidth = band; 227 + priv->bandwidth = c->bandwidth_hz; 223 228 224 229 return 0; 225 230 ··· 517 522 struct tda827x_priv *priv = fe->tuner_priv; 518 523 struct tda827xa_data *frequency_map = tda827xa_dvbt; 519 524 u8 buf[11]; 520 - u32 band; 521 525 522 526 struct i2c_msg msg = { .addr = priv->i2c_addr, .flags = 0, 523 527 .buf = buf, .len = sizeof(buf) }; ··· 531 537 532 538 if (c->bandwidth_hz == 0) { 533 539 if_freq = 5000000; 534 - band = BANDWIDTH_8_MHZ; 535 540 } else if (c->bandwidth_hz <= 6000000) { 536 541 if_freq = 4000000; 537 - band = BANDWIDTH_6_MHZ; 538 542 } else if (c->bandwidth_hz <= 7000000) { 539 543 if_freq = 4500000; 540 - band = BANDWIDTH_7_MHZ; 541 544 } else { /* 8 MHz */ 542 545 if_freq = 5000000; 543 - band = BANDWIDTH_8_MHZ; 544 546 } 545 547 tuner_freq = c->frequency; 546 548 ··· 642 652 goto err; 643 653 644 654 priv->frequency = c->frequency; 645 - priv->bandwidth = band; 655 + priv->bandwidth = c->bandwidth_hz; 646 656 647 657 return 0; 648 658

+1 -11

drivers/media/common/tuners/tuner-simple.c

··· 1028 1028 static int simple_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth) 1029 1029 { 1030 1030 struct tuner_simple_priv *priv = fe->tuner_priv; 1031 - switch (priv->bandwidth) { 1032 - case 6000000: 1033 - *bandwidth = BANDWIDTH_6_MHZ; 1034 - break; 1035 - case 7000000: 1036 - *bandwidth = BANDWIDTH_7_MHZ; 1037 - break; 1038 - case 8000000: 1039 - *bandwidth = BANDWIDTH_8_MHZ; 1040 - break; 1041 - } 1031 + *bandwidth = priv->bandwidth; 1042 1032 return 0; 1043 1033 } 1044 1034

+3 -8

drivers/media/common/tuners/xc4000.c

··· 1139 1139 dprintk(1, "%s() VSB modulation\n", __func__); 1140 1140 priv->rf_mode = XC_RF_MODE_AIR; 1141 1141 priv->freq_hz = c->frequency - 1750000; 1142 - priv->bandwidth = BANDWIDTH_6_MHZ; 1143 1142 priv->video_standard = XC4000_DTV6; 1144 1143 type = DTV6; 1145 1144 break; ··· 1146 1147 dprintk(1, "%s() QAM modulation\n", __func__); 1147 1148 priv->rf_mode = XC_RF_MODE_CABLE; 1148 1149 priv->freq_hz = c->frequency - 1750000; 1149 - priv->bandwidth = BANDWIDTH_6_MHZ; 1150 1150 priv->video_standard = XC4000_DTV6; 1151 1151 type = DTV6; 1152 1152 break; ··· 1154 1156 dprintk(1, "%s() OFDM\n", __func__); 1155 1157 if (bw == 0) { 1156 1158 if (c->frequency < 400000000) { 1157 - priv->bandwidth = BANDWIDTH_7_MHZ; 1158 1159 priv->freq_hz = c->frequency - 2250000; 1159 1160 } else { 1160 - priv->bandwidth = BANDWIDTH_8_MHZ; 1161 1161 priv->freq_hz = c->frequency - 2750000; 1162 1162 } 1163 1163 priv->video_standard = XC4000_DTV7_8; 1164 1164 type = DTV78; 1165 1165 } else if (bw <= 6000000) { 1166 - priv->bandwidth = BANDWIDTH_6_MHZ; 1167 1166 priv->video_standard = XC4000_DTV6; 1168 1167 priv->freq_hz = c->frequency - 1750000; 1169 1168 type = DTV6; 1170 1169 } else if (bw <= 7000000) { 1171 - priv->bandwidth = BANDWIDTH_7_MHZ; 1172 1170 priv->video_standard = XC4000_DTV7; 1173 1171 priv->freq_hz = c->frequency - 2250000; 1174 1172 type = DTV7; 1175 1173 } else { 1176 - priv->bandwidth = BANDWIDTH_8_MHZ; 1177 1174 priv->video_standard = XC4000_DTV8; 1178 1175 priv->freq_hz = c->frequency - 2750000; 1179 1176 type = DTV8; ··· 1187 1194 /* Make sure the correct firmware type is loaded */ 1188 1195 if (check_firmware(fe, type, 0, priv->if_khz) != 0) 1189 1196 goto fail; 1197 + 1198 + priv->bandwidth = c->bandwidth_hz; 1190 1199 1191 1200 ret = xc_set_signal_source(priv, priv->rf_mode); 1192 1201 if (ret != 0) { ··· 1586 1591 break; 1587 1592 case 1: 1588 1593 /* new tuner instance */ 1589 - priv->bandwidth = BANDWIDTH_6_MHZ; 1594 + priv->bandwidth = 6000000; 1590 1595 /* set default configuration */ 1591 1596 priv->if_khz = 4560; 1592 1597 priv->default_pm = 0;

+3 -9

drivers/media/common/tuners/xc5000.c

··· 650 650 dprintk(1, "%s() VSB modulation\n", __func__); 651 651 priv->rf_mode = XC_RF_MODE_AIR; 652 652 priv->freq_hz = freq - 1750000; 653 - priv->bandwidth = BANDWIDTH_6_MHZ; 654 653 priv->video_standard = DTV6; 655 654 break; 656 655 case SYS_DVBC_ANNEX_B: 657 656 dprintk(1, "%s() QAM modulation\n", __func__); 658 657 priv->rf_mode = XC_RF_MODE_CABLE; 659 658 priv->freq_hz = freq - 1750000; 660 - priv->bandwidth = BANDWIDTH_6_MHZ; 661 659 priv->video_standard = DTV6; 662 660 break; 663 661 case SYS_DVBT: ··· 663 665 dprintk(1, "%s() OFDM\n", __func__); 664 666 switch (bw) { 665 667 case 6000000: 666 - priv->bandwidth = BANDWIDTH_6_MHZ; 667 668 priv->video_standard = DTV6; 668 669 priv->freq_hz = freq - 1750000; 669 670 break; 670 671 case 7000000: 671 - priv->bandwidth = BANDWIDTH_7_MHZ; 672 672 priv->video_standard = DTV7; 673 673 priv->freq_hz = freq - 2250000; 674 674 break; 675 675 case 8000000: 676 - priv->bandwidth = BANDWIDTH_8_MHZ; 677 676 priv->video_standard = DTV8; 678 677 priv->freq_hz = freq - 2750000; 679 678 break; ··· 684 689 dprintk(1, "%s() QAM modulation\n", __func__); 685 690 priv->rf_mode = XC_RF_MODE_CABLE; 686 691 if (bw <= 6000000) { 687 - priv->bandwidth = BANDWIDTH_6_MHZ; 688 692 priv->video_standard = DTV6; 689 693 priv->freq_hz = freq - 1750000; 690 694 b = 6; 691 695 } else if (bw <= 7000000) { 692 - priv->bandwidth = BANDWIDTH_7_MHZ; 693 696 priv->video_standard = DTV7; 694 697 priv->freq_hz = freq - 2250000; 695 698 b = 7; 696 699 } else { 697 - priv->bandwidth = BANDWIDTH_8_MHZ; 698 700 priv->video_standard = DTV7_8; 699 701 priv->freq_hz = freq - 2750000; 700 702 b = 8; ··· 736 744 737 745 if (debug) 738 746 xc_debug_dump(priv); 747 + 748 + priv->bandwidth = bw; 739 749 740 750 return 0; 741 751 } ··· 1120 1126 break; 1121 1127 case 1: 1122 1128 /* new tuner instance */ 1123 - priv->bandwidth = BANDWIDTH_6_MHZ; 1129 + priv->bandwidth = 6000000; 1124 1130 fe->tuner_priv = priv; 1125 1131 break; 1126 1132 default:

+1 -4

drivers/media/dvb/dvb-usb/mxl111sf-tuner.c

··· 279 279 struct mxl111sf_tuner_state *state = fe->tuner_priv; 280 280 int ret; 281 281 u8 bw; 282 - u32 band = BANDWIDTH_6_MHZ; 283 282 284 283 mxl_dbg("()"); 285 284 ··· 296 297 break; 297 298 case 7000000: 298 299 bw = 7; 299 - band = BANDWIDTH_7_MHZ; 300 300 break; 301 301 case 8000000: 302 302 bw = 8; 303 - band = BANDWIDTH_8_MHZ; 304 303 break; 305 304 default: 306 305 err("%s: bandwidth not set!", __func__); ··· 314 317 goto fail; 315 318 316 319 state->frequency = c->frequency; 317 - state->bandwidth = band; 320 + state->bandwidth = c->bandwidth_hz; 318 321 fail: 319 322 return ret; 320 323 }

+1 -1

drivers/media/dvb/frontends/dib3000mb_priv.h

··· 98 98 int timing_offset; 99 99 int timing_offset_comp_done; 100 100 101 - fe_bandwidth_t last_tuned_bw; 101 + u32 last_tuned_bw; 102 102 u32 last_tuned_freq; 103 103 }; 104 104

+1 -6

drivers/media/dvb/frontends/dvb-pll.c

··· 635 635 } 636 636 637 637 priv->frequency = frequency; 638 - if (c->bandwidth_hz <= 6000000) 639 - priv->bandwidth = BANDWIDTH_6_MHZ; 640 - else if (c->bandwidth_hz <= 7000000) 641 - priv->bandwidth = BANDWIDTH_7_MHZ; 642 - if (c->bandwidth_hz <= 8000000) 643 - priv->bandwidth = BANDWIDTH_8_MHZ; 638 + priv->bandwidth = c->bandwidth_hz; 644 639 645 640 return 0; 646 641 }