From patchwork Thu Sep 1 09:17:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland Vossen X-Patchwork-Id: 1118762 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p819IM9t003949 for ; Thu, 1 Sep 2011 09:18:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755799Ab1IAJST (ORCPT ); Thu, 1 Sep 2011 05:18:19 -0400 Received: from mms1.broadcom.com ([216.31.210.17]:2936 "EHLO mms1.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753586Ab1IAJRn (ORCPT ); Thu, 1 Sep 2011 05:17:43 -0400 Received: from [10.9.200.131] by mms1.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Thu, 01 Sep 2011 02:23:44 -0700 X-Server-Uuid: 02CED230-5797-4B57-9875-D5D2FEE4708A Received: from mail-irva-13.broadcom.com (10.11.16.103) by IRVEXCHHUB01.corp.ad.broadcom.com (10.9.200.131) with Microsoft SMTP Server id 8.2.247.2; Thu, 1 Sep 2011 02:17:29 -0700 Received: from mail-sj1-12.sj.broadcom.com (mail-sj1-12.sj.broadcom.com [10.17.16.106]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 693AE74D1D; Thu, 1 Sep 2011 02:17:28 -0700 (PDT) Received: from LTAMS-RVOSSEN (unknown [10.176.68.25]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id 756842050E; Thu, 1 Sep 2011 02:17:23 -0700 (PDT) Received: from rvossen by LTAMS-RVOSSEN with local (Exim 4.74) ( envelope-from ) id 1Qz3Ok-0002Tf-Ez; Thu, 01 Sep 2011 11:17:22 +0200 From: "Roland Vossen" To: gregkh@suse.de cc: devel@linuxdriverproject.org, linux-wireless@vger.kernel.org Subject: [PATCH 13/30] staging: brcm80211: consolidate SHOW_EVENTS code under BCMDBG in fullmac Date: Thu, 1 Sep 2011 11:17:03 +0200 Message-ID: <1314868640-9425-14-git-send-email-rvossen@broadcom.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1314868640-9425-1-git-send-email-rvossen@broadcom.com> References: <1314868640-9425-1-git-send-email-rvossen@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 624190AA4R04565214-02-01 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 01 Sep 2011 09:18:22 +0000 (UTC) From: Franky Lin Use unify config marco for debug info. Related event debug print out can be enabled/disabled by the dedicated event message level. Reported-by: Johannes Berg Reviewed-by: Roland Vossen Reviewed-by: Arend van Spriel Signed-off-by: Roland Vossen --- drivers/staging/brcm80211/brcmfmac/Makefile | 2 -- drivers/staging/brcm80211/brcmfmac/dhd_common.c | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/staging/brcm80211/brcmfmac/Makefile b/drivers/staging/brcm80211/brcmfmac/Makefile index 826a2ba..3d0878f 100644 --- a/drivers/staging/brcm80211/brcmfmac/Makefile +++ b/drivers/staging/brcm80211/brcmfmac/Makefile @@ -15,8 +15,6 @@ # OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -ccflags-$(CONFIG_BRCMDBG) += -DSHOW_EVENTS - ccflags-y += \ -Idrivers/staging/brcm80211/brcmfmac \ -Idrivers/staging/brcm80211/include diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c index 059289a..e5214b2 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c @@ -411,7 +411,7 @@ int brcmf_c_ioctl(struct brcmf_pub *drvr, struct brcmf_c_ioctl *ioc, void *buf, return bcmerror; } -#ifdef SHOW_EVENTS +#ifdef BCMDBG static void brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data) { @@ -705,7 +705,7 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data) brcmf_dbg(EVENT, "\n"); } } -#endif /* SHOW_EVENTS */ +#endif /* BCMDBG */ int brcmf_c_host_event(struct brcmf_info *drvr_priv, int *ifidx, void *pktdata, @@ -796,9 +796,9 @@ brcmf_c_host_event(struct brcmf_info *drvr_priv, int *ifidx, void *pktdata, break; } -#ifdef SHOW_EVENTS +#ifdef BCMDBG brcmf_c_show_host_event(event, event_data); -#endif /* SHOW_EVENTS */ +#endif /* BCMDBG */ return 0; }