[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-843c408905010fbc44a564d2de6a3cd68d986abf@git.kernel.org>
Date: Mon, 30 Jul 2018 11:00:55 -0700
From: tip-bot for Yi Wang <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: jiang.biao2@....com.cn, tglx@...utronix.de, rostedt@...dmis.org,
mingo@...nel.org, hpa@...or.com, wang.yi59@....com.cn,
linux-kernel@...r.kernel.org
Subject: [tip:x86/apic] x86/apic: Trivial coding style fixes
Commit-ID: 843c408905010fbc44a564d2de6a3cd68d986abf
Gitweb: https://git.kernel.org/tip/843c408905010fbc44a564d2de6a3cd68d986abf
Author: Yi Wang <wang.yi59@....com.cn>
AuthorDate: Fri, 27 Jul 2018 14:15:03 +0800
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Mon, 30 Jul 2018 19:56:30 +0200
x86/apic: Trivial coding style fixes
There is inconsistent indenting in calibrate_APIC_clock() and
activate_managed(). Remove the surplus TAB.
Signed-off-by: Yi Wang <wang.yi59@....com.cn>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Reviewed-by: Jiang Biao <jiang.biao2@....com.cn>
Acked-by: Steven Rostedt (VMware) <rostedt@...dmis.org>
Cc: hpa@...or.com
Cc: douly.fnst@...fujitsu.com
Cc: jgross@...e.com
Cc: ville.syrjala@...ux.intel.com
Cc: len.brown@...el.com
Cc: gregkh@...uxfoundation.org
Cc: zhong.weidong@....com.cn
Link: https://lkml.kernel.org/r/1532672103-32250-1-git-send-email-wang.yi59@zte.com.cn
---
arch/x86/kernel/apic/apic.c | 2 +-
arch/x86/kernel/apic/vector.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 2aabd4cb0e3f..00011bc33263 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -937,7 +937,7 @@ static int __init calibrate_APIC_clock(void)
if (levt->features & CLOCK_EVT_FEAT_DUMMY) {
pr_warning("APIC timer disabled due to verification failure\n");
- return -1;
+ return -1;
}
return 0;
diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
index a75de0792942..c943499375c3 100644
--- a/arch/x86/kernel/apic/vector.c
+++ b/arch/x86/kernel/apic/vector.c
@@ -415,7 +415,7 @@ static int activate_managed(struct irq_data *irqd)
pr_err("Managed startup irq %u, no vector available\n",
irqd->irq);
}
- return ret;
+ return ret;
}
static int x86_vector_activate(struct irq_domain *dom, struct irq_data *irqd,
Powered by blists - more mailing lists