The pending interrupt check code is old, update the following code.

  -Replace for() with for_each_set_bit()
  -Replace printk() with pr_err()

Also merge the printk's code in one line and make curly braces balanced

Suggested-by: Andy Shevchenko <andy.shevche...@gmail.com>
Signed-off-by: Dou Liyang <douly.f...@cn.fujitsu.com>
---
 arch/x86/kernel/apic/apic.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index be223ebd1bb3..b303b29c71ca 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1412,7 +1412,8 @@ static void apic_pending_intr_clear(void)
 {
        long long max_loops = cpu_khz ? cpu_khz : 1000000;
        unsigned long long tsc = 0, ntsc;
-       unsigned int value, queued;
+       unsigned int queued;
+       unsigned long value;
        int i, j, acked = 0;
 
        if (boot_cpu_has(X86_FEATURE_TSC))
@@ -1435,24 +1436,24 @@ static void apic_pending_intr_clear(void)
 
                for (i = APIC_ISR_NR - 1; i >= 0; i--) {
                        value = apic_read(APIC_ISR + i*0x10);
-                       for (j = 31; j >= 0; j--) {
-                               if (value & (1<<j)) {
+                       for_each_set_bit(j, &value, 32) {
+                               if (j) {
                                        ack_APIC_irq();
                                        acked++;
                                }
                        }
                }
                if (acked > 256) {
-                       printk(KERN_ERR "LAPIC pending interrupts after %d 
EOI\n",
-                              acked);
+                       pr_err("LAPIC pending interrupts after %d EOI\n", 
acked);
                        break;
                }
                if (queued) {
                        if (boot_cpu_has(X86_FEATURE_TSC) && cpu_khz) {
                                ntsc = rdtsc();
                                max_loops = (cpu_khz << 10) - (ntsc - tsc);
-                       } else
+                       } else {
                                max_loops--;
+                       }
                }
        } while (queued && max_loops > 0);
        WARN_ON(max_loops <= 0);
-- 
2.14.3



Reply via email to