diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2006-08-08 14:48:08 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-26 10:53:40 -0400 |
commit | f7b54b1067bc0ccc6a2a2051f039ce630083f927 (patch) | |
tree | 9320e72a998547079c7d1f13d5ac16f3f87fb1bb /drivers/media/video/saa7134/saa7134-dvb.c | |
parent | 4ad8eee5ac8d8336ac7965e4a4027a7b4ec080f1 (diff) |
V4L/DVB (4439): Whitespace cleanups for cx88-dvb and saa7134-dvb
This patch cleans up some whitespace problems after the dvb_attach changes
in cx88-dvb.c and saa7134-dvb.c, and converts some capitalized i2c address
constants to lowercase.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-dvb.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-dvb.c | 89 |
1 files changed, 54 insertions, 35 deletions
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c index fc3cae340bec..b6881541e704 100644 --- a/drivers/media/video/saa7134/saa7134-dvb.c +++ b/drivers/media/video/saa7134/saa7134-dvb.c | |||
@@ -1049,7 +1049,7 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1049 | case SAA7134_BOARD_PINNACLE_300I_DVBT_PAL: | 1049 | case SAA7134_BOARD_PINNACLE_300I_DVBT_PAL: |
1050 | printk("%s: pinnacle 300i dvb setup\n",dev->name); | 1050 | printk("%s: pinnacle 300i dvb setup\n",dev->name); |
1051 | dev->dvb.frontend = dvb_attach(mt352_attach, &pinnacle_300i, | 1051 | dev->dvb.frontend = dvb_attach(mt352_attach, &pinnacle_300i, |
1052 | &dev->i2c_adap); | 1052 | &dev->i2c_adap); |
1053 | if (dev->dvb.frontend) { | 1053 | if (dev->dvb.frontend) { |
1054 | dev->dvb.frontend->ops.tuner_ops.set_params = mt352_pinnacle_tuner_set_params; | 1054 | dev->dvb.frontend->ops.tuner_ops.set_params = mt352_pinnacle_tuner_set_params; |
1055 | } | 1055 | } |
@@ -1057,14 +1057,15 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1057 | case SAA7134_BOARD_AVERMEDIA_777: | 1057 | case SAA7134_BOARD_AVERMEDIA_777: |
1058 | printk("%s: avertv 777 dvb setup\n",dev->name); | 1058 | printk("%s: avertv 777 dvb setup\n",dev->name); |
1059 | dev->dvb.frontend = dvb_attach(mt352_attach, &avermedia_777, | 1059 | dev->dvb.frontend = dvb_attach(mt352_attach, &avermedia_777, |
1060 | &dev->i2c_adap); | 1060 | &dev->i2c_adap); |
1061 | if (dev->dvb.frontend) { | 1061 | if (dev->dvb.frontend) { |
1062 | dev->dvb.frontend->ops.tuner_ops.calc_regs = mt352_aver777_tuner_calc_regs; | 1062 | dev->dvb.frontend->ops.tuner_ops.calc_regs = mt352_aver777_tuner_calc_regs; |
1063 | } | 1063 | } |
1064 | break; | 1064 | break; |
1065 | case SAA7134_BOARD_MD7134: | 1065 | case SAA7134_BOARD_MD7134: |
1066 | dev->dvb.frontend = dvb_attach(tda10046_attach, &medion_cardbus, | 1066 | dev->dvb.frontend = dvb_attach(tda10046_attach, |
1067 | &dev->i2c_adap); | 1067 | &medion_cardbus, |
1068 | &dev->i2c_adap); | ||
1068 | if (dev->dvb.frontend) { | 1069 | if (dev->dvb.frontend) { |
1069 | dev->dvb.frontend->ops.tuner_ops.init = philips_fmd1216_tuner_init; | 1070 | dev->dvb.frontend->ops.tuner_ops.init = philips_fmd1216_tuner_init; |
1070 | dev->dvb.frontend->ops.tuner_ops.sleep = philips_fmd1216_tuner_sleep; | 1071 | dev->dvb.frontend->ops.tuner_ops.sleep = philips_fmd1216_tuner_sleep; |
@@ -1072,16 +1073,18 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1072 | } | 1073 | } |
1073 | break; | 1074 | break; |
1074 | case SAA7134_BOARD_PHILIPS_TOUGH: | 1075 | case SAA7134_BOARD_PHILIPS_TOUGH: |
1075 | dev->dvb.frontend = dvb_attach(tda10046_attach, &philips_tu1216_60_config, | 1076 | dev->dvb.frontend = dvb_attach(tda10046_attach, |
1076 | &dev->i2c_adap); | 1077 | &philips_tu1216_60_config, |
1078 | &dev->i2c_adap); | ||
1077 | if (dev->dvb.frontend) { | 1079 | if (dev->dvb.frontend) { |
1078 | dev->dvb.frontend->ops.tuner_ops.init = philips_tu1216_tuner_60_init; | 1080 | dev->dvb.frontend->ops.tuner_ops.init = philips_tu1216_tuner_60_init; |
1079 | dev->dvb.frontend->ops.tuner_ops.set_params = philips_tu1216_tuner_60_set_params; | 1081 | dev->dvb.frontend->ops.tuner_ops.set_params = philips_tu1216_tuner_60_set_params; |
1080 | } | 1082 | } |
1081 | break; | 1083 | break; |
1082 | case SAA7134_BOARD_FLYDVBTDUO: | 1084 | case SAA7134_BOARD_FLYDVBTDUO: |
1083 | dev->dvb.frontend = dvb_attach(tda10046_attach, &tda827x_lifeview_config, | 1085 | dev->dvb.frontend = dvb_attach(tda10046_attach, |
1084 | &dev->i2c_adap); | 1086 | &tda827x_lifeview_config, |
1087 | &dev->i2c_adap); | ||
1085 | if (dev->dvb.frontend) { | 1088 | if (dev->dvb.frontend) { |
1086 | dev->dvb.frontend->ops.tuner_ops.init = philips_tda827x_tuner_init; | 1089 | dev->dvb.frontend->ops.tuner_ops.init = philips_tda827x_tuner_init; |
1087 | dev->dvb.frontend->ops.tuner_ops.sleep = philips_tda827x_tuner_sleep; | 1090 | dev->dvb.frontend->ops.tuner_ops.sleep = philips_tda827x_tuner_sleep; |
@@ -1089,8 +1092,9 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1089 | } | 1092 | } |
1090 | break; | 1093 | break; |
1091 | case SAA7134_BOARD_FLYDVBT_DUO_CARDBUS: | 1094 | case SAA7134_BOARD_FLYDVBT_DUO_CARDBUS: |
1092 | dev->dvb.frontend = dvb_attach(tda10046_attach, &tda827x_lifeview_config, | 1095 | dev->dvb.frontend = dvb_attach(tda10046_attach, |
1093 | &dev->i2c_adap); | 1096 | &tda827x_lifeview_config, |
1097 | &dev->i2c_adap); | ||
1094 | if (dev->dvb.frontend) { | 1098 | if (dev->dvb.frontend) { |
1095 | dev->dvb.frontend->ops.tuner_ops.init = philips_tda827x_tuner_init; | 1099 | dev->dvb.frontend->ops.tuner_ops.init = philips_tda827x_tuner_init; |
1096 | dev->dvb.frontend->ops.tuner_ops.sleep = philips_tda827x_tuner_sleep; | 1100 | dev->dvb.frontend->ops.tuner_ops.sleep = philips_tda827x_tuner_sleep; |
@@ -1098,8 +1102,9 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1098 | } | 1102 | } |
1099 | break; | 1103 | break; |
1100 | case SAA7134_BOARD_PHILIPS_EUROPA: | 1104 | case SAA7134_BOARD_PHILIPS_EUROPA: |
1101 | dev->dvb.frontend = dvb_attach(tda10046_attach, &philips_europa_config, | 1105 | dev->dvb.frontend = dvb_attach(tda10046_attach, |
1102 | &dev->i2c_adap); | 1106 | &philips_europa_config, |
1107 | &dev->i2c_adap); | ||
1103 | if (dev->dvb.frontend) { | 1108 | if (dev->dvb.frontend) { |
1104 | dev->original_demod_sleep = dev->dvb.frontend->ops.sleep; | 1109 | dev->original_demod_sleep = dev->dvb.frontend->ops.sleep; |
1105 | dev->dvb.frontend->ops.sleep = philips_europa_demod_sleep; | 1110 | dev->dvb.frontend->ops.sleep = philips_europa_demod_sleep; |
@@ -1109,8 +1114,9 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1109 | } | 1114 | } |
1110 | break; | 1115 | break; |
1111 | case SAA7134_BOARD_VIDEOMATE_DVBT_300: | 1116 | case SAA7134_BOARD_VIDEOMATE_DVBT_300: |
1112 | dev->dvb.frontend = dvb_attach(tda10046_attach, &philips_europa_config, | 1117 | dev->dvb.frontend = dvb_attach(tda10046_attach, |
1113 | &dev->i2c_adap); | 1118 | &philips_europa_config, |
1119 | &dev->i2c_adap); | ||
1114 | if (dev->dvb.frontend) { | 1120 | if (dev->dvb.frontend) { |
1115 | dev->dvb.frontend->ops.tuner_ops.init = philips_europa_tuner_init; | 1121 | dev->dvb.frontend->ops.tuner_ops.init = philips_europa_tuner_init; |
1116 | dev->dvb.frontend->ops.tuner_ops.sleep = philips_europa_tuner_sleep; | 1122 | dev->dvb.frontend->ops.tuner_ops.sleep = philips_europa_tuner_sleep; |
@@ -1118,16 +1124,18 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1118 | } | 1124 | } |
1119 | break; | 1125 | break; |
1120 | case SAA7134_BOARD_VIDEOMATE_DVBT_200: | 1126 | case SAA7134_BOARD_VIDEOMATE_DVBT_200: |
1121 | dev->dvb.frontend = dvb_attach(tda10046_attach, &philips_tu1216_61_config, | 1127 | dev->dvb.frontend = dvb_attach(tda10046_attach, |
1122 | &dev->i2c_adap); | 1128 | &philips_tu1216_61_config, |
1129 | &dev->i2c_adap); | ||
1123 | if (dev->dvb.frontend) { | 1130 | if (dev->dvb.frontend) { |
1124 | dev->dvb.frontend->ops.tuner_ops.init = philips_tu1216_tuner_61_init; | 1131 | dev->dvb.frontend->ops.tuner_ops.init = philips_tu1216_tuner_61_init; |
1125 | dev->dvb.frontend->ops.tuner_ops.set_params = philips_tu1216_tuner_61_set_params; | 1132 | dev->dvb.frontend->ops.tuner_ops.set_params = philips_tu1216_tuner_61_set_params; |
1126 | } | 1133 | } |
1127 | break; | 1134 | break; |
1128 | case SAA7134_BOARD_PHILIPS_TIGER: | 1135 | case SAA7134_BOARD_PHILIPS_TIGER: |
1129 | dev->dvb.frontend = dvb_attach(tda10046_attach, &philips_tiger_config, | 1136 | dev->dvb.frontend = dvb_attach(tda10046_attach, |
1130 | &dev->i2c_adap); | 1137 | &philips_tiger_config, |
1138 | &dev->i2c_adap); | ||
1131 | if (dev->dvb.frontend) { | 1139 | if (dev->dvb.frontend) { |
1132 | dev->dvb.frontend->ops.tuner_ops.init = philips_tiger_tuner_init; | 1140 | dev->dvb.frontend->ops.tuner_ops.init = philips_tiger_tuner_init; |
1133 | dev->dvb.frontend->ops.tuner_ops.sleep = philips_tiger_tuner_sleep; | 1141 | dev->dvb.frontend->ops.tuner_ops.sleep = philips_tiger_tuner_sleep; |
@@ -1135,8 +1143,9 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1135 | } | 1143 | } |
1136 | break; | 1144 | break; |
1137 | case SAA7134_BOARD_ASUSTeK_P7131_DUAL: | 1145 | case SAA7134_BOARD_ASUSTeK_P7131_DUAL: |
1138 | dev->dvb.frontend = dvb_attach(tda10046_attach, &philips_tiger_config, | 1146 | dev->dvb.frontend = dvb_attach(tda10046_attach, |
1139 | &dev->i2c_adap); | 1147 | &philips_tiger_config, |
1148 | &dev->i2c_adap); | ||
1140 | if (dev->dvb.frontend) { | 1149 | if (dev->dvb.frontend) { |
1141 | dev->dvb.frontend->ops.tuner_ops.init = philips_tiger_tuner_init; | 1150 | dev->dvb.frontend->ops.tuner_ops.init = philips_tiger_tuner_init; |
1142 | dev->dvb.frontend->ops.tuner_ops.sleep = philips_tiger_tuner_sleep; | 1151 | dev->dvb.frontend->ops.tuner_ops.sleep = philips_tiger_tuner_sleep; |
@@ -1144,8 +1153,9 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1144 | } | 1153 | } |
1145 | break; | 1154 | break; |
1146 | case SAA7134_BOARD_FLYDVBT_LR301: | 1155 | case SAA7134_BOARD_FLYDVBT_LR301: |
1147 | dev->dvb.frontend = dvb_attach(tda10046_attach, &tda827x_lifeview_config, | 1156 | dev->dvb.frontend = dvb_attach(tda10046_attach, |
1148 | &dev->i2c_adap); | 1157 | &tda827x_lifeview_config, |
1158 | &dev->i2c_adap); | ||
1149 | if (dev->dvb.frontend) { | 1159 | if (dev->dvb.frontend) { |
1150 | dev->dvb.frontend->ops.tuner_ops.init = philips_tda827x_tuner_init; | 1160 | dev->dvb.frontend->ops.tuner_ops.init = philips_tda827x_tuner_init; |
1151 | dev->dvb.frontend->ops.tuner_ops.sleep = philips_tda827x_tuner_sleep; | 1161 | dev->dvb.frontend->ops.tuner_ops.sleep = philips_tda827x_tuner_sleep; |
@@ -1153,16 +1163,18 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1153 | } | 1163 | } |
1154 | break; | 1164 | break; |
1155 | case SAA7134_BOARD_FLYDVB_TRIO: | 1165 | case SAA7134_BOARD_FLYDVB_TRIO: |
1156 | dev->dvb.frontend = dvb_attach(tda10046_attach, &lifeview_trio_config, | 1166 | dev->dvb.frontend = dvb_attach(tda10046_attach, |
1157 | &dev->i2c_adap); | 1167 | &lifeview_trio_config, |
1168 | &dev->i2c_adap); | ||
1158 | if (dev->dvb.frontend) { | 1169 | if (dev->dvb.frontend) { |
1159 | dev->dvb.frontend->ops.tuner_ops.sleep = lifeview_trio_tuner_sleep; | 1170 | dev->dvb.frontend->ops.tuner_ops.sleep = lifeview_trio_tuner_sleep; |
1160 | dev->dvb.frontend->ops.tuner_ops.set_params = lifeview_trio_tuner_set_params; | 1171 | dev->dvb.frontend->ops.tuner_ops.set_params = lifeview_trio_tuner_set_params; |
1161 | } | 1172 | } |
1162 | break; | 1173 | break; |
1163 | case SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331: | 1174 | case SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331: |
1164 | dev->dvb.frontend = dvb_attach(tda10046_attach, &ads_tech_duo_config, | 1175 | dev->dvb.frontend = dvb_attach(tda10046_attach, |
1165 | &dev->i2c_adap); | 1176 | &ads_tech_duo_config, |
1177 | &dev->i2c_adap); | ||
1166 | if (dev->dvb.frontend) { | 1178 | if (dev->dvb.frontend) { |
1167 | dev->dvb.frontend->ops.tuner_ops.init = ads_duo_tuner_init; | 1179 | dev->dvb.frontend->ops.tuner_ops.init = ads_duo_tuner_init; |
1168 | dev->dvb.frontend->ops.tuner_ops.sleep = ads_duo_tuner_sleep; | 1180 | dev->dvb.frontend->ops.tuner_ops.sleep = ads_duo_tuner_sleep; |
@@ -1170,16 +1182,18 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1170 | } | 1182 | } |
1171 | break; | 1183 | break; |
1172 | case SAA7134_BOARD_TEVION_DVBT_220RF: | 1184 | case SAA7134_BOARD_TEVION_DVBT_220RF: |
1173 | dev->dvb.frontend = dvb_attach(tda10046_attach, &tevion_dvbt220rf_config, | 1185 | dev->dvb.frontend = dvb_attach(tda10046_attach, |
1174 | &dev->i2c_adap); | 1186 | &tevion_dvbt220rf_config, |
1187 | &dev->i2c_adap); | ||
1175 | if (dev->dvb.frontend) { | 1188 | if (dev->dvb.frontend) { |
1176 | dev->dvb.frontend->ops.tuner_ops.sleep = tevion_dvb220rf_tuner_sleep; | 1189 | dev->dvb.frontend->ops.tuner_ops.sleep = tevion_dvb220rf_tuner_sleep; |
1177 | dev->dvb.frontend->ops.tuner_ops.set_params = tevion_dvb220rf_tuner_set_params; | 1190 | dev->dvb.frontend->ops.tuner_ops.set_params = tevion_dvb220rf_tuner_set_params; |
1178 | } | 1191 | } |
1179 | break; | 1192 | break; |
1180 | case SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS: | 1193 | case SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS: |
1181 | dev->dvb.frontend = dvb_attach(tda10046_attach, &ads_tech_duo_config, | 1194 | dev->dvb.frontend = dvb_attach(tda10046_attach, |
1182 | &dev->i2c_adap); | 1195 | &ads_tech_duo_config, |
1196 | &dev->i2c_adap); | ||
1183 | if (dev->dvb.frontend) { | 1197 | if (dev->dvb.frontend) { |
1184 | dev->dvb.frontend->ops.tuner_ops.init = ads_duo_tuner_init; | 1198 | dev->dvb.frontend->ops.tuner_ops.init = ads_duo_tuner_init; |
1185 | dev->dvb.frontend->ops.tuner_ops.sleep = ads_duo_tuner_sleep; | 1199 | dev->dvb.frontend->ops.tuner_ops.sleep = ads_duo_tuner_sleep; |
@@ -1196,26 +1210,31 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1196 | } | 1210 | } |
1197 | break; | 1211 | break; |
1198 | case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180: | 1212 | case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180: |
1199 | dev->dvb.frontend = dvb_attach(nxt200x_attach, &avertvhda180, &dev->i2c_adap); | 1213 | dev->dvb.frontend = dvb_attach(nxt200x_attach, &avertvhda180, |
1214 | &dev->i2c_adap); | ||
1200 | if (dev->dvb.frontend) { | 1215 | if (dev->dvb.frontend) { |
1201 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, | 1216 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, |
1202 | NULL, &dvb_pll_tdhu2); | 1217 | NULL, &dvb_pll_tdhu2); |
1203 | } | 1218 | } |
1204 | break; | 1219 | break; |
1205 | case SAA7134_BOARD_KWORLD_ATSC110: | 1220 | case SAA7134_BOARD_KWORLD_ATSC110: |
1206 | dev->dvb.frontend = dvb_attach(nxt200x_attach, &kworldatsc110, &dev->i2c_adap); | 1221 | dev->dvb.frontend = dvb_attach(nxt200x_attach, &kworldatsc110, |
1222 | &dev->i2c_adap); | ||
1207 | if (dev->dvb.frontend) { | 1223 | if (dev->dvb.frontend) { |
1208 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, | 1224 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, |
1209 | NULL, &dvb_pll_tuv1236d); | 1225 | NULL, &dvb_pll_tuv1236d); |
1210 | } | 1226 | } |
1211 | break; | 1227 | break; |
1212 | case SAA7134_BOARD_FLYDVBS_LR300: | 1228 | case SAA7134_BOARD_FLYDVBS_LR300: |
1213 | dev->dvb.frontend = dvb_attach(tda10086_attach, &flydvbs, &dev->i2c_adap); | 1229 | dev->dvb.frontend = dvb_attach(tda10086_attach, &flydvbs, |
1230 | &dev->i2c_adap); | ||
1214 | if (dev->dvb.frontend) { | 1231 | if (dev->dvb.frontend) { |
1215 | if (dvb_attach(tda826x_attach, dev->dvb.frontend, 0x60, &dev->i2c_adap, 0) == NULL) { | 1232 | if (dvb_attach(tda826x_attach, dev->dvb.frontend, 0x60, |
1233 | &dev->i2c_adap, 0) == NULL) { | ||
1216 | printk("%s: No tda826x found!\n", __FUNCTION__); | 1234 | printk("%s: No tda826x found!\n", __FUNCTION__); |
1217 | } | 1235 | } |
1218 | if (dvb_attach(isl6421_attach, dev->dvb.frontend, &dev->i2c_adap, 0x08, 0, 0) == NULL) { | 1236 | if (dvb_attach(isl6421_attach, dev->dvb.frontend, |
1237 | &dev->i2c_adap, 0x08, 0, 0) == NULL) { | ||
1219 | printk("%s: No ISL6421 found!\n", __FUNCTION__); | 1238 | printk("%s: No ISL6421 found!\n", __FUNCTION__); |
1220 | } | 1239 | } |
1221 | } | 1240 | } |