Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
powerpc/io: Spell-out PCI_IO_ADDR
PCI_IO_ADDR is a ppc-ism, which obscures the fact that some of the
powerpc accessors are identical to the generic ones. So remove it and
spell out the type fully.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com>
Link: https://patch.msgid.link/20241218105523.416573-15-mpe@ellerman.id.au
authored by
Michael Ellerman
and committed by
Madhavan Srinivasan
c051451b
8a55941a
+24
-27
+24
-27
arch/powerpc/include/asm/io.h
+24
-27
arch/powerpc/include/asm/io.h
···
274
274
#include <asm/eeh.h>
275
275
#endif
276
276
277
-
/* Shortcut to the MMIO argument pointer */
278
-
#define PCI_IO_ADDR volatile void __iomem *
279
-
280
-
#define _IO_PORT(port) ((PCI_IO_ADDR)(_IO_BASE + (port)))
277
+
#define _IO_PORT(port) ((volatile void __iomem *)(_IO_BASE + (port)))
281
278
282
279
/*
283
280
* Non ordered and non-swapping "raw" accessors
···
567
570
_memcpy_fromio(dst, src, n)
568
571
#endif /* !CONFIG_EEH */
569
572
570
-
static inline u8 readb(const PCI_IO_ADDR addr)
573
+
static inline u8 readb(const volatile void __iomem *addr)
571
574
{
572
575
return __do_readb(addr);
573
576
}
574
577
#define readb readb
575
578
576
-
static inline u16 readw(const PCI_IO_ADDR addr)
579
+
static inline u16 readw(const volatile void __iomem *addr)
577
580
{
578
581
return __do_readw(addr);
579
582
}
580
583
#define readw readw
581
584
582
-
static inline u32 readl(const PCI_IO_ADDR addr)
585
+
static inline u32 readl(const volatile void __iomem *addr)
583
586
{
584
587
return __do_readl(addr);
585
588
}
586
589
#define readl readl
587
590
588
-
static inline u16 readw_be(const PCI_IO_ADDR addr)
591
+
static inline u16 readw_be(const volatile void __iomem *addr)
589
592
{
590
593
return __do_readw_be(addr);
591
594
}
592
595
593
-
static inline u32 readl_be(const PCI_IO_ADDR addr)
596
+
static inline u32 readl_be(const volatile void __iomem *addr)
594
597
{
595
598
return __do_readl_be(addr);
596
599
}
597
600
598
-
static inline void writeb(u8 val, PCI_IO_ADDR addr)
601
+
static inline void writeb(u8 val, volatile void __iomem *addr)
599
602
{
600
603
out_8(addr, val);
601
604
}
602
605
#define writeb writeb
603
606
604
-
static inline void writew(u16 val, PCI_IO_ADDR addr)
607
+
static inline void writew(u16 val, volatile void __iomem *addr)
605
608
{
606
609
out_le16(addr, val);
607
610
}
608
611
#define writew writew
609
612
610
-
static inline void writel(u32 val, PCI_IO_ADDR addr)
613
+
static inline void writel(u32 val, volatile void __iomem *addr)
611
614
{
612
615
out_le32(addr, val);
613
616
}
614
617
#define writel writel
615
618
616
-
static inline void writew_be(u16 val, PCI_IO_ADDR addr)
619
+
static inline void writew_be(u16 val, volatile void __iomem *addr)
617
620
{
618
621
out_be16(addr, val);
619
622
}
620
623
621
-
static inline void writel_be(u32 val, PCI_IO_ADDR addr)
624
+
static inline void writel_be(u32 val, volatile void __iomem *addr)
622
625
{
623
626
out_be32(addr, val);
624
627
}
625
628
626
-
static inline void readsb(const PCI_IO_ADDR a, void *b, unsigned long c)
629
+
static inline void readsb(const volatile void __iomem *a, void *b, unsigned long c)
627
630
{
628
631
__do_readsb(a, b, c);
629
632
}
630
633
#define readsb readsb
631
634
632
-
static inline void readsw(const PCI_IO_ADDR a, void *b, unsigned long c)
635
+
static inline void readsw(const volatile void __iomem *a, void *b, unsigned long c)
633
636
{
634
637
__do_readsw(a, b, c);
635
638
}
636
639
#define readsw readsw
637
640
638
-
static inline void readsl(const PCI_IO_ADDR a, void *b, unsigned long c)
641
+
static inline void readsl(const volatile void __iomem *a, void *b, unsigned long c)
639
642
{
640
643
__do_readsl(a, b, c);
641
644
}
642
645
#define readsl readsl
643
646
644
-
static inline void writesb(PCI_IO_ADDR a, const void *b, unsigned long c)
647
+
static inline void writesb(volatile void __iomem *a, const void *b, unsigned long c)
645
648
{
646
649
__do_writesb(a, b, c);
647
650
}
648
651
#define writesb writesb
649
652
650
-
static inline void writesw(PCI_IO_ADDR a, const void *b, unsigned long c)
653
+
static inline void writesw(volatile void __iomem *a, const void *b, unsigned long c)
651
654
{
652
655
__do_writesw(a, b, c);
653
656
}
654
657
#define writesw writesw
655
658
656
-
static inline void writesl(PCI_IO_ADDR a, const void *b, unsigned long c)
659
+
static inline void writesl(volatile void __iomem *a, const void *b, unsigned long c)
657
660
{
658
661
__do_writesl(a, b, c);
659
662
}
660
663
#define writesl writesl
661
664
662
-
static inline void memset_io(PCI_IO_ADDR a, int c, unsigned long n)
665
+
static inline void memset_io(volatile void __iomem *a, int c, unsigned long n)
663
666
{
664
667
_memset_io(a, c, n);
665
668
}
666
669
#define memset_io memset_io
667
670
668
-
static inline void memcpy_fromio(void *d, const PCI_IO_ADDR s, unsigned long n)
671
+
static inline void memcpy_fromio(void *d, const volatile void __iomem *s, unsigned long n)
669
672
{
670
673
__do_memcpy_fromio(d, s, n);
671
674
}
672
675
#define memcpy_fromio memcpy_fromio
673
676
674
-
static inline void memcpy_toio(PCI_IO_ADDR d, const void *s, unsigned long n)
677
+
static inline void memcpy_toio(volatile void __iomem *d, const void *s, unsigned long n)
675
678
{
676
679
_memcpy_toio(d, s, n);
677
680
}
678
681
#define memcpy_toio memcpy_toio
679
682
680
683
#ifdef __powerpc64__
681
-
static inline u64 readq(const PCI_IO_ADDR addr)
684
+
static inline u64 readq(const volatile void __iomem *addr)
682
685
{
683
686
return __do_readq(addr);
684
687
}
685
688
686
-
static inline u64 readq_be(const PCI_IO_ADDR addr)
689
+
static inline u64 readq_be(const volatile void __iomem *addr)
687
690
{
688
691
return __do_readq_be(addr);
689
692
}
690
693
691
-
static inline void writeq(u64 val, PCI_IO_ADDR addr)
694
+
static inline void writeq(u64 val, volatile void __iomem *addr)
692
695
{
693
696
out_le64(addr, val);
694
697
}
695
698
696
-
static inline void writeq_be(u64 val, PCI_IO_ADDR addr)
699
+
static inline void writeq_be(u64 val, volatile void __iomem *addr)
697
700
{
698
701
out_be64(addr, val);
699
702
}