diff mbox

[RFC] ARM: Allow use debug_ll_io_init as .map_io in machine description

Message ID 1372221227-20091-1-git-send-email-shc_work@mail.ru (mailing list archive)
State New, archived
Headers show

Commit Message

Alexander Shiyan June 26, 2013, 4:33 a.m. UTC
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/include/asm/mach/map.h | 4 +---
 arch/arm/mm/mmu.c               | 4 ++++
 2 files changed, 5 insertions(+), 3 deletions(-)

Comments

Arnd Bergmann June 26, 2013, 9:05 a.m. UTC | #1
On Wednesday 26 June 2013 08:33:47 Alexander Shiyan wrote:
> 
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
>  arch/arm/include/asm/mach/map.h | 4 +---
>  arch/arm/mm/mmu.c               | 4 ++++
>  2 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
> index 2fe141f..c1fafc5 100644
> --- a/arch/arm/include/asm/mach/map.h
> +++ b/arch/arm/include/asm/mach/map.h
> @@ -42,10 +42,8 @@ extern void vm_reserve_area_early(unsigned long addr, unsigned long size,
>  
>  #ifdef CONFIG_DEBUG_LL
>  extern void debug_ll_addr(unsigned long *paddr, unsigned long *vaddr);
> -extern void debug_ll_io_init(void);
> -#else
> -static inline void debug_ll_io_init(void) {}
>  #endif
> +extern void debug_ll_io_init(void);
>  
>  struct mem_type;

Hi Alexander,

I don't think you need this, since having a NULL .map_io callback means
the same thing. Just remove the reference in your platform code.

	Arnd
diff mbox

Patch

diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
index 2fe141f..c1fafc5 100644
--- a/arch/arm/include/asm/mach/map.h
+++ b/arch/arm/include/asm/mach/map.h
@@ -42,10 +42,8 @@  extern void vm_reserve_area_early(unsigned long addr, unsigned long size,
 
 #ifdef CONFIG_DEBUG_LL
 extern void debug_ll_addr(unsigned long *paddr, unsigned long *vaddr);
-extern void debug_ll_io_init(void);
-#else
-static inline void debug_ll_io_init(void) {}
 #endif
+extern void debug_ll_io_init(void);
 
 struct mem_type;
 extern const struct mem_type *get_mem_type(unsigned int type);
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index d7229d2..557831b 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -952,6 +952,10 @@  void __init debug_ll_io_init(void)
 	map.type = MT_DEVICE;
 	create_mapping(&map);
 }
+#else
+void __init debug_ll_io_init(void)
+{
+}
 #endif
 
 static void * __initdata vmalloc_min =