Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
powerpc/io: Remove unnecessary indirection
Some of the __do_xxx() defines do nothing useful, they just existed to
make the previous hooking macros work. So remove them.
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
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-13-mpe@ellerman.id.au
authored by
Michael Ellerman
and committed by
Madhavan Srinivasan
41c8992c
15efd61f
+9
-21
+9
-21
arch/powerpc/include/asm/io.h
+9
-21
arch/powerpc/include/asm/io.h
···
505
505
* possible to hook directly at the toplevel PIO operation if they have to
506
506
* be handled differently
507
507
*/
508
-
#define __do_writeb(val, addr) out_8(addr, val)
509
-
#define __do_writew(val, addr) out_le16(addr, val)
510
-
#define __do_writel(val, addr) out_le32(addr, val)
511
-
#define __do_writeq(val, addr) out_le64(addr, val)
512
-
#define __do_writew_be(val, addr) out_be16(addr, val)
513
-
#define __do_writel_be(val, addr) out_be32(addr, val)
514
-
#define __do_writeq_be(val, addr) out_be64(addr, val)
515
508
516
509
#ifdef CONFIG_EEH
517
510
#define __do_readb(addr) eeh_readb(addr)
···
560
567
#define __do_outsw(p, b, n) writesw((PCI_IO_ADDR)(_IO_BASE+(p)),(b),(n))
561
568
#define __do_outsl(p, b, n) writesl((PCI_IO_ADDR)(_IO_BASE+(p)),(b),(n))
562
569
563
-
#define __do_memset_io(addr, c, n) \
564
-
_memset_io(addr, c, n)
565
-
#define __do_memcpy_toio(dst, src, n) \
566
-
_memcpy_toio(dst, src, n)
567
-
568
570
#ifdef CONFIG_EEH
569
571
#define __do_memcpy_fromio(dst, src, n) \
570
572
eeh_memcpy_fromio(dst, src, n)
···
598
610
599
611
static inline void writeb(u8 val, PCI_IO_ADDR addr)
600
612
{
601
-
__do_writeb(val, addr);
613
+
out_8(addr, val);
602
614
}
603
615
#define writeb writeb
604
616
605
617
static inline void writew(u16 val, PCI_IO_ADDR addr)
606
618
{
607
-
__do_writew(val, addr);
619
+
out_le16(addr, val);
608
620
}
609
621
#define writew writew
610
622
611
623
static inline void writel(u32 val, PCI_IO_ADDR addr)
612
624
{
613
-
__do_writel(val, addr);
625
+
out_le32(addr, val);
614
626
}
615
627
#define writel writel
616
628
617
629
static inline void writew_be(u16 val, PCI_IO_ADDR addr)
618
630
{
619
-
__do_writew_be(val, addr);
631
+
out_be16(addr, val);
620
632
}
621
633
622
634
static inline void writel_be(u32 val, PCI_IO_ADDR addr)
623
635
{
624
-
__do_writel_be(val, addr);
636
+
out_be32(addr, val);
625
637
}
626
638
627
639
static inline void readsb(const PCI_IO_ADDR a, void *b, unsigned long c)
···
662
674
663
675
static inline void memset_io(PCI_IO_ADDR a, int c, unsigned long n)
664
676
{
665
-
__do_memset_io(a, c, n);
677
+
_memset_io(a, c, n);
666
678
}
667
679
#define memset_io memset_io
668
680
···
674
686
675
687
static inline void memcpy_toio(PCI_IO_ADDR d, const void *s, unsigned long n)
676
688
{
677
-
__do_memcpy_toio(d, s, n);
689
+
_memcpy_toio(d, s, n);
678
690
}
679
691
#define memcpy_toio memcpy_toio
680
692
···
691
703
692
704
static inline void writeq(u64 val, PCI_IO_ADDR addr)
693
705
{
694
-
__do_writeq(val, addr);
706
+
out_le64(addr, val);
695
707
}
696
708
697
709
static inline void writeq_be(u64 val, PCI_IO_ADDR addr)
698
710
{
699
-
__do_writeq_be(val, addr);
711
+
out_be64(addr, val);
700
712
}
701
713
#endif /* __powerpc64__ */
702
714