aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2014-08-09 13:49:46 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-09-21 16:26:42 -0400
commitc10989a2a86aa8f6eff9115f67bab55304e2dd0d (patch)
tree23c001b4dffa17468efb2944ffc53e18ba979a2a
parentb619ff7ab484ace964b97dacc7e6c78c0e6228aa (diff)
[media] af9035: make checkpatch.pl happy
Correct issues reported by checkpatch.pl. Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/usb/dvb-usb-v2/af9035.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c
index 85f2c4bdef98..f37cf7da8c1d 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.c
+++ b/drivers/media/usb/dvb-usb-v2/af9035.c
@@ -536,6 +536,7 @@ static int af9035_download_firmware(struct dvb_usb_device *d,
536 u8 tmp; 536 u8 tmp;
537 struct usb_req req = { 0, 0, 0, NULL, 0, NULL }; 537 struct usb_req req = { 0, 0, 0, NULL, 0, NULL };
538 struct usb_req req_fw_ver = { CMD_FW_QUERYINFO, 0, 1, wbuf, 4, rbuf }; 538 struct usb_req req_fw_ver = { CMD_FW_QUERYINFO, 0, 1, wbuf, 4, rbuf };
539
539 dev_dbg(&d->udev->dev, "%s:\n", __func__); 540 dev_dbg(&d->udev->dev, "%s:\n", __func__);
540 541
541 /* 542 /*
@@ -974,6 +975,7 @@ static int af9035_frontend_callback(void *adapter_priv, int component,
974static int af9035_get_adapter_count(struct dvb_usb_device *d) 975static int af9035_get_adapter_count(struct dvb_usb_device *d)
975{ 976{
976 struct state *state = d_to_priv(d); 977 struct state *state = d_to_priv(d);
978
977 return state->dual_mode + 1; 979 return state->dual_mode + 1;
978} 980}
979 981
@@ -982,6 +984,7 @@ static int af9035_frontend_attach(struct dvb_usb_adapter *adap)
982 struct state *state = adap_to_priv(adap); 984 struct state *state = adap_to_priv(adap);
983 struct dvb_usb_device *d = adap_to_d(adap); 985 struct dvb_usb_device *d = adap_to_d(adap);
984 int ret; 986 int ret;
987
985 dev_dbg(&d->udev->dev, "%s:\n", __func__); 988 dev_dbg(&d->udev->dev, "%s:\n", __func__);
986 989
987 if (!state->af9033_config[adap->id].tuner) { 990 if (!state->af9033_config[adap->id].tuner) {
@@ -1068,6 +1071,7 @@ static int af9035_tuner_attach(struct dvb_usb_adapter *adap)
1068 struct dvb_frontend *fe; 1071 struct dvb_frontend *fe;
1069 struct i2c_msg msg[1]; 1072 struct i2c_msg msg[1];
1070 u8 tuner_addr; 1073 u8 tuner_addr;
1074
1071 dev_dbg(&d->udev->dev, "%s:\n", __func__); 1075 dev_dbg(&d->udev->dev, "%s:\n", __func__);
1072 1076
1073 /* 1077 /*
@@ -1393,6 +1397,7 @@ static int af9035_get_stream_config(struct dvb_frontend *fe, u8 *ts_type,
1393 struct usb_data_stream_properties *stream) 1397 struct usb_data_stream_properties *stream)
1394{ 1398{
1395 struct dvb_usb_device *d = fe_to_d(fe); 1399 struct dvb_usb_device *d = fe_to_d(fe);
1400
1396 dev_dbg(&d->udev->dev, "%s: adap=%d\n", __func__, fe_to_adap(fe)->id); 1401 dev_dbg(&d->udev->dev, "%s: adap=%d\n", __func__, fe_to_adap(fe)->id);
1397 1402
1398 if (d->udev->speed == USB_SPEED_FULL) 1403 if (d->udev->speed == USB_SPEED_FULL)
@@ -1554,7 +1559,8 @@ static const struct usb_device_id af9035_id_table[] = {
1554 RC_MAP_IT913X_V1) }, 1559 RC_MAP_IT913X_V1) },
1555 /* XXX: that same ID [0ccd:0099] is used by af9015 driver too */ 1560 /* XXX: that same ID [0ccd:0099] is used by af9015 driver too */
1556 { DVB_USB_DEVICE(USB_VID_TERRATEC, 0x0099, 1561 { DVB_USB_DEVICE(USB_VID_TERRATEC, 0x0099,
1557 &af9035_props, "TerraTec Cinergy T Stick Dual RC (rev. 2)", NULL) }, 1562 &af9035_props, "TerraTec Cinergy T Stick Dual RC (rev. 2)",
1563 NULL) },
1558 { DVB_USB_DEVICE(USB_VID_LEADTEK, 0x6a05, 1564 { DVB_USB_DEVICE(USB_VID_LEADTEK, 0x6a05,
1559 &af9035_props, "Leadtek WinFast DTV Dongle Dual", NULL) }, 1565 &af9035_props, "Leadtek WinFast DTV Dongle Dual", NULL) },
1560 { DVB_USB_DEVICE(USB_VID_HAUPPAUGE, 0xf900, 1566 { DVB_USB_DEVICE(USB_VID_HAUPPAUGE, 0xf900,