From patchwork Mon Oct 31 16:24:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylwester Nawrocki X-Patchwork-Id: 8250 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1RKugF-0003tZ-PB; Mon, 31 Oct 2011 17:26:00 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-1) with esmtp id 1RKugE-0003cw-MC; Mon, 31 Oct 2011 17:25:47 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752938Ab1JaQZg (ORCPT + 3 others); Mon, 31 Oct 2011 12:25:36 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:48795 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752682Ab1JaQZf (ORCPT ); Mon, 31 Oct 2011 12:25:35 -0400 Received: by eye27 with SMTP id 27so5444413eye.19 for ; Mon, 31 Oct 2011 09:25:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=9YclK1Ah3D4sM8S7YvWTCWV9Jt0yGsexm8goXgT37sQ=; b=qgVKiHtce1JN8q9KqEoPwed3Q/cU9p1obGrFaq8gZ+7nU9ZG364FW9p703SXRrg8v+ 4mcv1DKQgjEQpMj314ezcLAYXxZcJnenqXkYBRvGzFzDH2MkpwfvpphIvcams2IdQ4SI Cy+9mLtl6wHn0UP2Sy2qnSCmxKjRwiSzXqpWc= Received: by 10.213.17.212 with SMTP id t20mr834579eba.83.1320078334080; Mon, 31 Oct 2011 09:25:34 -0700 (PDT) Received: from localhost.localdomain (84-dzi-26.acn.waw.pl. [85.222.29.84]) by mx.google.com with ESMTPS id z58sm52444586eea.3.2011.10.31.09.25.32 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 31 Oct 2011 09:25:33 -0700 (PDT) From: Sylwester Nawrocki To: devel@driverdev.osuosl.org, linux-media@vger.kernel.org Cc: Piotr Chmura , Devin Heitmueller , Mauro Carvalho Chehab , Sylwester Nawrocki , Stefan Richter , Greg KH Subject: [PATCH 02/17] staging: as102: Fix CodingStyle errors in file as102_drv.c Date: Mon, 31 Oct 2011 17:24:40 +0100 Message-Id: <1320078295-3379-3-git-send-email-snjw23@gmail.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1320078295-3379-1-git-send-email-snjw23@gmail.com> References: <1320078295-3379-1-git-send-email-snjw23@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2011.10.31.161514 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __STOCK_PHRASE_7 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' X-LSpam-Score: -4.2 (----) X-LSpam-Report: No, score=-4.2 required=5.0 tests=BAYES_00=-1.9, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_MED=-2.3, T_DKIM_INVALID=0.01 autolearn=ham From: Devin Heitmueller 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 --- drivers/staging/media/as102/as102_drv.c | 100 ++++++++++++++++--------------- 1 files 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)