frv: remove the second parameter of kmap_atomic_primary()

All callers of kmap_atomic_primary() use __KM_CACHE, so it can be
removed safely, and __kmap_atomic_primary() only check if 'type' if
__KM_CACHE or not, so 'type' can be changed to a boolean as well.

Ditto for kunmap_atomic_primary()/__kunmap_atomic_primary().

Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Cong Wang <amwang@redhat.com>

2 files changed, 14 insertions, 14 deletions

diff --git a/arch/frv/mm/cache-page.c b/arch/frv/mm/cache-page.c
index b24ade27a0f0..8e09dae0ec3f 100644
--- a/arch/frv/mm/cache-page.c
+++ b/arch/frv/mm/cache-page.c
@@ -26,11 +26,11 @@ void flush_dcache_page(struct page *page)
 
         dampr2 = __get_DAMPR(2);
 
-        vaddr = kmap_atomic_primary(page, __KM_CACHE);
+        vaddr = kmap_atomic_primary(page);
 
         frv_dcache_writeback((unsigned long) vaddr, (unsigned long) vaddr + PAGE_SIZE);
 
-        kunmap_atomic_primary(vaddr, __KM_CACHE);
+        kunmap_atomic_primary(vaddr);
 
         if (dampr2) {
                 __set_DAMPR(2, dampr2);
@@ -54,12 +54,12 @@ void flush_icache_user_range(struct vm_area_struct *vma, struct page *page,
 
         dampr2 = __get_DAMPR(2);
 
-        vaddr = kmap_atomic_primary(page, __KM_CACHE);
+        vaddr = kmap_atomic_primary(page);
 
         start = (start & ~PAGE_MASK) | (unsigned long) vaddr;
         frv_cache_wback_inv(start, start + len);
 
-        kunmap_atomic_primary(vaddr, __KM_CACHE);
+        kunmap_atomic_primary(vaddr);
 
         if (dampr2) {
                 __set_DAMPR(2, dampr2);
diff --git a/arch/frv/mm/highmem.c b/arch/frv/mm/highmem.c
index 31902c9d5be5..bed9a9bd3c10 100644
--- a/arch/frv/mm/highmem.c
+++ b/arch/frv/mm/highmem.c
@@ -50,11 +50,11 @@ void *kmap_atomic(struct page *page)
         /*
          * The first 4 primary maps are reserved for architecture code
          */
-        case 0:         return __kmap_atomic_primary(4, paddr, 6);
-        case 1:         return __kmap_atomic_primary(5, paddr, 7);
-        case 2:         return __kmap_atomic_primary(6, paddr, 8);
-        case 3:         return __kmap_atomic_primary(7, paddr, 9);
-        case 4:         return __kmap_atomic_primary(8, paddr, 10);
+        case 0:         return __kmap_atomic_primary(0, paddr, 6);
+        case 1:         return __kmap_atomic_primary(0, paddr, 7);
+        case 2:         return __kmap_atomic_primary(0, paddr, 8);
+        case 3:         return __kmap_atomic_primary(0, paddr, 9);
+        case 4:         return __kmap_atomic_primary(0, paddr, 10);
 
         case 5 ... 5 + NR_TLB_LINES - 1:
                 return __kmap_atomic_secondary(type - 5, paddr);
@@ -70,11 +70,11 @@ void __kunmap_atomic(void *kvaddr)
 {
         int type = kmap_atomic_idx();
         switch (type) {
-        case 0:         __kunmap_atomic_primary(4, 6);  break;
-        case 1:         __kunmap_atomic_primary(5, 7);  break;
-        case 2:         __kunmap_atomic_primary(6, 8);  break;
-        case 3:         __kunmap_atomic_primary(7, 9);  break;
-        case 4:         __kunmap_atomic_primary(8, 10); break;
+        case 0:         __kunmap_atomic_primary(0, 6);  break;
+        case 1:         __kunmap_atomic_primary(0, 7);  break;
+        case 2:         __kunmap_atomic_primary(0, 8);  break;
+        case 3:         __kunmap_atomic_primary(0, 9);  break;
+        case 4:         __kunmap_atomic_primary(0, 10); break;
 
         case 5 ... 5 + NR_TLB_LINES - 1:
                 __kunmap_atomic_secondary(type - 5, kvaddr);