diff options
| -rw-r--r-- | drivers/media/usb/dvb-usb/dw2102.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c index 6d0dd859d684..a39d19e29f4c 100644 --- a/drivers/media/usb/dvb-usb/dw2102.c +++ b/drivers/media/usb/dvb-usb/dw2102.c | |||
| @@ -901,7 +901,7 @@ static int su3000_power_ctrl(struct dvb_usb_device *d, int i) | |||
| 901 | struct dw2102_state *state = (struct dw2102_state *)d->priv; | 901 | struct dw2102_state *state = (struct dw2102_state *)d->priv; |
| 902 | u8 obuf[] = {0xde, 0}; | 902 | u8 obuf[] = {0xde, 0}; |
| 903 | 903 | ||
| 904 | info("%s: %d, initialized %d\n", __func__, i, state->initialized); | 904 | info("%s: %d, initialized %d", __func__, i, state->initialized); |
| 905 | 905 | ||
| 906 | if (i && !state->initialized) { | 906 | if (i && !state->initialized) { |
| 907 | state->initialized = 1; | 907 | state->initialized = 1; |
| @@ -948,7 +948,7 @@ static int su3000_identify_state(struct usb_device *udev, | |||
| 948 | struct dvb_usb_device_description **desc, | 948 | struct dvb_usb_device_description **desc, |
| 949 | int *cold) | 949 | int *cold) |
| 950 | { | 950 | { |
| 951 | info("%s\n", __func__); | 951 | info("%s", __func__); |
| 952 | 952 | ||
| 953 | *cold = 0; | 953 | *cold = 0; |
| 954 | return 0; | 954 | return 0; |
| @@ -1186,7 +1186,7 @@ static int dw2104_frontend_attach(struct dvb_usb_adapter *d) | |||
| 1186 | tuner_ops->set_bandwidth = stb6100_set_bandw; | 1186 | tuner_ops->set_bandwidth = stb6100_set_bandw; |
| 1187 | tuner_ops->get_bandwidth = stb6100_get_bandw; | 1187 | tuner_ops->get_bandwidth = stb6100_get_bandw; |
| 1188 | d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage; | 1188 | d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage; |
| 1189 | info("Attached STV0900+STB6100!\n"); | 1189 | info("Attached STV0900+STB6100!"); |
| 1190 | return 0; | 1190 | return 0; |
| 1191 | } | 1191 | } |
| 1192 | } | 1192 | } |
| @@ -1200,7 +1200,7 @@ static int dw2104_frontend_attach(struct dvb_usb_adapter *d) | |||
| 1200 | &dw2104_stv6110_config, | 1200 | &dw2104_stv6110_config, |
| 1201 | &d->dev->i2c_adap)) { | 1201 | &d->dev->i2c_adap)) { |
| 1202 | d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage; | 1202 | d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage; |
| 1203 | info("Attached STV0900+STV6110A!\n"); | 1203 | info("Attached STV0900+STV6110A!"); |
| 1204 | return 0; | 1204 | return 0; |
| 1205 | } | 1205 | } |
| 1206 | } | 1206 | } |
| @@ -1211,7 +1211,7 @@ static int dw2104_frontend_attach(struct dvb_usb_adapter *d) | |||
| 1211 | &d->dev->i2c_adap); | 1211 | &d->dev->i2c_adap); |
| 1212 | if (d->fe_adap[0].fe != NULL) { | 1212 | if (d->fe_adap[0].fe != NULL) { |
| 1213 | d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage; | 1213 | d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage; |
| 1214 | info("Attached cx24116!\n"); | 1214 | info("Attached cx24116!"); |
| 1215 | return 0; | 1215 | return 0; |
| 1216 | } | 1216 | } |
| 1217 | } | 1217 | } |
| @@ -1222,7 +1222,7 @@ static int dw2104_frontend_attach(struct dvb_usb_adapter *d) | |||
| 1222 | dvb_attach(ts2020_attach, d->fe_adap[0].fe, | 1222 | dvb_attach(ts2020_attach, d->fe_adap[0].fe, |
| 1223 | &dw2104_ts2020_config, &d->dev->i2c_adap); | 1223 | &dw2104_ts2020_config, &d->dev->i2c_adap); |
| 1224 | d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage; | 1224 | d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage; |
| 1225 | info("Attached DS3000!\n"); | 1225 | info("Attached DS3000!"); |
| 1226 | return 0; | 1226 | return 0; |
| 1227 | } | 1227 | } |
| 1228 | 1228 | ||
| @@ -1241,7 +1241,7 @@ static int dw2102_frontend_attach(struct dvb_usb_adapter *d) | |||
| 1241 | &d->dev->i2c_adap); | 1241 | &d->dev->i2c_adap); |
| 1242 | if (d->fe_adap[0].fe != NULL) { | 1242 | if (d->fe_adap[0].fe != NULL) { |
| 1243 | d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage; | 1243 | d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage; |
| 1244 | info("Attached si21xx!\n"); | 1244 | info("Attached si21xx!"); |
| 1245 | return 0; | 1245 | return 0; |
| 1246 | } | 1246 | } |
| 1247 | } | 1247 | } |
| @@ -1253,7 +1253,7 @@ static int dw2102_frontend_attach(struct dvb_usb_adapter *d) | |||
| 1253 | if (dvb_attach(stb6000_attach, d->fe_adap[0].fe, 0x61, | 1253 | if (dvb_attach(stb6000_attach, d->fe_adap[0].fe, 0x61, |
| 1254 | &d->dev->i2c_adap)) { | 1254 | &d->dev->i2c_adap)) { |
| 1255 | d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage; | 1255 | d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage; |
| 1256 | info("Attached stv0288!\n"); | 1256 | info("Attached stv0288!"); |
| 1257 | return 0; | 1257 | return 0; |
| 1258 | } | 1258 | } |
| 1259 | } | 1259 | } |
| @@ -1265,7 +1265,7 @@ static int dw2102_frontend_attach(struct dvb_usb_adapter *d) | |||
| 1265 | &d->dev->i2c_adap); | 1265 | &d->dev->i2c_adap); |
| 1266 | if (d->fe_adap[0].fe != NULL) { | 1266 | if (d->fe_adap[0].fe != NULL) { |
| 1267 | d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage; | 1267 | d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage; |
| 1268 | info("Attached stv0299!\n"); | 1268 | info("Attached stv0299!"); |
| 1269 | return 0; | 1269 | return 0; |
| 1270 | } | 1270 | } |
| 1271 | } | 1271 | } |
| @@ -1277,7 +1277,7 @@ static int dw3101_frontend_attach(struct dvb_usb_adapter *d) | |||
| 1277 | d->fe_adap[0].fe = dvb_attach(tda10023_attach, &dw3101_tda10023_config, | 1277 | d->fe_adap[0].fe = dvb_attach(tda10023_attach, &dw3101_tda10023_config, |
| 1278 | &d->dev->i2c_adap, 0x48); | 1278 | &d->dev->i2c_adap, 0x48); |
| 1279 | if (d->fe_adap[0].fe != NULL) { | 1279 | if (d->fe_adap[0].fe != NULL) { |
| 1280 | info("Attached tda10023!\n"); | 1280 | info("Attached tda10023!"); |
| 1281 | return 0; | 1281 | return 0; |
| 1282 | } | 1282 | } |
| 1283 | return -EIO; | 1283 | return -EIO; |
| @@ -1291,7 +1291,7 @@ static int zl100313_frontend_attach(struct dvb_usb_adapter *d) | |||
| 1291 | if (dvb_attach(zl10039_attach, d->fe_adap[0].fe, 0x60, | 1291 | if (dvb_attach(zl10039_attach, d->fe_adap[0].fe, 0x60, |
| 1292 | &d->dev->i2c_adap)) { | 1292 | &d->dev->i2c_adap)) { |
| 1293 | d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage; | 1293 | d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage; |
| 1294 | info("Attached zl100313+zl10039!\n"); | 1294 | info("Attached zl100313+zl10039!"); |
| 1295 | return 0; | 1295 | return 0; |
| 1296 | } | 1296 | } |
| 1297 | } | 1297 | } |
| @@ -1316,7 +1316,7 @@ static int stv0288_frontend_attach(struct dvb_usb_adapter *d) | |||
| 1316 | 1316 | ||
| 1317 | dw210x_op_rw(d->dev->udev, 0x8a, 0, 0, obuf, 2, DW210X_WRITE_MSG); | 1317 | dw210x_op_rw(d->dev->udev, 0x8a, 0, 0, obuf, 2, DW210X_WRITE_MSG); |
| 1318 | 1318 | ||
| 1319 | info("Attached stv0288+stb6000!\n"); | 1319 | info("Attached stv0288+stb6000!"); |
| 1320 | 1320 | ||
| 1321 | return 0; | 1321 | return 0; |
| 1322 | 1322 | ||
| @@ -1341,7 +1341,7 @@ static int ds3000_frontend_attach(struct dvb_usb_adapter *d) | |||
| 1341 | 1341 | ||
| 1342 | dw210x_op_rw(d->dev->udev, 0x8a, 0, 0, obuf, 2, DW210X_WRITE_MSG); | 1342 | dw210x_op_rw(d->dev->udev, 0x8a, 0, 0, obuf, 2, DW210X_WRITE_MSG); |
| 1343 | 1343 | ||
| 1344 | info("Attached ds3000+ts2020!\n"); | 1344 | info("Attached ds3000+ts2020!"); |
| 1345 | 1345 | ||
| 1346 | return 0; | 1346 | return 0; |
| 1347 | } | 1347 | } |
| @@ -1359,7 +1359,7 @@ static int prof_7500_frontend_attach(struct dvb_usb_adapter *d) | |||
| 1359 | 1359 | ||
| 1360 | dw210x_op_rw(d->dev->udev, 0x8a, 0, 0, obuf, 2, DW210X_WRITE_MSG); | 1360 | dw210x_op_rw(d->dev->udev, 0x8a, 0, 0, obuf, 2, DW210X_WRITE_MSG); |
| 1361 | 1361 | ||
| 1362 | info("Attached STV0900+STB6100A!\n"); | 1362 | info("Attached STV0900+STB6100A!"); |
| 1363 | 1363 | ||
| 1364 | return 0; | 1364 | return 0; |
| 1365 | } | 1365 | } |
| @@ -1407,11 +1407,11 @@ static int su3000_frontend_attach(struct dvb_usb_adapter *d) | |||
| 1407 | if (dvb_attach(ts2020_attach, d->fe_adap[0].fe, | 1407 | if (dvb_attach(ts2020_attach, d->fe_adap[0].fe, |
| 1408 | &dw2104_ts2020_config, | 1408 | &dw2104_ts2020_config, |
| 1409 | &d->dev->i2c_adap)) { | 1409 | &d->dev->i2c_adap)) { |
| 1410 | info("Attached DS3000/TS2020!\n"); | 1410 | info("Attached DS3000/TS2020!"); |
| 1411 | return 0; | 1411 | return 0; |
| 1412 | } | 1412 | } |
| 1413 | 1413 | ||
| 1414 | info("Failed to attach DS3000/TS2020!\n"); | 1414 | info("Failed to attach DS3000/TS2020!"); |
| 1415 | return -EIO; | 1415 | return -EIO; |
| 1416 | } | 1416 | } |
| 1417 | 1417 | ||
| @@ -1456,12 +1456,12 @@ static int t220_frontend_attach(struct dvb_usb_adapter *d) | |||
| 1456 | if (d->fe_adap[0].fe != NULL) { | 1456 | if (d->fe_adap[0].fe != NULL) { |
| 1457 | if (dvb_attach(tda18271_attach, d->fe_adap[0].fe, 0x60, | 1457 | if (dvb_attach(tda18271_attach, d->fe_adap[0].fe, 0x60, |
| 1458 | &d->dev->i2c_adap, &tda18271_config)) { | 1458 | &d->dev->i2c_adap, &tda18271_config)) { |
| 1459 | info("Attached TDA18271HD/CXD2820R!\n"); | 1459 | info("Attached TDA18271HD/CXD2820R!"); |
| 1460 | return 0; | 1460 | return 0; |
| 1461 | } | 1461 | } |
| 1462 | } | 1462 | } |
| 1463 | 1463 | ||
| 1464 | info("Failed to attach TDA18271HD/CXD2820R!\n"); | 1464 | info("Failed to attach TDA18271HD/CXD2820R!"); |
| 1465 | return -EIO; | 1465 | return -EIO; |
| 1466 | } | 1466 | } |
| 1467 | 1467 | ||
| @@ -1482,11 +1482,11 @@ static int m88rs2000_frontend_attach(struct dvb_usb_adapter *d) | |||
| 1482 | if (dvb_attach(ts2020_attach, d->fe_adap[0].fe, | 1482 | if (dvb_attach(ts2020_attach, d->fe_adap[0].fe, |
| 1483 | &dw2104_ts2020_config, | 1483 | &dw2104_ts2020_config, |
| 1484 | &d->dev->i2c_adap)) { | 1484 | &d->dev->i2c_adap)) { |
| 1485 | info("Attached RS2000/TS2020!\n"); | 1485 | info("Attached RS2000/TS2020!"); |
| 1486 | return 0; | 1486 | return 0; |
| 1487 | } | 1487 | } |
| 1488 | 1488 | ||
| 1489 | info("Failed to attach RS2000/TS2020!\n"); | 1489 | info("Failed to attach RS2000/TS2020!"); |
| 1490 | return -EIO; | 1490 | return -EIO; |
| 1491 | } | 1491 | } |
| 1492 | 1492 | ||
