aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dvb-usb
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2008-08-09 12:06:26 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 07:36:49 -0400
commita2dc86b69dcbcbeb498c5f5169f09f4bd207de5f (patch)
tree294b64a2b76004d3392d15918f4ab3f186575b43 /drivers/media/dvb/dvb-usb
parent8d79898897f8afee182febef18b96f559d32ebc4 (diff)
V4L/DVB (8655): cxusb: fix checkpatch warnings & errors
Fix the following checkpatch.pl errors and warnings: ERROR: do not use assignment in if condition 117: FILE: linux/drivers/media/dvb/dvb-usb/cxusb.c:819: + if ((adap->fe = dvb_attach(dib7000p_attach, ERROR: switch and case should be at the same indent 155: FILE: linux/drivers/media/dvb/dvb-usb/cxusb.c:857: + switch (band) { + case BAND_VHF: offset = 950; break; + case BAND_UHF: + default: offset = 550; break; WARNING: line over 80 characters 169: FILE: linux/drivers/media/dvb/dvb-usb/cxusb.c:871: + struct i2c_adapter *tun_i2c = dib7000p_get_i2c_master(adap->fe, DIBX000_I2C_INTERFACE_TUNER, 1); WARNING: line over 80 characters 213: FILE: linux/drivers/media/dvb/dvb-usb/cxusb.c:1342: +static struct dvb_usb_device_properties cxusb_bluebird_dualdig4_rev2_properties = { WARNING: line over 80 characters 226: FILE: linux/drivers/media/dvb/dvb-usb/cxusb.c:1355: + .size_of_priv = sizeof(struct dib0700_adapter_state), total: 2 errors, 3 warnings, 266 lines checked Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Cc: Anton Blanchard <anton@samba.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dvb-usb')
-rw-r--r--drivers/media/dvb/dvb-usb/cxusb.c27
1 files changed, 15 insertions, 12 deletions
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index 1de3678a294b..338c819ca739 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -816,9 +816,9 @@ static int cxusb_dualdig4_rev2_frontend_attach(struct dvb_usb_adapter *adap)
816 dib7000p_i2c_enumeration(&adap->dev->i2c_adap, 1, 18, 816 dib7000p_i2c_enumeration(&adap->dev->i2c_adap, 1, 18,
817 &cxusb_dualdig4_rev2_config); 817 &cxusb_dualdig4_rev2_config);
818 818
819 if ((adap->fe = dvb_attach(dib7000p_attach, 819 adap->fe = dvb_attach(dib7000p_attach, &adap->dev->i2c_adap, 0x80,
820 &adap->dev->i2c_adap, 0x80, 820 &cxusb_dualdig4_rev2_config);
821 &cxusb_dualdig4_rev2_config)) == NULL) 821 if (adap->fe == NULL)
822 return -EIO; 822 return -EIO;
823 823
824 return 0; 824 return 0;
@@ -855,9 +855,9 @@ static int dib7070_set_param_override(struct dvb_frontend *fe,
855 u16 offset; 855 u16 offset;
856 u8 band = BAND_OF_FREQUENCY(fep->frequency/1000); 856 u8 band = BAND_OF_FREQUENCY(fep->frequency/1000);
857 switch (band) { 857 switch (band) {
858 case BAND_VHF: offset = 950; break; 858 case BAND_VHF: offset = 950; break;
859 case BAND_UHF: 859 default:
860 default: offset = 550; break; 860 case BAND_UHF: offset = 550; break;
861 } 861 }
862 862
863 dib7000p_set_wbd_ref(fe, offset + dib0070_wbd_offset(fe)); 863 dib7000p_set_wbd_ref(fe, offset + dib0070_wbd_offset(fe));
@@ -868,7 +868,9 @@ static int dib7070_set_param_override(struct dvb_frontend *fe,
868static int cxusb_dualdig4_rev2_tuner_attach(struct dvb_usb_adapter *adap) 868static int cxusb_dualdig4_rev2_tuner_attach(struct dvb_usb_adapter *adap)
869{ 869{
870 struct dib0700_adapter_state *st = adap->priv; 870 struct dib0700_adapter_state *st = adap->priv;
871 struct i2c_adapter *tun_i2c = dib7000p_get_i2c_master(adap->fe, DIBX000_I2C_INTERFACE_TUNER, 1); 871 struct i2c_adapter *tun_i2c =
872 dib7000p_get_i2c_master(adap->fe,
873 DIBX000_I2C_INTERFACE_TUNER, 1);
872 874
873 if (dvb_attach(dib0070_attach, adap->fe, tun_i2c, 875 if (dvb_attach(dib0070_attach, adap->fe, tun_i2c,
874 &dib7070p_dib0070_config) == NULL) 876 &dib7070p_dib0070_config) == NULL)
@@ -1479,7 +1481,8 @@ static struct dvb_usb_device_properties cxusb_aver_a868r_properties = {
1479 } 1481 }
1480}; 1482};
1481 1483
1482static struct dvb_usb_device_properties cxusb_bluebird_dualdig4_rev2_properties = { 1484static
1485struct dvb_usb_device_properties cxusb_bluebird_dualdig4_rev2_properties = {
1483 .caps = DVB_USB_IS_AN_I2C_ADAPTER, 1486 .caps = DVB_USB_IS_AN_I2C_ADAPTER,
1484 1487
1485 .usb_ctrl = CYPRESS_FX2, 1488 .usb_ctrl = CYPRESS_FX2,
@@ -1489,10 +1492,10 @@ static struct dvb_usb_device_properties cxusb_bluebird_dualdig4_rev2_properties
1489 .num_adapters = 1, 1492 .num_adapters = 1,
1490 .adapter = { 1493 .adapter = {
1491 { 1494 {
1492 .streaming_ctrl = cxusb_streaming_ctrl, 1495 .streaming_ctrl = cxusb_streaming_ctrl,
1493 .frontend_attach = cxusb_dualdig4_rev2_frontend_attach, 1496 .frontend_attach = cxusb_dualdig4_rev2_frontend_attach,
1494 .tuner_attach = cxusb_dualdig4_rev2_tuner_attach, 1497 .tuner_attach = cxusb_dualdig4_rev2_tuner_attach,
1495 .size_of_priv = sizeof(struct dib0700_adapter_state), 1498 .size_of_priv = sizeof(struct dib0700_adapter_state),
1496 /* parameter for the MPEG2-data transfer */ 1499 /* parameter for the MPEG2-data transfer */
1497 .stream = { 1500 .stream = {
1498 .type = USB_BULK, 1501 .type = USB_BULK,