Reformat; cosmetic cleanups.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

2 files changed, 20 insertions, 14 deletions

diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c
index fe0110074902..eaecb8631973 100644
--- a/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c
@@ -23,7 +23,8 @@ void (*__flush_cache_all)(void);
 void (*flush_cache_mm)(struct mm_struct *mm);
 void (*flush_cache_range)(struct vm_area_struct *vma, unsigned long start,
         unsigned long end);
-void (*flush_cache_page)(struct vm_area_struct *vma, unsigned long page, unsigned long pfn);
+void (*flush_cache_page)(struct vm_area_struct *vma, unsigned long page,
+        unsigned long pfn);
 void (*flush_icache_range)(unsigned long __user start,
         unsigned long __user end);
 void (*flush_icache_page)(struct vm_area_struct *vma, struct page *page);
diff --git a/include/asm-mips/cacheflush.h b/include/asm-mips/cacheflush.h
index 3711d720aeb4..4213d2c8bb8a 100644
--- a/include/asm-mips/cacheflush.h
+++ b/include/asm-mips/cacheflush.h
@@ -54,19 +54,24 @@ extern void (*flush_icache_range)(unsigned long __user start,
 #define flush_cache_vmap(start, end)            flush_cache_all()
 #define flush_cache_vunmap(start, end)          flush_cache_all()
 
-#define copy_to_user_page(vma, page, vaddr, dst, src, len)              \
-do {                                                                    \
-        if (cpu_has_dc_aliases)                                         \
-                flush_cache_page(vma, vaddr);                           \
-        memcpy(dst, (void *) src, len);                                 \
-        flush_icache_page(vma, page);                                   \
-} while (0)
-#define copy_from_user_page(vma, page, vaddr, dst, src, len)            \
-do {                                                                    \
-        if (cpu_has_dc_aliases)                                         \
-                flush_cache_page(vma, vaddr);                           \
-        memcpy(dst, src, len);                                          \
-} while (0)
+static inline void copy_to_user_page(struct vm_area_struct *vma,
+        struct page *page, unsigned long vaddr, void *dst, const void *src,
+        unsigned long len)
+{
+        if (cpu_has_dc_aliases)
+                flush_cache_page(vma, vaddr, page_to_pfn(page));
+        memcpy(dst, src, len);
+        flush_icache_page(vma, page);
+}
+
+static inline void copy_from_user_page(struct vm_area_struct *vma,
+        struct page *page, unsigned long vaddr, void *dst, const void *src,
+        unsigned long len)
+{
+        if (cpu_has_dc_aliases)
+                flush_cache_page(vma, vaddr, page_to_pfn(page));
+        memcpy(dst, src, len);
+}
 
 extern void (*flush_cache_sigtramp)(unsigned long addr);
 extern void (*flush_icache_all)(void);