Skip to content

Commit eabc2a7

Browse files
andy-shevIngo Molnar
authored andcommitted
x86/io: Remove xlate_dev_kmem_ptr() duplication
Generic header defines xlate_dev_kmem_ptr(). Reuse it from generic header and remove in x86 code. Move a description to the generic header as well. Signed-off-by: Andy Shevchenko <[email protected]> Cc: Baolin Wang <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Mika Westerberg <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent c2327da commit eabc2a7

File tree

2 files changed

+3
-5
lines changed
  • arch/x86/include/asm
  • include/asm-generic

2 files changed

+3
-5
lines changed

arch/x86/include/asm/io.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,11 +215,6 @@ extern void set_iounmap_nonlazy(void);
215215

216216
#include <asm-generic/iomap.h>
217217

218-
/*
219-
* Convert a virtual cached pointer to an uncached pointer
220-
*/
221-
#define xlate_dev_kmem_ptr(p) p
222-
223218
/*
224219
* ISA space is 'always mapped' on a typical x86 system, no need to
225220
* explicitly ioremap() it. The fact that the ISA IO space is mapped

include/asm-generic/io.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -915,6 +915,9 @@ extern void ioport_unmap(void __iomem *p);
915915
#endif /* CONFIG_GENERIC_IOMAP */
916916
#endif /* CONFIG_HAS_IOPORT_MAP */
917917

918+
/*
919+
* Convert a virtual cached pointer to an uncached pointer
920+
*/
918921
#ifndef xlate_dev_kmem_ptr
919922
#define xlate_dev_kmem_ptr xlate_dev_kmem_ptr
920923
static inline void *xlate_dev_kmem_ptr(void *addr)

0 commit comments

Comments
 (0)