diff options
author | Antti Palosaari <crope@iki.fi> | 2008-05-28 03:53:27 +0300 |
---|---|---|
committer | Antti Palosaari <crope@iki.fi> | 2008-05-28 03:53:27 +0300 |
commit | d0d7c2a003a0f7736b0854159f8c3d1127b49269 (patch) | |
tree | d9ccd662afacbd968893f40604e7930ab8ce06c0 /linux | |
parent | 207a3ddc145923e40cc3d7d1bc7d4d96671fa67e (diff) | |
download | mediapointer-dvb-s2-d0d7c2a003a0f7736b0854159f8c3d1127b49269.tar.gz mediapointer-dvb-s2-d0d7c2a003a0f7736b0854159f8c3d1127b49269.tar.bz2 |
AU6610: coding style fixes
From: Antti Palosaari <crope@iki.fi>
- coding style fixes raised by checkpatch
Signed-off-by: Antti Palosaari <crope@iki.fi>
Diffstat (limited to 'linux')
-rw-r--r-- | linux/drivers/media/dvb/dvb-usb/au6610.c | 40 | ||||
-rw-r--r-- | linux/drivers/media/dvb/dvb-usb/au6610.h | 2 |
2 files changed, 20 insertions, 22 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/au6610.c b/linux/drivers/media/dvb/dvb-usb/au6610.c index 578a27d14..a278c1a7d 100644 --- a/linux/drivers/media/dvb/dvb-usb/au6610.c +++ b/linux/drivers/media/dvb/dvb-usb/au6610.c @@ -3,8 +3,8 @@ * Copyright (C) 2006 Antti Palosaari <crope@iki.fi> * * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation, version 2. + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, version 2. * * see Documentation/dvb/README.dvb-usb for more information */ @@ -17,8 +17,8 @@ /* debug */ static int dvb_usb_au6610_debug; module_param_named(debug, dvb_usb_au6610_debug, int, 0644); -MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." DVB_USB_DEBUG_STATUS); - +MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." + DVB_USB_DEBUG_STATUS); DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); static 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, } ret = usb_control_msg(d->udev, usb_rcvctrlpipe(d->udev, 0), operation, - USB_TYPE_VENDOR|USB_DIR_IN, addr << 1, index, usb_buf, - sizeof(usb_buf), AU6610_USB_TIMEOUT); - + USB_TYPE_VENDOR|USB_DIR_IN, addr << 1, index, + usb_buf, sizeof(usb_buf), AU6610_USB_TIMEOUT); if (ret < 0) return ret; @@ -133,12 +132,12 @@ static struct zl10353_config au6610_zl10353_config = { static int au6610_zl10353_frontend_attach(struct dvb_usb_adapter *adap) { - if ((adap->fe = dvb_attach(zl10353_attach, &au6610_zl10353_config, - &adap->dev->i2c_adap)) != NULL) { - return 0; - } + adap->fe = dvb_attach(zl10353_attach, &au6610_zl10353_config, + &adap->dev->i2c_adap); + if (adap->fe == NULL) + return -EIO; - return -EIO; + return 0; } static struct qt1010_config au6610_qt1010_config = { @@ -186,7 +185,7 @@ static struct usb_device_id au6610_table [] = { { USB_DEVICE(USB_VID_ALCOR_MICRO, USB_PID_SIGMATEK_DVB_110) }, { } /* Terminating entry */ }; -MODULE_DEVICE_TABLE (usb, au6610_table); +MODULE_DEVICE_TABLE(usb, au6610_table); static struct dvb_usb_device_properties au6610_properties = { .caps = DVB_USB_IS_AN_I2C_ADAPTER, @@ -206,7 +205,7 @@ static struct dvb_usb_device_properties au6610_properties = { .u = { .isoc = { .framesperurb = 40, - .framesize = 942, /* maximum packet size */ + .framesize = 942, .interval = 1.25, /* 125 us */ } } @@ -225,7 +224,7 @@ static struct dvb_usb_device_properties au6610_properties = { }; static struct usb_driver au6610_driver = { -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 15) .owner = THIS_MODULE, #endif .name = "dvb_usb_au6610", @@ -239,12 +238,11 @@ static int __init au6610_module_init(void) { int ret; - if ((ret = usb_register(&au6610_driver))) { + ret = usb_register(&au6610_driver); + if (ret) err("usb_register failed. Error number %d", ret); - return ret; - } - return 0; + return ret; } static void __exit au6610_module_exit(void) @@ -253,8 +251,8 @@ static void __exit au6610_module_exit(void) usb_deregister(&au6610_driver); } -module_init (au6610_module_init); -module_exit (au6610_module_exit); +module_init(au6610_module_init); +module_exit(au6610_module_exit); MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>"); MODULE_DESCRIPTION("Driver Sigmatek DVB-110 DVB-T USB2.0 / AU6610"); diff --git a/linux/drivers/media/dvb/dvb-usb/au6610.h b/linux/drivers/media/dvb/dvb-usb/au6610.h index 4161b054c..abca6291c 100644 --- a/linux/drivers/media/dvb/dvb-usb/au6610.h +++ b/linux/drivers/media/dvb/dvb-usb/au6610.h @@ -4,7 +4,7 @@ #define DVB_USB_LOG_PREFIX "au6610" #include "dvb-usb.h" -#define deb_rc(args...) dprintk(dvb_usb_au6610_debug,0x01,args) +#define deb_rc(args...) dprintk(dvb_usb_au6610_debug, 0x01, args) #define AU6610_REQ_I2C_WRITE 0x14 #define AU6610_REQ_I2C_READ 0x13 |