From patchwork Fri Sep 2 14:00:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland Vossen X-Patchwork-Id: 1122222 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p82E1DvI031376 for ; Fri, 2 Sep 2011 14:01:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752426Ab1IBOBU (ORCPT ); Fri, 2 Sep 2011 10:01:20 -0400 Received: from mms1.broadcom.com ([216.31.210.17]:2158 "EHLO mms1.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752350Ab1IBOA6 (ORCPT ); Fri, 2 Sep 2011 10:00:58 -0400 Received: from [10.9.200.131] by mms1.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Fri, 02 Sep 2011 07:07:04 -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; Fri, 2 Sep 2011 07:00:48 -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 4A00574D04; Fri, 2 Sep 2011 07:00:46 -0700 (PDT) Received: from LTAMS-RVOSSEN (unknown [10.176.68.25]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id 7023D20515; Fri, 2 Sep 2011 07:00:42 -0700 (PDT) Received: from rvossen by LTAMS-RVOSSEN with local (Exim 4.74) ( envelope-from ) id 1QzUIS-000744-KH; Fri, 02 Sep 2011 16:00:40 +0200 From: "Roland Vossen" To: gregkh@suse.de cc: devel@linuxdriverproject.org, linux-wireless@vger.kernel.org Subject: [PATCH 06/12] staging: brcm80211: cleaned up softmac phy macro's affecting code flow Date: Fri, 2 Sep 2011 16:00:33 +0200 Message-ID: <1314972039-27098-7-git-send-email-rvossen@broadcom.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1314972039-27098-1-git-send-email-rvossen@broadcom.com> References: <1314972039-27098-1-git-send-email-rvossen@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 627E3C824R05031797-01-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 (demeter1.kernel.org [140.211.167.41]); Fri, 02 Sep 2011 14:01:52 +0000 (UTC) Substituted macro's. Reported-by: Johannes Berg Reviewed-by: Pieter-Paul Giesberts Reviewed-by: Arend van Spriel Signed-off-by: Roland Vossen --- drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c | 6 ++++-- drivers/staging/brcm80211/brcmsmac/types.h | 5 ----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c index b52b305..5f30de2 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c @@ -204,7 +204,8 @@ u16 read_radio_reg(struct brcms_phy *pi, u16 addr) switch (pi->pubpi.phy_type) { case PHY_TYPE_N: - CASECHECK(PHYTYPE, PHY_TYPE_N); + if (!CONF_HAS(PHYTYPE, PHY_TYPE_N)) + break; if (NREV_GE(pi->pubpi.phy_rev, 7)) addr |= RADIO_2057_READ_OFF; else @@ -212,7 +213,8 @@ u16 read_radio_reg(struct brcms_phy *pi, u16 addr) break; case PHY_TYPE_LCN: - CASECHECK(PHYTYPE, PHY_TYPE_LCN); + if (!CONF_HAS(PHYTYPE, PHY_TYPE_LCN)) + break; addr |= RADIO_2064_READ_OFF; break; diff --git a/drivers/staging/brcm80211/brcmsmac/types.h b/drivers/staging/brcm80211/brcmsmac/types.h index cf65f6e..792df07 100644 --- a/drivers/staging/brcm80211/brcmsmac/types.h +++ b/drivers/staging/brcm80211/brcmsmac/types.h @@ -220,11 +220,6 @@ #define PHYTYPE_IS(var, val)\ (PHYCONF_HAS(val) && (PHYCONF_IS(val) || ((var) == (val)))) -/* Finally, early-exit from switch case if anyone wants it... */ - -#define CASECHECK(config, val) if (!(CONF_HAS(config, val))) break -#define CASEMSK(config, mask) if (!(CONF_MSK(config, mask))) break - /* Set up PHYTYPE automatically: (depends on PHY_TYPE_X, from d11.h) */ #define _PHYCONF_N (1 << PHY_TYPE_N)