From c6ccdca9801604e9e2797677f1a78c2c534b2f1f Mon Sep 17 00:00:00 2001 From: Devin Heitmueller Date: Mon, 31 Oct 2011 12:24:40 -0300 Subject: [PATCH] [media] staging: as102: Fix CodingStyle errors in file as102_drv.c Fix Linux kernel coding style (whitespace and indentation) errors in file as102_drv.c. Signed-off-by: Devin Heitmueller Signed-off-by: Piotr Chmura Signed-off-by: Sylwester Nawrocki Signed-off-by: Mauro Carvalho Chehab --- drivers/staging/media/as102/as102_drv.c | 100 +++++++++++++++++--------------- 1 file changed, 52 insertions(+), 48 deletions(-) diff --git a/drivers/staging/media/as102/as102_drv.c b/drivers/staging/media/as102/as102_drv.c index c334bff..9e5d81b 100644 --- a/drivers/staging/media/as102/as102_drv.c +++ b/drivers/staging/media/as102/as102_drv.c @@ -1,6 +1,7 @@ /* * Abilis Systems Single DVB-T Receiver * Copyright (C) 2008 Pierrick Hascoet + * Copyright (C) 2010 Devin Heitmueller * * 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 @@ -36,23 +37,23 @@ #warning >>> DVB_CORE not defined !!! <<< #endif -int debug = 0; +int debug; module_param_named(debug, debug, int, 0644); MODULE_PARM_DESC(debug, "Turn on/off debugging (default: off)"); -int dual_tuner = 0; +int dual_tuner; module_param_named(dual_tuner, dual_tuner, int, 0644); -MODULE_PARM_DESC(dual_tuner, "Activate Dual-Tuner configuration (default: off)"); +MODULE_PARM_DESC(dual_tuner, "Activate Dual-Tuner config (default: off)"); static int fw_upload = 1; module_param_named(fw_upload, fw_upload, int, 0644); MODULE_PARM_DESC(fw_upload, "Turn on/off default FW upload (default: on)"); -static int pid_filtering = 0; +static int pid_filtering; module_param_named(pid_filtering, pid_filtering, int, 0644); MODULE_PARM_DESC(pid_filtering, "Activate HW PID filtering (default: off)"); -static int ts_auto_disable = 0; +static int ts_auto_disable; module_param_named(ts_auto_disable, ts_auto_disable, int, 0644); MODULE_PARM_DESC(ts_auto_disable, "Stream Auto Enable on FW (default: off)"); @@ -65,7 +66,8 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); #endif #if defined(CONFIG_DVB_CORE) || defined(CONFIG_DVB_CORE_MODULE) -static void as102_stop_stream(struct as102_dev_t *dev) { +static void as102_stop_stream(struct as102_dev_t *dev) +{ struct as102_bus_adapter_t *bus_adap; if (dev != NULL) @@ -80,16 +82,15 @@ static void as102_stop_stream(struct as102_dev_t *dev) { if (mutex_lock_interruptible(&dev->bus_adap.lock)) return; - if (as10x_cmd_stop_streaming(bus_adap) < 0) { + if (as10x_cmd_stop_streaming(bus_adap) < 0) dprintk(debug, "as10x_cmd_stop_streaming failed\n"); - } mutex_unlock(&dev->bus_adap.lock); } } -static int as102_start_stream(struct as102_dev_t *dev) { - +static int as102_start_stream(struct as102_dev_t *dev) +{ struct as102_bus_adapter_t *bus_adap; int ret = -EFAULT; @@ -98,9 +99,8 @@ static int as102_start_stream(struct as102_dev_t *dev) { else return ret; - if (bus_adap->ops->start_stream != NULL) { + if (bus_adap->ops->start_stream != NULL) ret = bus_adap->ops->start_stream(dev); - } if (ts_auto_disable) { if (mutex_lock_interruptible(&dev->bus_adap.lock)) @@ -127,25 +127,25 @@ static int as10x_pid_filter(struct as102_dev_t *dev, return -EBUSY; } - switch(onoff) { - case 0: - ret = as10x_cmd_del_PID_filter(bus_adap, (uint16_t) pid); - dprintk(debug, "DEL_PID_FILTER([%02d] 0x%04x) ret = %d\n", - index, pid, ret); - break; - case 1: - { - struct as10x_ts_filter filter; - - filter.type = TS_PID_TYPE_TS; - filter.idx = 0xFF; - filter.pid = pid; - - ret = as10x_cmd_add_PID_filter(bus_adap, &filter); - dprintk(debug, "ADD_PID_FILTER([%02d -> %02d], 0x%04x) ret = %d\n", - index, filter.idx, filter.pid, ret); - break; - } + switch (onoff) { + case 0: + ret = as10x_cmd_del_PID_filter(bus_adap, (uint16_t) pid); + dprintk(debug, "DEL_PID_FILTER([%02d] 0x%04x) ret = %d\n", + index, pid, ret); + break; + case 1: + { + struct as10x_ts_filter filter; + + filter.type = TS_PID_TYPE_TS; + filter.idx = 0xFF; + filter.pid = pid; + + ret = as10x_cmd_add_PID_filter(bus_adap, &filter); + dprintk(debug, "ADD_PID_FILTER([%02d -> %02d], 0x%04x) ret = %d\n", + index, filter.idx, filter.pid, ret); + break; + } } mutex_unlock(&dev->bus_adap.lock); @@ -154,7 +154,8 @@ static int as10x_pid_filter(struct as102_dev_t *dev, return ret; } -static int as102_dvb_dmx_start_feed(struct dvb_demux_feed *dvbdmxfeed) { +static int as102_dvb_dmx_start_feed(struct dvb_demux_feed *dvbdmxfeed) +{ int ret = 0; struct dvb_demux *demux = dvbdmxfeed->demux; struct as102_dev_t *as102_dev = demux->priv; @@ -169,16 +170,16 @@ static int as102_dvb_dmx_start_feed(struct dvb_demux_feed *dvbdmxfeed) { dvbdmxfeed->index, dvbdmxfeed->pid, 1); } - if (as102_dev->streaming++ == 0) { + if (as102_dev->streaming++ == 0) ret = as102_start_stream(as102_dev); - } mutex_unlock(&as102_dev->sem); LEAVE(); return ret; } -static int as102_dvb_dmx_stop_feed(struct dvb_demux_feed *dvbdmxfeed) { +static int as102_dvb_dmx_stop_feed(struct dvb_demux_feed *dvbdmxfeed) +{ struct dvb_demux *demux = dvbdmxfeed->demux; struct as102_dev_t *as102_dev = demux->priv; @@ -187,9 +188,8 @@ static int as102_dvb_dmx_stop_feed(struct dvb_demux_feed *dvbdmxfeed) { if (mutex_lock_interruptible(&as102_dev->sem)) return -ERESTARTSYS; - if (--as102_dev->streaming == 0) { + if (--as102_dev->streaming == 0) as102_stop_stream(as102_dev); - } if (pid_filtering) { as10x_pid_filter(as102_dev, @@ -202,7 +202,8 @@ static int as102_dvb_dmx_stop_feed(struct dvb_demux_feed *dvbdmxfeed) { } #endif -int as102_dvb_register(struct as102_dev_t *as102_dev) { +int as102_dvb_register(struct as102_dev_t *as102_dev) +{ int ret = 0; ENTER(); @@ -223,7 +224,7 @@ int as102_dvb_register(struct as102_dev_t *as102_dev) { ); if (ret < 0) { err("%s: dvb_register_adapter() failed (errno = %d)", - __FUNCTION__, ret); + __func__, ret); goto failed; } @@ -240,23 +241,23 @@ int as102_dvb_register(struct as102_dev_t *as102_dev) { as102_dev->dvb_dmxdev.demux = &as102_dev->dvb_dmx.dmx; as102_dev->dvb_dmxdev.capabilities = 0; - if ((ret = dvb_dmx_init(&as102_dev->dvb_dmx)) < 0) { - err("%s: dvb_dmx_init() failed (errno = %d)", - __FUNCTION__, ret); + ret = dvb_dmx_init(&as102_dev->dvb_dmx); + if (ret < 0) { + err("%s: dvb_dmx_init() failed (errno = %d)", __func__, ret); goto failed; } ret = dvb_dmxdev_init(&as102_dev->dvb_dmxdev, &as102_dev->dvb_adap); if (ret < 0) { - err("%s: dvb_dmxdev_init() failed (errno = %d)", - __FUNCTION__, ret); + err("%s: dvb_dmxdev_init() failed (errno = %d)", __func__, + ret); goto failed; } ret = as102_dvb_register_fe(as102_dev, &as102_dev->dvb_fe); if (ret < 0) { err("%s: as102_dvb_register_frontend() failed (errno = %d)", - __FUNCTION__, ret); + __func__, ret); goto failed; } #endif @@ -283,7 +284,8 @@ failed: return ret; } -void as102_dvb_unregister(struct as102_dev_t *as102_dev) { +void as102_dvb_unregister(struct as102_dev_t *as102_dev) +{ ENTER(); #if defined(CONFIG_DVB_CORE) || defined(CONFIG_DVB_CORE_MODULE) @@ -300,7 +302,8 @@ void as102_dvb_unregister(struct as102_dev_t *as102_dev) { LEAVE(); } -static int __init as102_driver_init(void) { +static int __init as102_driver_init(void) +{ int ret = 0; ENTER(); @@ -331,7 +334,8 @@ module_init(as102_driver_init); * \brief as102 driver exit point. This function is called when device has * to be removed. */ -static void __exit as102_driver_exit(void) { +static void __exit as102_driver_exit(void) +{ ENTER(); /* deregister this driver with the low level bus subsystem */ #if defined(CONFIG_AS102_USB) -- 2.7.4