Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / arch / x86 / kernel / apic / apic_flat_64.c

diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
index 8862da7..a4d7ff2 100644 (file)
--- 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)