x86/apic: Fix ugly casting and branching in cpu_mask_to_apicid_and()

Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/20120614074954.GF3383@dhcp-26-207.brq.redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

4 files changed, 10 insertions, 10 deletions

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 048a4f806d46..c421512ca5eb 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -2127,19 +2127,19 @@ int default_cpu_mask_to_apicid_and(const struct cpumask *cpumask,
                                    const struct cpumask *andmask,
                                    unsigned int *apicid)
 {
-        int cpu;
+        unsigned int cpu;
 
         for_each_cpu_and(cpu, cpumask, andmask) {
                 if (cpumask_test_cpu(cpu, cpu_online_mask))
                         break;
         }
 
-        if (likely((unsigned int)cpu < nr_cpu_ids)) {
+        if (likely(cpu < nr_cpu_ids)) {
                 *apicid = per_cpu(x86_cpu_to_apicid, cpu);
                 return 0;
-        } else {
-                return -EINVAL;
         }
+
+        return -EINVAL;
 }
 
 /*
diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
index 2c5317ea1b83..effece2ea0db 100644
--- a/arch/x86/kernel/apic/es7000_32.c
+++ b/arch/x86/kernel/apic/es7000_32.c
@@ -529,7 +529,7 @@ static inline int
 es7000_cpu_mask_to_apicid(const struct cpumask *cpumask, unsigned int *dest_id)
 {
         unsigned int round = 0;
-        int cpu, uninitialized_var(apicid);
+        unsigned int cpu, uninitialized_var(apicid);
 
         /*
          * The cpus in the mask must all be on the apic cluster.
diff --git a/arch/x86/kernel/apic/summit_32.c b/arch/x86/kernel/apic/summit_32.c
index bbad180f2890..b53fd6c9993a 100644
--- a/arch/x86/kernel/apic/summit_32.c
+++ b/arch/x86/kernel/apic/summit_32.c
@@ -267,7 +267,7 @@ static inline int
 summit_cpu_mask_to_apicid(const struct cpumask *cpumask, unsigned int *dest_id)
 {
         unsigned int round = 0;
-        int cpu, apicid = 0;
+        unsigned int cpu, apicid = 0;
 
         /*
          * The cpus in the mask must all be on the apic cluster.
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 026de0114d15..8cfade9510a4 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -274,7 +274,7 @@ uv_cpu_mask_to_apicid_and(const struct cpumask *cpumask,
                           const struct cpumask *andmask,
                           unsigned int *apicid)
 {
-        int cpu;
+        int unsigned cpu;
 
         /*
          * We're using fixed IRQ delivery, can only return one phys APIC ID.
@@ -285,12 +285,12 @@ uv_cpu_mask_to_apicid_and(const struct cpumask *cpumask,
                         break;
         }
 
-        if (likely((unsigned int)cpu < nr_cpu_ids)) {
+        if (likely(cpu < nr_cpu_ids)) {
                 *apicid = per_cpu(x86_cpu_to_apicid, cpu) | uv_apicid_hibits;
                 return 0;
-        } else {
-                return -EINVAL;
         }
+
+        return -EINVAL;
 }
 
 static unsigned int x2apic_get_apic_id(unsigned long x)