aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2007-01-21 13:57:48 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 10:34:53 -0500
commitfa94805d0316e7706d2ce0273a9c58688482c9f6 (patch)
treea754b4e3095d175855ed3476e13529c931a867c3 /drivers
parent84ad7574f69b971565061663be2b0a9ade5b8ca7 (diff)
V4L/DVB (5140): Whitespace / 80-column cleanups
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/dvb/dvb-usb/m920x.c24
1 files changed, 16 insertions, 8 deletions
diff --git a/drivers/media/dvb/dvb-usb/m920x.c b/drivers/media/dvb/dvb-usb/m920x.c
index f06fee3af9e6..585d0e350d4a 100644
--- a/drivers/media/dvb/dvb-usb/m920x.c
+++ b/drivers/media/dvb/dvb-usb/m920x.c
@@ -39,7 +39,8 @@ static struct dvb_usb_rc_key megasky_rc_keys [] = {
39 { 0x0, 0x0e, KEY_COFFEE }, /* "MTS" */ 39 { 0x0, 0x0e, KEY_COFFEE }, /* "MTS" */
40}; 40};
41 41
42static inline int m9206_read(struct usb_device *udev, u8 request, u16 value, u16 index, void *data, int size) 42static inline int m9206_read(struct usb_device *udev, u8 request, u16 value,\
43 u16 index, void *data, int size)
43{ 44{
44 int ret; 45 int ret;
45 46
@@ -55,7 +56,8 @@ static inline int m9206_read(struct usb_device *udev, u8 request, u16 value, u16
55 return 0; 56 return 0;
56} 57}
57 58
58static inline int m9206_write(struct usb_device *udev, u8 request, u16 value, u16 index) 59static inline int m9206_write(struct usb_device *udev, u8 request,
60 u16 value, u16 index)
59{ 61{
60 int ret; 62 int ret;
61 63
@@ -131,7 +133,8 @@ static int m9206_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
131} 133}
132 134
133/* I2C */ 135/* I2C */
134static int m9206_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int num) 136static int m9206_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
137 int num)
135{ 138{
136 struct dvb_usb_device *d = i2c_get_adapdata(adap); 139 struct dvb_usb_device *d = i2c_get_adapdata(adap);
137 struct m9206_state *m = d->priv; 140 struct m9206_state *m = d->priv;
@@ -256,7 +259,8 @@ static int megasky_frontend_attach(struct dvb_usb_adapter *adap)
256 return 0; 259 return 0;
257} 260}
258 261
259static int m9206_set_filter(struct dvb_usb_adapter *adap, int type, int idx, int pid) 262static int m9206_set_filter(struct dvb_usb_adapter *adap, int type, int idx,
263 int pid)
260{ 264{
261 int ret = 0; 265 int ret = 0;
262 266
@@ -323,7 +327,8 @@ static int m9206_pid_filter_ctrl(struct dvb_usb_adapter *adap, int onoff)
323 return m9206_update_filters(adap); 327 return m9206_update_filters(adap);
324} 328}
325 329
326static int m9206_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid, int onoff) 330static int m9206_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid,
331 int onoff)
327{ 332{
328 struct m9206_state *m = adap->dev->priv; 333 struct m9206_state *m = adap->dev->priv;
329 334
@@ -332,7 +337,8 @@ static int m9206_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid, in
332 return m9206_update_filters(adap); 337 return m9206_update_filters(adap);
333} 338}
334 339
335static int m9206_firmware_download(struct usb_device *udev, const struct firmware *fw) 340static int m9206_firmware_download(struct usb_device *udev,
341 const struct firmware *fw)
336{ 342{
337 u16 value, index, size; 343 u16 value, index, size;
338 u8 read[4], *buff; 344 u8 read[4], *buff;
@@ -415,7 +421,8 @@ static int megasky_tuner_attach(struct dvb_usb_adapter *adap)
415/* DVB USB Driver stuff */ 421/* DVB USB Driver stuff */
416static struct dvb_usb_device_properties megasky_properties; 422static struct dvb_usb_device_properties megasky_properties;
417 423
418static int m920x_probe(struct usb_interface *intf, const struct usb_device_id *id) 424static int m920x_probe(struct usb_interface *intf,
425 const struct usb_device_id *id)
419{ 426{
420 struct dvb_usb_device *d; 427 struct dvb_usb_device *d;
421 struct usb_host_interface *alt; 428 struct usb_host_interface *alt;
@@ -430,7 +437,8 @@ static int m920x_probe(struct usb_interface *intf, const struct usb_device_id *i
430 return -ENODEV; 437 return -ENODEV;
431 } 438 }
432 439
433 ret = usb_set_interface(d->udev, alt->desc.bInterfaceNumber, alt->desc.bAlternateSetting); 440 ret = usb_set_interface(d->udev, alt->desc.bInterfaceNumber,
441 alt->desc.bAlternateSetting);
434 if (ret < 0) 442 if (ret < 0)
435 return ret; 443 return ret;
436 444