diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-12-26 18:02:28 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-12-31 07:22:49 -0500 |
commit | c6f56e7d794cba022353d464dfa3383d1b3e0125 (patch) | |
tree | 54414d0810e4f465a4107925092f8219695a3341 /drivers/media/common/tuners/tda18271-fe.c | |
parent | 88ab898f6639ca5a14943a882fbd141afc81fe90 (diff) |
[media] dvb: don't use DVBv3 bandwidth macros
Every frontend now uses DVBv5 way. So, let's not use the DVBv3
macros internally anymore.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/common/tuners/tda18271-fe.c')
-rw-r--r-- | drivers/media/common/tuners/tda18271-fe.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/media/common/tuners/tda18271-fe.c b/drivers/media/common/tuners/tda18271-fe.c index 53299b0a857c..d3d91ea9f1ac 100644 --- a/drivers/media/common/tuners/tda18271-fe.c +++ b/drivers/media/common/tuners/tda18271-fe.c | |||
@@ -934,7 +934,6 @@ static int tda18271_set_params(struct dvb_frontend *fe) | |||
934 | u32 delsys = c->delivery_system; | 934 | u32 delsys = c->delivery_system; |
935 | u32 bw = c->bandwidth_hz; | 935 | u32 bw = c->bandwidth_hz; |
936 | u32 freq = c->frequency; | 936 | u32 freq = c->frequency; |
937 | u32 band = BANDWIDTH_6_MHZ; | ||
938 | struct tda18271_priv *priv = fe->tuner_priv; | 937 | struct tda18271_priv *priv = fe->tuner_priv; |
939 | struct tda18271_std_map *std_map = &priv->std; | 938 | struct tda18271_std_map *std_map = &priv->std; |
940 | struct tda18271_std_map_item *map; | 939 | struct tda18271_std_map_item *map; |
@@ -953,10 +952,8 @@ static int tda18271_set_params(struct dvb_frontend *fe) | |||
953 | map = &std_map->dvbt_6; | 952 | map = &std_map->dvbt_6; |
954 | } else if (bw <= 7000000) { | 953 | } else if (bw <= 7000000) { |
955 | map = &std_map->dvbt_7; | 954 | map = &std_map->dvbt_7; |
956 | band = BANDWIDTH_7_MHZ; | ||
957 | } else { | 955 | } else { |
958 | map = &std_map->dvbt_8; | 956 | map = &std_map->dvbt_8; |
959 | band = BANDWIDTH_8_MHZ; | ||
960 | } | 957 | } |
961 | break; | 958 | break; |
962 | case SYS_DVBC_ANNEX_B: | 959 | case SYS_DVBC_ANNEX_B: |
@@ -968,10 +965,8 @@ static int tda18271_set_params(struct dvb_frontend *fe) | |||
968 | map = &std_map->qam_6; | 965 | map = &std_map->qam_6; |
969 | } else if (bw <= 7000000) { | 966 | } else if (bw <= 7000000) { |
970 | map = &std_map->qam_7; | 967 | map = &std_map->qam_7; |
971 | band = BANDWIDTH_7_MHZ; | ||
972 | } else { | 968 | } else { |
973 | map = &std_map->qam_8; | 969 | map = &std_map->qam_8; |
974 | band = BANDWIDTH_8_MHZ; | ||
975 | } | 970 | } |
976 | break; | 971 | break; |
977 | default: | 972 | default: |
@@ -990,7 +985,7 @@ static int tda18271_set_params(struct dvb_frontend *fe) | |||
990 | 985 | ||
991 | priv->if_freq = map->if_freq; | 986 | priv->if_freq = map->if_freq; |
992 | priv->frequency = freq; | 987 | priv->frequency = freq; |
993 | priv->bandwidth = band; | 988 | priv->bandwidth = bw; |
994 | fail: | 989 | fail: |
995 | return ret; | 990 | return ret; |
996 | } | 991 | } |