Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: 77bfc8bdb5a1 ("parisc: Remove 64bit access on 32bit machines")
Cc: Arnd Bergmann <arnd@arndb.de>
Acked-by: Helge Deller <deller@gmx.de>
Reported-by: Helge Deller <deller@gmx.de>
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

authored by

Linus Walleij and committed by
Arnd Bergmann
28a679ea fdc5bebf

-36
-36
arch/parisc/lib/iomap.c
··· 360 360 } 361 361 #endif 362 362 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 - 383 363 void iowrite8(u8 datum, void __iomem *addr) 384 364 { 385 365 if (unlikely(INDIRECT_ADDR(addr))) { ··· 424 444 } 425 445 } 426 446 #endif 427 - 428 - void iowrite64_lo_hi(u64 val, void __iomem *addr) 429 - { 430 - iowrite32(val, addr); 431 - iowrite32(val >> 32, addr + sizeof(u32)); 432 - } 433 - 434 - void iowrite64_hi_lo(u64 val, void __iomem *addr) 435 - { 436 - iowrite32(val >> 32, addr + sizeof(u32)); 437 - iowrite32(val, addr); 438 - } 439 447 440 448 /* Repeating interfaces */ 441 449 ··· 532 564 EXPORT_SYMBOL(ioread64); 533 565 EXPORT_SYMBOL(ioread64be); 534 566 #endif 535 - EXPORT_SYMBOL(ioread64_lo_hi); 536 - EXPORT_SYMBOL(ioread64_hi_lo); 537 567 EXPORT_SYMBOL(iowrite8); 538 568 EXPORT_SYMBOL(iowrite16); 539 569 EXPORT_SYMBOL(iowrite16be); ··· 541 575 EXPORT_SYMBOL(iowrite64); 542 576 EXPORT_SYMBOL(iowrite64be); 543 577 #endif 544 - EXPORT_SYMBOL(iowrite64_lo_hi); 545 - EXPORT_SYMBOL(iowrite64_hi_lo); 546 578 EXPORT_SYMBOL(ioread8_rep); 547 579 EXPORT_SYMBOL(ioread16_rep); 548 580 EXPORT_SYMBOL(ioread32_rep);