From patchwork Sun Jul 16 11:21:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Molton X-Patchwork-Id: 9842921 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 342AE6037F for ; Sun, 16 Jul 2017 11:45:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2CC4828484 for ; Sun, 16 Jul 2017 11:45:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 21AED284FE; Sun, 16 Jul 2017 11:45:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B275A28484 for ; Sun, 16 Jul 2017 11:45:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751297AbdGPLpd (ORCPT ); Sun, 16 Jul 2017 07:45:33 -0400 Received: from [217.148.43.144] ([217.148.43.144]:48060 "EHLO mnementh.co.uk" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751087AbdGPLpc (ORCPT ); Sun, 16 Jul 2017 07:45:32 -0400 Received: from 12.3.208.46.dyn.plus.net ([46.208.3.12] helo=localhost.localdomain) by mnementh.co.uk with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1dWhd1-00083y-TT; Sun, 16 Jul 2017 11:22:24 +0000 From: Ian Molton To: linux-wireless@vger.kernel.org Cc: arend.vanspriel@broadcom.com, franky.lin@broadcom.com, hante.meuleman@broadcom.com Subject: [PATCH 21/21] brcmfmac: rename horridly named IO functions Date: Sun, 16 Jul 2017 12:21:29 +0100 Message-Id: <20170716112129.10206-22-ian@mnementh.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170716112129.10206-1-ian@mnementh.co.uk> References: <20170716112129.10206-1-ian@mnementh.co.uk> X-Spam_score: -2.9 X-Spam_score_int: -28 X-Spam_bar: -- X-Spam_report: Spam detection software, running on the system "mnementh.co.uk", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: --- .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 24 +++++++++++ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c index 45b8000680c0..b41f2afe4d5a 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -660, 7 +660, 7 @@ static bool data_ok(struct brcmf_sdio *bus) * Reads a register in the SDIO hardware block. This block occupies a series of * adresses on the 32 bit backplane bus. */ -static int r_sdreg32(struct brcmf_sdio *bus, u32 *regvar, u32 offset) +static int brcm_sdio_readl(struct brcmf_sdio *bus, u32 *regvar, u32 offset) { struct brcmf_core *core = bus->sdio_core; int ret; @@ -670,7 +670, 7 @@ static int r_sdreg32(struct brcmf_sdio *bus, u32 *regvar, u32 offset) return ret; } [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP 0.0 TVD_RCVD_IP Message was received from an IP address -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP --- .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c index 45b8000680c0..b41f2afe4d5a 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -660,7 +660,7 @@ static bool data_ok(struct brcmf_sdio *bus) * Reads a register in the SDIO hardware block. This block occupies a series of * adresses on the 32 bit backplane bus. */ -static int r_sdreg32(struct brcmf_sdio *bus, u32 *regvar, u32 offset) +static int brcm_sdio_readl(struct brcmf_sdio *bus, u32 *regvar, u32 offset) { struct brcmf_core *core = bus->sdio_core; int ret; @@ -670,7 +670,7 @@ static int r_sdreg32(struct brcmf_sdio *bus, u32 *regvar, u32 offset) return ret; } -static int w_sdreg32(struct brcmf_sdio *bus, u32 regval, u32 reg_offset) +static int brcm_sdio_writel(struct brcmf_sdio *bus, u32 regval, u32 reg_offset) { struct brcmf_core *core = bus->sdio_core; int ret; @@ -1082,10 +1082,10 @@ static u32 brcmf_sdio_hostmail(struct brcmf_sdio *bus) brcmf_dbg(SDIO, "Enter\n"); /* Read mailbox data and ack that we did so */ - ret = r_sdreg32(bus, &hmb_data, __sd_reg(tohostmailboxdata)); + ret = brcm_sdio_readl(bus, &hmb_data, __sd_reg(tohostmailboxdata)); if (ret == 0) - w_sdreg32(bus, SMB_INT_ACK, __sd_reg(tosbmailbox)); + brcm_sdio_writel(bus, SMB_INT_ACK, __sd_reg(tosbmailbox)); bus->sdcnt.f1regdata += 2; /* Dongle recomposed rx frames, accept them again */ @@ -1195,7 +1195,7 @@ static void brcmf_sdio_rxfail(struct brcmf_sdio *bus, bool abort, bool rtx) if (rtx) { bus->sdcnt.rxrtx++; - err = w_sdreg32(bus, SMB_NAK, __sd_reg(tosbmailbox)); + err = brcm_sdio_writel(bus, SMB_NAK, __sd_reg(tosbmailbox)); bus->sdcnt.f1regdata++; if (err == 0) @@ -2316,7 +2316,7 @@ static uint brcmf_sdio_sendfromq(struct brcmf_sdio *bus, uint maxframes) if (!bus->intr) { /* Check device status, signal pending interrupt */ sdio_claim_host(bus->sdiodev->func[1]); - ret = r_sdreg32(bus, &intstatus, __sd_reg(intstatus)); + ret = brcm_sdio_readl(bus, &intstatus, __sd_reg(intstatus)); sdio_release_host(bus->sdiodev->func[1]); bus->sdcnt.f2txdata++; if (ret != 0) @@ -2422,7 +2422,7 @@ static void brcmf_sdio_bus_stop(struct device *dev) brcmf_sdio_bus_sleep(bus, false, false); /* Disable and clear interrupts at the chip level also */ - w_sdreg32(bus, 0, __sd_reg(hostintmask)); + brcm_sdio_writel(bus, 0, __sd_reg(hostintmask)); local_hostintmask = bus->hostintmask; bus->hostintmask = 0; @@ -2441,7 +2441,7 @@ static void brcmf_sdio_bus_stop(struct device *dev) sdio_disable_func(sdiodev->func[SDIO_FUNC_2]); /* Clear any pending interrupts now that F2 is disabled */ - w_sdreg32(bus, local_hostintmask, __sd_reg(intstatus)); + brcm_sdio_writel(bus, local_hostintmask, __sd_reg(intstatus)); sdio_release_host(sdiodev->func[1]); } @@ -2562,9 +2562,9 @@ static void brcmf_sdio_dpc(struct brcmf_sdio *bus) */ if (intstatus & I_HMB_FC_CHANGE) { intstatus &= ~I_HMB_FC_CHANGE; - err = w_sdreg32(bus, I_HMB_FC_CHANGE, __sd_reg(intstatus)); + err = brcm_sdio_writel(bus, I_HMB_FC_CHANGE, __sd_reg(intstatus)); - err = r_sdreg32(bus, &newstatus, __sd_reg(intstatus)); + err = brcm_sdio_readl(bus, &newstatus, __sd_reg(intstatus)); bus->sdcnt.f1regdata += 2; atomic_set(&bus->fcstate, !!(newstatus & (I_HMB_FC_STATE | I_HMB_FC_CHANGE))); @@ -4033,7 +4033,7 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err, } /* Enable function 2 (frame transfers) */ - w_sdreg32(bus, SDPCM_PROT_VERSION << SMB_DATA_VERSION_SHIFT, + brcm_sdio_writel(bus, SDPCM_PROT_VERSION << SMB_DATA_VERSION_SHIFT, __sd_reg(tosbmailboxdata)); err = sdio_enable_func(sdiodev->func[SDIO_FUNC_2]); @@ -4044,7 +4044,7 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err, if (!err) { /* Set up the interrupt mask and enable interrupts */ bus->hostintmask = HOSTINTMASK; - w_sdreg32(bus, bus->hostintmask, __sd_reg(hostintmask)); + brcm_sdio_writel(bus, bus->hostintmask, __sd_reg(hostintmask)); brcm_sdio_func1_wb(sdiodev, SBSDIO_WATERMARK, 8, &err); } else {