Skip to contentSkip to conversation

mm/highmem.c: fix coding style issue

PATCH Applied songqiang 2 participants 2 messages Mar 11, 2021

Subsystems (2)
lore
Share & tools
lore

songqiang

author
#0 lore raw

PATCH 1/1 mm/highmem.c: fix coding style issue

Delete/add some blank lines and some blank spaces

---
 mm/highmem.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
mm/highmem.c +5 -7
index 1352a27951e3..902154b76030 100644
@@ -110,7 +110,7 @@ EXPORT_SYMBOL(_totalhigh_pages);
 
 EXPORT_PER_CPU_SYMBOL(__kmap_atomic_idx);
 
-unsigned int nr_free_highpages (void)
+unsigned int nr_free_highpages(void)
 {
 	struct zone *zone;
 	unsigned int pages = 0;
@@ -126,7 +126,7 @@ unsigned int nr_free_highpages (void)
 static int pkmap_count[LAST_PKMAP];
 static  __cacheline_aligned_in_smp DEFINE_SPINLOCK(kmap_lock);
 
-pte_t * pkmap_page_table;
+pte_t *pkmap_page_table;
 
 /*
  * Most architectures have no use for kmap_high_get(), so let's abstract
@@ -153,6 +153,7 @@ struct page *kmap_to_page(void *vaddr)
 
 	if (addr >= PKMAP_ADDR(0) && addr < PKMAP_ADDR(LAST_PKMAP)) {
 		int i = PKMAP_NR(addr);
+
 		return pte_page(pkmap_page_table[i]);
 	}
 
@@ -287,9 +288,8 @@ void *kmap_high(struct page *page)
 	pkmap_count[PKMAP_NR(vaddr)]++;
 	BUG_ON(pkmap_count[PKMAP_NR(vaddr)] < 2);
 	unlock_kmap();
-	return (void*) vaddr;
+	return (void *) vaddr;
 }
-
 EXPORT_SYMBOL(kmap_high);
 
 #ifdef ARCH_NEEDS_KMAP_HIGH_GET
@@ -314,7 +314,7 @@ void *kmap_high_get(struct page *page)
 		pkmap_count[PKMAP_NR(vaddr)]++;
 	}
 	unlock_kmap_any(flags);
-	return (void*) vaddr;
+	return (void *) vaddr;
 }
 #endif
 
@@ -367,7 +367,6 @@ void kunmap_high(struct page *page)
 	if (need_wakeup)
 		wake_up(pkmap_map_wait);
 }
-
 EXPORT_SYMBOL(kunmap_high);
 #endif	/* CONFIG_HIGHMEM */
 
@@ -431,7 +430,6 @@ void *page_address(const struct page *page)
 	spin_unlock_irqrestore(&pas->lock, flags);
 	return ret;
 }
-
 EXPORT_SYMBOL(page_address);
 
 /**
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 67 lines · songqiang

Delete/add some blank lines and some blank spaces

---
  mm/highmem.c | 12 +++++-------
  1 file changed, 5 insertions(+), 7 deletions(-)
mm/highmem.c +5 -6
index 1352a27951e3..902154b76030 100644
@@ -110,7 +110,7 @@ EXPORT_SYMBOL(_totalhigh_pages);
 
  EXPORT_PER_CPU_SYMBOL(__kmap_atomic_idx);
 
-unsigned int nr_free_highpages (void)
+unsigned int nr_free_highpages(void)
  {
  	struct zone *zone;
  	unsigned int pages = 0;
@@ -126,7 +126,7 @@ unsigned int nr_free_highpages (void)
  static int pkmap_count[LAST_PKMAP];
  static  __cacheline_aligned_in_smp DEFINE_SPINLOCK(kmap_lock);
 
-pte_t * pkmap_page_table;
+pte_t *pkmap_page_table;
 
  /*
   * Most architectures have no use for kmap_high_get(), so let's abstract
@@ -153,6 +153,7 @@ struct page *kmap_to_page(void *vaddr)
 
  	if (addr >= PKMAP_ADDR(0) && addr < PKMAP_ADDR(LAST_PKMAP)) {
  		int i = PKMAP_NR(addr);
+
  		return pte_page(pkmap_page_table[i]);
  	}
 
@@ -287,9 +288,8 @@ void *kmap_high(struct page *page)
  	pkmap_count[PKMAP_NR(vaddr)]++;
  	BUG_ON(pkmap_count[PKMAP_NR(vaddr)] < 2);
  	unlock_kmap();
-	return (void*) vaddr;
+	return (void *) vaddr;
  }
-
  EXPORT_SYMBOL(kmap_high);
 
  #ifdef ARCH_NEEDS_KMAP_HIGH_GET
@@ -314,7 +314,7 @@ void *kmap_high_get(struct page *page)
  		pkmap_count[PKMAP_NR(vaddr)]++;
  	}
  	unlock_kmap_any(flags);
-	return (void*) vaddr;
+	return (void *) vaddr;
  }
  #endif
 
@@ -367,7 +367,6 @@ void kunmap_high(struct page *page)
  	if (need_wakeup)
  		wake_up(pkmap_map_wait);
  }
-
  EXPORT_SYMBOL(kunmap_high);
  #endif	/* CONFIG_HIGHMEM */
 

mm/highmem.c void *page_address(const struct page *page) · line 435

Quoted 7 lines
mm/highmem.c +0 -1
@@ -431,7 +430,6 @@ void *page_address(const struct page *page)
  	spin_unlock_irqrestore(&pas->lock, flags);
  	return ret;
  }
-
  EXPORT_SYMBOL(page_address);
 
  /**
Signature · 3 lines
Thanks,

David / dhildenb