From: Krzysztof Kozlowski <krzk@kernel•org>
To: Richard Henderson <rth@twiddle•net>,
Ivan Kokshaysky <ink@jurassic•park.msu.ru>,
Matt Turner <mattst88@gmail•com>,
Alexey Brodkin <abrodkin@synopsys•com>,
Vineet Gupta <vgupta@synopsys•com>,
"James E.J. Bottomley" <James.Bottomley@HansenPartnership•com>,
Helge Deller <deller@gmx•de>,
Benjamin Herrenschmidt <benh@kernel•crashing.org>,
Paul Mackerras <paulus@samba•org>,
Michael Ellerman <mpe@ellerman•id.au>,
Yoshinori Sato <ysato@users•sourceforge.jp>,
Rich Felker <dalias@libc•org>, Dave Airlie <airlied@redhat•com>,
David Airlie <airlied@linux•ie>, Daniel Vetter <daniel@ffwll•ch>,
Ben Skeggs <bskeggs@redhat•com>,
Mauro Carvalho Chehab <mchehab@kernel•org>,
Jiri Slaby <jirislaby@gmail•com>,
Nick Kossifidis <mickflemm@gmail•com>,
Luis Chamberlain <mcgrof@kernel•org>,
Kalle Valo <kvalo@codeaurora•org>,
"David S. Miller" <davem@davemloft•net>,
Dave Jiang <dave.jiang@intel•com>, Jon Mason <jdmason@kudzu•us>,
Allen Hubbe <allenbh@gmail•com>,
"Michael S. Tsirkin" <mst@redhat•com>,
Jason Wang <jasowang@redhat•com>, Arnd Bergmann <arnd@arndb•de>,
Andrew Morton <akpm@linux-foundation•org>,
Thomas Gleixner <tglx@linutronix•de>,
Geert Uytterhoeven <geert@linux-m68k•org>,
linux-alpha@vger•kernel.org, linux-kernel@vger•kernel.org,
linux-snps-arc@lists•infradead.org, linux-parisc@vger•kernel.org,
linuxppc-dev@lists•ozlabs.org, linux-sh@vger•kernel.org,
dri-devel@lists•freedesktop.org, nouveau@lists•freedesktop.org,
linux-media@vger•kernel.org, linux-wireless@vger•kernel.org,
netdev@vger•kernel.org, linux-ntb@googlegroups•com,
virtualization@lists•linux-foundation.org,
linux-arch@vger•kernel.org
Cc: Krzysztof Kozlowski <krzk@kernel•org>
Subject: [RFT 10/13] net: wireless: ath5k: Constify ioreadX() iomem argument (as in generic implementation)
Date: Tue, 7 Jan 2020 17:53:09 +0100 [thread overview]
Message-ID: <1578415992-24054-13-git-send-email-krzk@kernel.org> (raw)
In-Reply-To: <1578415992-24054-1-git-send-email-krzk@kernel.org>
The ioreadX() helpers have inconsistent interface. On some architectures
void *__iomem address argument is a pointer to const, on some not.
Implementations of ioreadX() do not modify the memory under the address
so they can be converted to a "const" version for const-safety and
consistency among architectures.
Signed-off-by: Krzysztof Kozlowski <krzk@kernel•org>
---
drivers/net/wireless/ath/ath5k/ahb.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/ath/ath5k/ahb.c b/drivers/net/wireless/ath/ath5k/ahb.c
index 2c9cec8b53d9..8bd01df369fb 100644
--- a/drivers/net/wireless/ath/ath5k/ahb.c
+++ b/drivers/net/wireless/ath/ath5k/ahb.c
@@ -138,18 +138,18 @@ static int ath_ahb_probe(struct platform_device *pdev)
if (bcfg->devid >= AR5K_SREV_AR2315_R6) {
/* Enable WMAC AHB arbitration */
- reg = ioread32((void __iomem *) AR5K_AR2315_AHB_ARB_CTL);
+ reg = ioread32((const void __iomem *) AR5K_AR2315_AHB_ARB_CTL);
reg |= AR5K_AR2315_AHB_ARB_CTL_WLAN;
iowrite32(reg, (void __iomem *) AR5K_AR2315_AHB_ARB_CTL);
/* Enable global WMAC swapping */
- reg = ioread32((void __iomem *) AR5K_AR2315_BYTESWAP);
+ reg = ioread32((const void __iomem *) AR5K_AR2315_BYTESWAP);
reg |= AR5K_AR2315_BYTESWAP_WMAC;
iowrite32(reg, (void __iomem *) AR5K_AR2315_BYTESWAP);
} else {
/* Enable WMAC DMA access (assuming 5312 or 231x*/
/* TODO: check other platforms */
- reg = ioread32((void __iomem *) AR5K_AR5312_ENABLE);
+ reg = ioread32((const void __iomem *) AR5K_AR5312_ENABLE);
if (to_platform_device(ah->dev)->id == 0)
reg |= AR5K_AR5312_ENABLE_WLAN0;
else
@@ -202,12 +202,12 @@ static int ath_ahb_remove(struct platform_device *pdev)
if (bcfg->devid >= AR5K_SREV_AR2315_R6) {
/* Disable WMAC AHB arbitration */
- reg = ioread32((void __iomem *) AR5K_AR2315_AHB_ARB_CTL);
+ reg = ioread32((const void __iomem *) AR5K_AR2315_AHB_ARB_CTL);
reg &= ~AR5K_AR2315_AHB_ARB_CTL_WLAN;
iowrite32(reg, (void __iomem *) AR5K_AR2315_AHB_ARB_CTL);
} else {
/*Stop DMA access */
- reg = ioread32((void __iomem *) AR5K_AR5312_ENABLE);
+ reg = ioread32((const void __iomem *) AR5K_AR5312_ENABLE);
if (to_platform_device(ah->dev)->id == 0)
reg &= ~AR5K_AR5312_ENABLE_WLAN0;
else
--
2.7.4
next prev parent reply other threads:[~2020-01-07 17:22 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-07 16:52 [RFT 00/13] iomap: Constify ioreadX() iomem argument Krzysztof Kozlowski
2020-01-07 16:52 ` [RFT 01/13] iomap: Constify ioreadX() iomem argument (as in generic implementation) Krzysztof Kozlowski
2020-01-07 16:52 ` [RFT 02/13] alpha: " Krzysztof Kozlowski
2020-01-08 8:10 ` Geert Uytterhoeven
2020-01-08 9:07 ` Krzysztof Kozlowski
2020-01-07 16:53 ` [RFT 02/13] sh: " Krzysztof Kozlowski
2020-01-07 16:53 ` [RFT 03/13] alpha: " Krzysztof Kozlowski
2020-01-07 16:53 ` [RFT 03/13] sh: " Krzysztof Kozlowski
2020-01-07 17:08 ` Arnd Bergmann
2020-01-07 16:53 ` [RFT 04/13] parisc: " Krzysztof Kozlowski
2020-01-07 16:53 ` [RFT 05/13] powerpc: " Krzysztof Kozlowski
2020-01-07 16:53 ` [RFT 06/13] arc: " Krzysztof Kozlowski
2020-01-07 17:10 ` Arnd Bergmann
2020-01-07 16:53 ` [RFT 07/13] drm/mgag200: " Krzysztof Kozlowski
2020-01-07 16:53 ` [RFT 08/13] drm/nouveau: " Krzysztof Kozlowski
2020-01-07 16:53 ` [RFT 09/13] media: fsl-viu: " Krzysztof Kozlowski
2020-01-07 16:53 ` Krzysztof Kozlowski [this message]
2020-01-07 16:53 ` [RFT 11/13] net: wireless: rtl818x: " Krzysztof Kozlowski
2020-01-07 16:53 ` [RFT 12/13] ntb: intel: " Krzysztof Kozlowski
2020-01-07 16:53 ` [RFT 13/13] virtio: pci: " Krzysztof Kozlowski
2020-01-08 8:07 ` [RFT 00/13] iomap: Constify ioreadX() iomem argument Geert Uytterhoeven
2020-01-08 8:12 ` Geert Uytterhoeven
2020-01-08 8:18 ` Krzysztof Kozlowski
2020-01-08 8:35 ` Christophe Leroy
2020-01-08 8:43 ` Geert Uytterhoeven
2020-01-08 8:48 ` Christophe Leroy
2020-01-08 17:39 ` David Laight
2020-01-08 8:44 ` Arnd Bergmann
2020-01-08 9:15 ` Krzysztof Kozlowski
2020-01-08 11:55 ` Arnd Bergmann
2020-01-08 8:15 ` Krzysztof Kozlowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1578415992-24054-13-git-send-email-krzk@kernel.org \
--to=krzk@kernel$(echo .)org \
--cc=James.Bottomley@HansenPartnership$(echo .)com \
--cc=abrodkin@synopsys$(echo .)com \
--cc=airlied@linux$(echo .)ie \
--cc=airlied@redhat$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=allenbh@gmail$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=benh@kernel$(echo .)crashing.org \
--cc=bskeggs@redhat$(echo .)com \
--cc=dalias@libc$(echo .)org \
--cc=daniel@ffwll$(echo .)ch \
--cc=dave.jiang@intel$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=deller@gmx$(echo .)de \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=geert@linux-m68k$(echo .)org \
--cc=ink@jurassic$(echo .)park.msu.ru \
--cc=jasowang@redhat$(echo .)com \
--cc=jdmason@kudzu$(echo .)us \
--cc=jirislaby@gmail$(echo .)com \
--cc=kvalo@codeaurora$(echo .)org \
--cc=linux-alpha@vger$(echo .)kernel.org \
--cc=linux-arch@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-media@vger$(echo .)kernel.org \
--cc=linux-ntb@googlegroups$(echo .)com \
--cc=linux-parisc@vger$(echo .)kernel.org \
--cc=linux-sh@vger$(echo .)kernel.org \
--cc=linux-snps-arc@lists$(echo .)infradead.org \
--cc=linux-wireless@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mattst88@gmail$(echo .)com \
--cc=mcgrof@kernel$(echo .)org \
--cc=mchehab@kernel$(echo .)org \
--cc=mickflemm@gmail$(echo .)com \
--cc=mpe@ellerman$(echo .)id.au \
--cc=mst@redhat$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=nouveau@lists$(echo .)freedesktop.org \
--cc=paulus@samba$(echo .)org \
--cc=rth@twiddle$(echo .)net \
--cc=tglx@linutronix$(echo .)de \
--cc=vgupta@synopsys$(echo .)com \
--cc=virtualization@lists$(echo .)linux-foundation.org \
--cc=ysato@users$(echo .)sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox