Unverified Commit 28a679ea authored by Linus Walleij's avatar Linus Walleij Committed by Arnd Bergmann
Browse files

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: 77bfc8bd ("parisc: Remove 64bit access on 32bit machines")
Cc: Arnd Bergmann <arnd@arndb.de>
Acked-by: default avatarHelge Deller <deller@gmx.de>
Reported-by: default avatarHelge Deller <deller@gmx.de>
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent fdc5bebf

arch/parisc/lib/iomap.c

+0 −36
Original line number Diff line number Diff line
@@ -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))) {
@@ -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)
@@ -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);
@@ -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);