Skip to content

Commit 5ca6ad7

Browse files
krzktorvalds
authored andcommitted
rtl818x: constify ioreadX() iomem argument (as in generic implementation)
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 <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Reviewed-by: Geert Uytterhoeven <[email protected]> Acked-by: Kalle Valo <[email protected]> Cc: Allen Hubbe <[email protected]> Cc: Arnd Bergmann <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Cc: Dave Jiang <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: Geert Uytterhoeven <[email protected]> Cc: Helge Deller <[email protected]> Cc: Ivan Kokshaysky <[email protected]> Cc: Jakub Kicinski <[email protected]> Cc: "James E.J. Bottomley" <[email protected]> Cc: Jason Wang <[email protected]> Cc: Jon Mason <[email protected]> Cc: Matt Turner <[email protected]> Cc: Michael Ellerman <[email protected]> Cc: "Michael S. Tsirkin" <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Richard Henderson <[email protected]> Cc: Rich Felker <[email protected]> Cc: Yoshinori Sato <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Linus Torvalds <[email protected]>
1 parent 8f28ca6 commit 5ca6ad7

File tree

1 file changed

+3
-3
lines changed
  • drivers/net/wireless/realtek/rtl818x/rtl8180

1 file changed

+3
-3
lines changed

drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8180.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,17 +150,17 @@ void rtl8180_write_phy(struct ieee80211_hw *dev, u8 addr, u32 data);
150150
void rtl8180_set_anaparam(struct rtl8180_priv *priv, u32 anaparam);
151151
void rtl8180_set_anaparam2(struct rtl8180_priv *priv, u32 anaparam2);
152152

153-
static inline u8 rtl818x_ioread8(struct rtl8180_priv *priv, u8 __iomem *addr)
153+
static inline u8 rtl818x_ioread8(struct rtl8180_priv *priv, const u8 __iomem *addr)
154154
{
155155
return ioread8(addr);
156156
}
157157

158-
static inline u16 rtl818x_ioread16(struct rtl8180_priv *priv, __le16 __iomem *addr)
158+
static inline u16 rtl818x_ioread16(struct rtl8180_priv *priv, const __le16 __iomem *addr)
159159
{
160160
return ioread16(addr);
161161
}
162162

163-
static inline u32 rtl818x_ioread32(struct rtl8180_priv *priv, __le32 __iomem *addr)
163+
static inline u32 rtl818x_ioread32(struct rtl8180_priv *priv, const __le32 __iomem *addr)
164164
{
165165
return ioread32(addr);
166166
}

0 commit comments

Comments
 (0)