Skip to content

Commit fe0580a

Browse files
krzktorvalds
authored andcommitted
virtio: pci: 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]> 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: Kalle Valo <[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 58184e9 commit fe0580a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/virtio/virtio_pci_modern.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@
2727
* method, i.e. 32-bit accesses for 32-bit fields, 16-bit accesses
2828
* for 16-bit fields and 8-bit accesses for 8-bit fields.
2929
*/
30-
static inline u8 vp_ioread8(u8 __iomem *addr)
30+
static inline u8 vp_ioread8(const u8 __iomem *addr)
3131
{
3232
return ioread8(addr);
3333
}
34-
static inline u16 vp_ioread16 (__le16 __iomem *addr)
34+
static inline u16 vp_ioread16 (const __le16 __iomem *addr)
3535
{
3636
return ioread16(addr);
3737
}
3838

39-
static inline u32 vp_ioread32(__le32 __iomem *addr)
39+
static inline u32 vp_ioread32(const __le32 __iomem *addr)
4040
{
4141
return ioread32(addr);
4242
}

0 commit comments

Comments
 (0)