aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2008-05-27 23:53:27 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 06:07:38 -0400
commitb6b2d268445ad4f5fac495bbbae6d2922f0becd9 (patch)
tree24116d7ec726559657a9072263a3c0373bf81d91 /drivers
parent78b526a43561d7e5e702ba27948e422dfbc4bea1 (diff)
V4L/DVB (7950): AU6610: coding style fixes
- coding style fixes raised by checkpatch Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/dvb/dvb-usb/au6610.c38
-rw-r--r--drivers/media/dvb/dvb-usb/au6610.h2
2 files changed, 19 insertions, 21 deletions
diff --git a/drivers/media/dvb/dvb-usb/au6610.c b/drivers/media/dvb/dvb-usb/au6610.c
index 2ccb90fa60c8..b44a3c4c5450 100644
--- a/drivers/media/dvb/dvb-usb/au6610.c
+++ b/drivers/media/dvb/dvb-usb/au6610.c
@@ -3,8 +3,8 @@
3 * Copyright (C) 2006 Antti Palosaari <crope@iki.fi> 3 * Copyright (C) 2006 Antti Palosaari <crope@iki.fi>
4 * 4 *
5 * This program is free software; you can redistribute it and/or modify it 5 * This program is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License as published by the Free 6 * under the terms of the GNU General Public License as published by the
7 * Software Foundation, version 2. 7 * Free Software Foundation, version 2.
8 * 8 *
9 * see Documentation/dvb/README.dvb-usb for more information 9 * see Documentation/dvb/README.dvb-usb for more information
10 */ 10 */
@@ -17,8 +17,8 @@
17/* debug */ 17/* debug */
18static int dvb_usb_au6610_debug; 18static int dvb_usb_au6610_debug;
19module_param_named(debug, dvb_usb_au6610_debug, int, 0644); 19module_param_named(debug, dvb_usb_au6610_debug, int, 0644);
20MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." DVB_USB_DEBUG_STATUS); 20MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))."
21 21 DVB_USB_DEBUG_STATUS);
22DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); 22DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
23 23
24static int au6610_usb_msg(struct dvb_usb_device *d, u8 operation, u8 addr, 24static int au6610_usb_msg(struct dvb_usb_device *d, u8 operation, u8 addr,
@@ -42,9 +42,8 @@ static int au6610_usb_msg(struct dvb_usb_device *d, u8 operation, u8 addr,
42 } 42 }
43 43
44 ret = usb_control_msg(d->udev, usb_rcvctrlpipe(d->udev, 0), operation, 44 ret = usb_control_msg(d->udev, usb_rcvctrlpipe(d->udev, 0), operation,
45 USB_TYPE_VENDOR|USB_DIR_IN, addr << 1, index, usb_buf, 45 USB_TYPE_VENDOR|USB_DIR_IN, addr << 1, index,
46 sizeof(usb_buf), AU6610_USB_TIMEOUT); 46 usb_buf, sizeof(usb_buf), AU6610_USB_TIMEOUT);
47
48 if (ret < 0) 47 if (ret < 0)
49 return ret; 48 return ret;
50 49
@@ -133,12 +132,12 @@ static struct zl10353_config au6610_zl10353_config = {
133 132
134static int au6610_zl10353_frontend_attach(struct dvb_usb_adapter *adap) 133static int au6610_zl10353_frontend_attach(struct dvb_usb_adapter *adap)
135{ 134{
136 if ((adap->fe = dvb_attach(zl10353_attach, &au6610_zl10353_config, 135 adap->fe = dvb_attach(zl10353_attach, &au6610_zl10353_config,
137 &adap->dev->i2c_adap)) != NULL) { 136 &adap->dev->i2c_adap);
138 return 0; 137 if (adap->fe == NULL)
139 } 138 return -EIO;
140 139
141 return -EIO; 140 return 0;
142} 141}
143 142
144static struct qt1010_config au6610_qt1010_config = { 143static struct qt1010_config au6610_qt1010_config = {
@@ -186,7 +185,7 @@ static struct usb_device_id au6610_table [] = {
186 { USB_DEVICE(USB_VID_ALCOR_MICRO, USB_PID_SIGMATEK_DVB_110) }, 185 { USB_DEVICE(USB_VID_ALCOR_MICRO, USB_PID_SIGMATEK_DVB_110) },
187 { } /* Terminating entry */ 186 { } /* Terminating entry */
188}; 187};
189MODULE_DEVICE_TABLE (usb, au6610_table); 188MODULE_DEVICE_TABLE(usb, au6610_table);
190 189
191static struct dvb_usb_device_properties au6610_properties = { 190static struct dvb_usb_device_properties au6610_properties = {
192 .caps = DVB_USB_IS_AN_I2C_ADAPTER, 191 .caps = DVB_USB_IS_AN_I2C_ADAPTER,
@@ -206,7 +205,7 @@ static struct dvb_usb_device_properties au6610_properties = {
206 .u = { 205 .u = {
207 .isoc = { 206 .isoc = {
208 .framesperurb = 40, 207 .framesperurb = 40,
209 .framesize = 942, /* maximum packet size */ 208 .framesize = 942,
210 .interval = 1.25, /* 125 us */ 209 .interval = 1.25, /* 125 us */
211 } 210 }
212 } 211 }
@@ -236,12 +235,11 @@ static int __init au6610_module_init(void)
236{ 235{
237 int ret; 236 int ret;
238 237
239 if ((ret = usb_register(&au6610_driver))) { 238 ret = usb_register(&au6610_driver);
239 if (ret)
240 err("usb_register failed. Error number %d", ret); 240 err("usb_register failed. Error number %d", ret);
241 return ret;
242 }
243 241
244 return 0; 242 return ret;
245} 243}
246 244
247static void __exit au6610_module_exit(void) 245static void __exit au6610_module_exit(void)
@@ -250,8 +248,8 @@ static void __exit au6610_module_exit(void)
250 usb_deregister(&au6610_driver); 248 usb_deregister(&au6610_driver);
251} 249}
252 250
253module_init (au6610_module_init); 251module_init(au6610_module_init);
254module_exit (au6610_module_exit); 252module_exit(au6610_module_exit);
255 253
256MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>"); 254MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
257MODULE_DESCRIPTION("Driver Sigmatek DVB-110 DVB-T USB2.0 / AU6610"); 255MODULE_DESCRIPTION("Driver Sigmatek DVB-110 DVB-T USB2.0 / AU6610");
diff --git a/drivers/media/dvb/dvb-usb/au6610.h b/drivers/media/dvb/dvb-usb/au6610.h
index 4161b054c713..abca6291c725 100644
--- a/drivers/media/dvb/dvb-usb/au6610.h
+++ b/drivers/media/dvb/dvb-usb/au6610.h
@@ -4,7 +4,7 @@
4#define DVB_USB_LOG_PREFIX "au6610" 4#define DVB_USB_LOG_PREFIX "au6610"
5#include "dvb-usb.h" 5#include "dvb-usb.h"
6 6
7#define deb_rc(args...) dprintk(dvb_usb_au6610_debug,0x01,args) 7#define deb_rc(args...) dprintk(dvb_usb_au6610_debug, 0x01, args)
8 8
9#define AU6610_REQ_I2C_WRITE 0x14 9#define AU6610_REQ_I2C_WRITE 0x14
10#define AU6610_REQ_I2C_READ 0x13 10#define AU6610_REQ_I2C_READ 0x13