From patchwork Thu Sep 1 09:17:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland Vossen X-Patchwork-Id: 1118722 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 p819IGOe014147 for ; Thu, 1 Sep 2011 09:18:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755551Ab1IAJSO (ORCPT ); Thu, 1 Sep 2011 05:18:14 -0400 Received: from mms1.broadcom.com ([216.31.210.17]:2996 "EHLO mms1.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753962Ab1IAJRs (ORCPT ); Thu, 1 Sep 2011 05:17:48 -0400 Received: from [10.9.200.133] by mms1.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Thu, 01 Sep 2011 02:23:48 -0700 X-Server-Uuid: 02CED230-5797-4B57-9875-D5D2FEE4708A Received: from mail-irva-13.broadcom.com (10.11.16.103) by IRVEXCHHUB02.corp.ad.broadcom.com (10.9.200.133) with Microsoft SMTP Server id 8.2.247.2; Thu, 1 Sep 2011 02:17:14 -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 0F9A474D14; 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 4D7C52050B; Thu, 1 Sep 2011 02:17:23 -0700 (PDT) Received: from rvossen by LTAMS-RVOSSEN with local (Exim 4.74) ( envelope-from ) id 1Qz3Ok-0002TZ-6F; 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 11/30] staging: brcm80211: cleaned up fullmac macro BRCMF_PM_RESUME_RETURN_ERROR Date: Thu, 1 Sep 2011 11:17:01 +0200 Message-ID: <1314868640-9425-12-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: 624190AE4R04565238-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]); Thu, 01 Sep 2011 09:18:17 +0000 (UTC) Macros impacting the code flow are sort of frowned upon. No other macro's in the source code impact the code flow. Replaced macro by function. Reported-by: Johannes Berg Signed-off-by: Roland Vossen Reviewed-by: Franky Lin Reviewed-by: Arend van Spriel Reviewed-by: Pieter-Paul Giesberts --- drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 25 +++++++++++++++------ 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c index a15765b..d3d3890 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c @@ -90,17 +90,24 @@ DECLARE_WAIT_QUEUE_HEAD(sdioh_request_buffer_wait); wait_event_timeout(a, false, HZ/100); \ } \ } while (0) -#define BRCMF_PM_RESUME_RETURN_ERROR(a, b) \ - do { if (atomic_read(&b->suspend)) return a; } while (0) #else #define BRCMF_PM_RESUME_WAIT(a, b) -#define BRCMF_PM_RESUME_RETURN_ERROR(a, b) #endif /* CONFIG_PM_SLEEP */ static int brcmf_sdioh_card_regread(struct brcmf_sdio_dev *sdiodev, int func, u32 regaddr, int regsize, u32 *data); +static bool +brcmf_pm_resume_error(struct brcmf_sdio_dev *sdiodev) +{ + bool is_err = false; +#ifdef CONFIG_PM_SLEEP + is_err = atomic_read(&sdiodev->suspend); +#endif + return is_err; +} + static int brcmf_sdioh_enablefuncs(struct brcmf_sdio_dev *sdiodev) { int err_ret; @@ -249,7 +256,8 @@ brcmf_sdioh_request_byte(struct brcmf_sdio_dev *sdiodev, uint rw, uint func, brcmf_dbg(INFO, "rw=%d, func=%d, addr=0x%05x\n", rw, func, regaddr); BRCMF_PM_RESUME_WAIT(sdioh_request_byte_wait, sdiodev); - BRCMF_PM_RESUME_RETURN_ERROR(-EIO, sdiodev); + if (brcmf_pm_resume_error(sdiodev)) + return -EIO; if (rw) { /* CMD52 Write */ if (func == 0) { /* Can only directly write to some F0 registers. @@ -351,7 +359,8 @@ brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev, uint cmd_type, uint rw, cmd_type, rw, func, addr, nbytes); BRCMF_PM_RESUME_WAIT(sdioh_request_word_wait, sdiodev); - BRCMF_PM_RESUME_RETURN_ERROR(-EIO, sdiodev); + if (brcmf_pm_resume_error(sdiodev)) + return -EIO; /* Claim host controller */ sdio_claim_host(sdiodev->func[func]); @@ -400,7 +409,8 @@ brcmf_sdioh_request_packet(struct brcmf_sdio_dev *sdiodev, uint fix_inc, brcmf_dbg(TRACE, "Enter\n"); BRCMF_PM_RESUME_WAIT(sdioh_request_packet_wait, sdiodev); - BRCMF_PM_RESUME_RETURN_ERROR(-EIO, sdiodev); + if (brcmf_pm_resume_error(sdiodev)) + return -EIO; /* Claim host controller */ sdio_claim_host(sdiodev->func[func]); @@ -477,7 +487,8 @@ brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev, uint pio_dma, brcmf_dbg(TRACE, "Enter\n"); BRCMF_PM_RESUME_WAIT(sdioh_request_buffer_wait, sdiodev); - BRCMF_PM_RESUME_RETURN_ERROR(-EIO, sdiodev); + if (brcmf_pm_resume_error(sdiodev)) + return -EIO; /* Case 1: we don't have a packet. */ if (pkt == NULL) { brcmf_dbg(DATA, "Creating new %s Packet, len=%d\n",