Skip to content

Commit 28a679e

Browse files
linuswarndb
authored andcommitted
parisc: Drop homebrewn io[read|write]64_[lo_hi|hi_lo]
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]>
1 parent fdc5beb commit 28a679e

File tree

1 file changed

+0
-36
lines changed

1 file changed

+0
-36
lines changed

arch/parisc/lib/iomap.c

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -360,26 +360,6 @@ u64 ioread64be(const void __iomem *addr)
360360
}
361361
#endif
362362

363-
u64 ioread64_lo_hi(const void __iomem *addr)
364-
{
365-
u32 low, high;
366-
367-
low = ioread32(addr);
368-
high = ioread32(addr + sizeof(u32));
369-
370-
return low + ((u64)high << 32);
371-
}
372-
373-
u64 ioread64_hi_lo(const void __iomem *addr)
374-
{
375-
u32 low, high;
376-
377-
high = ioread32(addr + sizeof(u32));
378-
low = ioread32(addr);
379-
380-
return low + ((u64)high << 32);
381-
}
382-
383363
void iowrite8(u8 datum, void __iomem *addr)
384364
{
385365
if (unlikely(INDIRECT_ADDR(addr))) {
@@ -445,18 +425,6 @@ void iowrite64be(u64 datum, void __iomem *addr)
445425
}
446426
#endif
447427

448-
void iowrite64_lo_hi(u64 val, void __iomem *addr)
449-
{
450-
iowrite32(val, addr);
451-
iowrite32(val >> 32, addr + sizeof(u32));
452-
}
453-
454-
void iowrite64_hi_lo(u64 val, void __iomem *addr)
455-
{
456-
iowrite32(val >> 32, addr + sizeof(u32));
457-
iowrite32(val, addr);
458-
}
459-
460428
/* Repeating interfaces */
461429

462430
void ioread8_rep(const void __iomem *addr, void *dst, unsigned long count)
@@ -564,8 +532,6 @@ EXPORT_SYMBOL(ioread32be);
564532
EXPORT_SYMBOL(ioread64);
565533
EXPORT_SYMBOL(ioread64be);
566534
#endif
567-
EXPORT_SYMBOL(ioread64_lo_hi);
568-
EXPORT_SYMBOL(ioread64_hi_lo);
569535
EXPORT_SYMBOL(iowrite8);
570536
EXPORT_SYMBOL(iowrite16);
571537
EXPORT_SYMBOL(iowrite16be);
@@ -575,8 +541,6 @@ EXPORT_SYMBOL(iowrite32be);
575541
EXPORT_SYMBOL(iowrite64);
576542
EXPORT_SYMBOL(iowrite64be);
577543
#endif
578-
EXPORT_SYMBOL(iowrite64_lo_hi);
579-
EXPORT_SYMBOL(iowrite64_hi_lo);
580544
EXPORT_SYMBOL(ioread8_rep);
581545
EXPORT_SYMBOL(ioread16_rep);
582546
EXPORT_SYMBOL(ioread32_rep);

0 commit comments

Comments
 (0)