Skip to content

Commit

Permalink
parisc: Drop homebrewn io[read|write]64_[lo_hi|hi_lo]
Browse files Browse the repository at this point in the history
The parisc implements ioread64_lo_hi(), ioread64_hi_lo()
iowrite64_lo_hi() and iowrite64_hi_lo() while we already
have a perfectly working generic version in the generic
portable assembly in <linux/io-64-nonatomic-hi-lo.h>.

Drop the custom versions in favor for the defaults.

Fixes: 77bfc8b ("parisc: Remove 64bit access on 32bit machines")
Cc: Arnd Bergmann <[email protected]>
Acked-by: Helge Deller <[email protected]>
Reported-by: Helge Deller <[email protected]>
Reported-by: kernel test robot <[email protected]>
Signed-off-by: Linus Walleij <[email protected]>
Signed-off-by: Arnd Bergmann <[email protected]>
  • Loading branch information
linusw authored and arndb committed Sep 23, 2022
1 parent fdc5beb commit 28a679e
Showing 1 changed file with 0 additions and 36 deletions.
36 changes: 0 additions & 36 deletions arch/parisc/lib/iomap.c
Original file line number Diff line number Diff line change
Expand Up @@ -360,26 +360,6 @@ u64 ioread64be(const void __iomem *addr)
}
#endif

u64 ioread64_lo_hi(const void __iomem *addr)
{
u32 low, high;

low = ioread32(addr);
high = ioread32(addr + sizeof(u32));

return low + ((u64)high << 32);
}

u64 ioread64_hi_lo(const void __iomem *addr)
{
u32 low, high;

high = ioread32(addr + sizeof(u32));
low = ioread32(addr);

return low + ((u64)high << 32);
}

void iowrite8(u8 datum, void __iomem *addr)
{
if (unlikely(INDIRECT_ADDR(addr))) {
Expand Down Expand Up @@ -445,18 +425,6 @@ void iowrite64be(u64 datum, void __iomem *addr)
}
#endif

void iowrite64_lo_hi(u64 val, void __iomem *addr)
{
iowrite32(val, addr);
iowrite32(val >> 32, addr + sizeof(u32));
}

void iowrite64_hi_lo(u64 val, void __iomem *addr)
{
iowrite32(val >> 32, addr + sizeof(u32));
iowrite32(val, addr);
}

/* Repeating interfaces */

void ioread8_rep(const void __iomem *addr, void *dst, unsigned long count)
Expand Down Expand Up @@ -564,8 +532,6 @@ EXPORT_SYMBOL(ioread32be);
EXPORT_SYMBOL(ioread64);
EXPORT_SYMBOL(ioread64be);
#endif
EXPORT_SYMBOL(ioread64_lo_hi);
EXPORT_SYMBOL(ioread64_hi_lo);
EXPORT_SYMBOL(iowrite8);
EXPORT_SYMBOL(iowrite16);
EXPORT_SYMBOL(iowrite16be);
Expand All @@ -575,8 +541,6 @@ EXPORT_SYMBOL(iowrite32be);
EXPORT_SYMBOL(iowrite64);
EXPORT_SYMBOL(iowrite64be);
#endif
EXPORT_SYMBOL(iowrite64_lo_hi);
EXPORT_SYMBOL(iowrite64_hi_lo);
EXPORT_SYMBOL(ioread8_rep);
EXPORT_SYMBOL(ioread16_rep);
EXPORT_SYMBOL(ioread32_rep);
Expand Down

0 comments on commit 28a679e

Please sign in to comment.