[tip:x86/cleanups] x86: Clean up various simple wrapper functions

2016-09-13 Thread tip-bot for Masahiro Yamada 
Commit-ID:  f148b41e8b2e114d0aba023adf326b03368f3246
Gitweb: http://git.kernel.org/tip/f148b41e8b2e114d0aba023adf326b03368f3246
Author: Masahiro Yamada 
AuthorDate: Sun, 11 Sep 2016 14:58:21 +0900
Committer:  Ingo Molnar 
CommitDate: Tue, 13 Sep 2016 20:42:58 +0200

x86: Clean up various simple wrapper functions

Remove unneeded variables and assignments.

While we are here, let's fix the following as well:

  - Remove unnecessary parentheses
  - Remove unnecessary unsigned-suffix 'U' from constant values
  - Reword the comment in set_apic_id() (suggested by Thomas Gleixner)

Signed-off-by: Masahiro Yamada 
Cc: Alex Thorlton 
Cc: Andrew Banman 
Cc: Borislav Petkov 
Cc: Daniel J Blueman 
Cc: Denys Vlasenko 
Cc: Dimitri Sivanich 
Cc: Linus Torvalds 
Cc: Matt Fleming 
Cc: Mike Travis 
Cc: Nathan Zimmer 
Cc: Paul Gortmaker 
Cc: Peter Zijlstra 
Cc: Steffen Persvold 
Cc: Thomas Gleixner 
Cc: Toshi Kani 
Cc: Wei Jiangang 
Link: 
http://lkml.kernel.org/r/1473573502-27954-1-git-send-email-yamada.masah...@socionext.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/kernel/apic/apic_flat_64.c  | 16 +++-
 arch/x86/kernel/apic/apic_numachip.c |  5 +
 arch/x86/kernel/apic/x2apic_uv_x.c   |  7 ++-
 arch/x86/mm/pat_rbtree.c |  4 +---
 arch/x86/platform/uv/bios_uv.c   |  7 ++-
 arch/x86/platform/uv/tlb_uv.c|  6 +-
 6 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/arch/x86/kernel/apic/apic_flat_64.c 
b/arch/x86/kernel/apic/apic_flat_64.c
index 5b2ae10..70796f5 100644
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -116,27 +116,17 @@ static void flat_send_IPI_all(int vector)
 
 static unsigned int flat_get_apic_id(unsigned long x)
 {
-   unsigned int id;
-
-   id = (((x)>>24) & 0xFFu);
-
-   return id;
+   return (x >> 24) & 0xFF;
 }
 
 static unsigned long set_apic_id(unsigned int id)
 {
-   unsigned long x;
-
-   x = ((id & 0xFFu)<<24);
-   return x;
+   return (id & 0xFF) << 24;
 }
 
 static unsigned int read_xapic_id(void)
 {
-   unsigned int id;
-
-   id = flat_get_apic_id(apic_read(APIC_ID));
-   return id;
+   return flat_get_apic_id(apic_read(APIC_ID));
 }
 
 static int flat_apic_id_registered(void)
diff --git a/arch/x86/kernel/apic/apic_numachip.c 
b/arch/x86/kernel/apic/apic_numachip.c
index 714d4fd..e08fe2c 100644
--- a/arch/x86/kernel/apic/apic_numachip.c
+++ b/arch/x86/kernel/apic/apic_numachip.c
@@ -40,10 +40,7 @@ static unsigned int numachip1_get_apic_id(unsigned long x)
 
 static unsigned long numachip1_set_apic_id(unsigned int id)
 {
-   unsigned long x;
-
-   x = ((id & 0xffU) << 24);
-   return x;
+   return (id & 0xff) << 24;
 }
 
 static unsigned int numachip2_get_apic_id(unsigned long x)
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c 
b/arch/x86/kernel/apic/x2apic_uv_x.c
index cb0673c..0f8cd92 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -533,11 +533,8 @@ static unsigned int x2apic_get_apic_id(unsigned long x)
 
 static unsigned long set_apic_id(unsigned int id)
 {
-   unsigned long x;
-
-   /* maskout x2apic_extra_bits ? */
-   x = id;
-   return x;
+   /* CHECKME: Do we need to mask out the xapic extra bits? */
+   return id;
 }
 
 static unsigned int uv_read_apic_id(void)
diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
index de391b7..159b52c 100644
--- a/arch/x86/mm/pat_rbtree.c
+++ b/arch/x86/mm/pat_rbtree.c
@@ -254,9 +254,7 @@ struct memtype *rbt_memtype_erase(u64 start, u64 end)
 
 struct memtype *rbt_memtype_lookup(u64 addr)
 {
-   struct memtype *data;
-   data = memtype_rb_lowest_match(_rbroot, addr, addr + PAGE_SIZE);
-   return data;
+   return memtype_rb_lowest_match(_rbroot, addr, addr + PAGE_SIZE);
 }
 
 #if defined(CONFIG_DEBUG_FS)
diff --git a/arch/x86/platform/uv/bios_uv.c b/arch/x86/platform/uv/bios_uv.c
index 23f2f3e..b4d5e95 100644
--- a/arch/x86/platform/uv/bios_uv.c
+++ b/arch/x86/platform/uv/bios_uv.c
@@ -149,11 +149,8 @@ EXPORT_SYMBOL_GPL(uv_bios_change_memprotect);
 s64
 uv_bios_reserved_page_pa(u64 buf, u64 *cookie, u64 *addr, u64 *len)
 {
-   s64 ret;
-
-   ret = uv_bios_call_irqsave(UV_BIOS_GET_PARTITION_ADDR, (u64)cookie,
-   (u64)addr, buf, (u64)len, 0);
-   return ret;
+   return uv_bios_call_irqsave(UV_BIOS_GET_PARTITION_ADDR, (u64)cookie,
+   (u64)addr, buf, (u64)len, 0);
 }

[tip:x86/cleanups] x86: Clean up various simple wrapper functions

2016-09-13 Thread tip-bot for Masahiro Yamada 
Commit-ID:  f148b41e8b2e114d0aba023adf326b03368f3246
Gitweb: http://git.kernel.org/tip/f148b41e8b2e114d0aba023adf326b03368f3246
Author: Masahiro Yamada 
AuthorDate: Sun, 11 Sep 2016 14:58:21 +0900
Committer:  Ingo Molnar 
CommitDate: Tue, 13 Sep 2016 20:42:58 +0200

x86: Clean up various simple wrapper functions

Remove unneeded variables and assignments.

While we are here, let's fix the following as well:

  - Remove unnecessary parentheses
  - Remove unnecessary unsigned-suffix 'U' from constant values
  - Reword the comment in set_apic_id() (suggested by Thomas Gleixner)

Signed-off-by: Masahiro Yamada 
Cc: Alex Thorlton 
Cc: Andrew Banman 
Cc: Borislav Petkov 
Cc: Daniel J Blueman 
Cc: Denys Vlasenko 
Cc: Dimitri Sivanich 
Cc: Linus Torvalds 
Cc: Matt Fleming 
Cc: Mike Travis 
Cc: Nathan Zimmer 
Cc: Paul Gortmaker 
Cc: Peter Zijlstra 
Cc: Steffen Persvold 
Cc: Thomas Gleixner 
Cc: Toshi Kani 
Cc: Wei Jiangang 
Link: 
http://lkml.kernel.org/r/1473573502-27954-1-git-send-email-yamada.masah...@socionext.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/kernel/apic/apic_flat_64.c  | 16 +++-
 arch/x86/kernel/apic/apic_numachip.c |  5 +
 arch/x86/kernel/apic/x2apic_uv_x.c   |  7 ++-
 arch/x86/mm/pat_rbtree.c |  4 +---
 arch/x86/platform/uv/bios_uv.c   |  7 ++-
 arch/x86/platform/uv/tlb_uv.c|  6 +-
 6 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/arch/x86/kernel/apic/apic_flat_64.c 
b/arch/x86/kernel/apic/apic_flat_64.c
index 5b2ae10..70796f5 100644
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -116,27 +116,17 @@ static void flat_send_IPI_all(int vector)
 
 static unsigned int flat_get_apic_id(unsigned long x)
 {
-   unsigned int id;
-
-   id = (((x)>>24) & 0xFFu);
-
-   return id;
+   return (x >> 24) & 0xFF;
 }
 
 static unsigned long set_apic_id(unsigned int id)
 {
-   unsigned long x;
-
-   x = ((id & 0xFFu)<<24);
-   return x;
+   return (id & 0xFF) << 24;
 }
 
 static unsigned int read_xapic_id(void)
 {
-   unsigned int id;
-
-   id = flat_get_apic_id(apic_read(APIC_ID));
-   return id;
+   return flat_get_apic_id(apic_read(APIC_ID));
 }
 
 static int flat_apic_id_registered(void)
diff --git a/arch/x86/kernel/apic/apic_numachip.c 
b/arch/x86/kernel/apic/apic_numachip.c
index 714d4fd..e08fe2c 100644
--- a/arch/x86/kernel/apic/apic_numachip.c
+++ b/arch/x86/kernel/apic/apic_numachip.c
@@ -40,10 +40,7 @@ static unsigned int numachip1_get_apic_id(unsigned long x)
 
 static unsigned long numachip1_set_apic_id(unsigned int id)
 {
-   unsigned long x;
-
-   x = ((id & 0xffU) << 24);
-   return x;
+   return (id & 0xff) << 24;
 }
 
 static unsigned int numachip2_get_apic_id(unsigned long x)
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c 
b/arch/x86/kernel/apic/x2apic_uv_x.c
index cb0673c..0f8cd92 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -533,11 +533,8 @@ static unsigned int x2apic_get_apic_id(unsigned long x)
 
 static unsigned long set_apic_id(unsigned int id)
 {
-   unsigned long x;
-
-   /* maskout x2apic_extra_bits ? */
-   x = id;
-   return x;
+   /* CHECKME: Do we need to mask out the xapic extra bits? */
+   return id;
 }
 
 static unsigned int uv_read_apic_id(void)
diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
index de391b7..159b52c 100644
--- a/arch/x86/mm/pat_rbtree.c
+++ b/arch/x86/mm/pat_rbtree.c
@@ -254,9 +254,7 @@ struct memtype *rbt_memtype_erase(u64 start, u64 end)
 
 struct memtype *rbt_memtype_lookup(u64 addr)
 {
-   struct memtype *data;
-   data = memtype_rb_lowest_match(_rbroot, addr, addr + PAGE_SIZE);
-   return data;
+   return memtype_rb_lowest_match(_rbroot, addr, addr + PAGE_SIZE);
 }
 
 #if defined(CONFIG_DEBUG_FS)
diff --git a/arch/x86/platform/uv/bios_uv.c b/arch/x86/platform/uv/bios_uv.c
index 23f2f3e..b4d5e95 100644
--- a/arch/x86/platform/uv/bios_uv.c
+++ b/arch/x86/platform/uv/bios_uv.c
@@ -149,11 +149,8 @@ EXPORT_SYMBOL_GPL(uv_bios_change_memprotect);
 s64
 uv_bios_reserved_page_pa(u64 buf, u64 *cookie, u64 *addr, u64 *len)
 {
-   s64 ret;
-
-   ret = uv_bios_call_irqsave(UV_BIOS_GET_PARTITION_ADDR, (u64)cookie,
-   (u64)addr, buf, (u64)len, 0);
-   return ret;
+   return uv_bios_call_irqsave(UV_BIOS_GET_PARTITION_ADDR, (u64)cookie,
+   (u64)addr, buf, (u64)len, 0);
 }
 EXPORT_SYMBOL_GPL(uv_bios_reserved_page_pa);
 
diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
index fdb4d42..276e1b7 100644
--- a/arch/x86/platform/uv/tlb_uv.c
+++ b/arch/x86/platform/uv/tlb_uv.c
@@ -580,11 +580,7 @@ static int uv1_wait_completion(struct bau_desc *bau_desc,
  */
 static unsigned long uv2_3_read_status(unsigned long offset, int rshft, int 
desc)
 {
-   unsigned long descriptor_status;
-
-