aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Desaulniers <nick.desaulniers@gmail.com>2016-12-12 18:28:05 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-01-27 05:21:58 -0500
commit2dc8ffad8c53e65f85d1a9ece2721463d729054a (patch)
treeaecdf24d387e9a0066e21351d953a5fbdce7cd8d
parent7a308bb3016f57e5be11a677d15b821536419d36 (diff)
ACPI / idle: small formatting fixes
A quick cleanup with scripts/checkpatch.pl -f <file>. Signed-off-by: Nick Desaulniers <nick.desaulniers@gmail.com> Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--arch/x86/kernel/acpi/cstate.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/x86/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c
index af15f4444330..8233a630280f 100644
--- a/arch/x86/kernel/acpi/cstate.c
+++ b/arch/x86/kernel/acpi/cstate.c
@@ -12,7 +12,6 @@
12#include <linux/sched.h> 12#include <linux/sched.h>
13 13
14#include <acpi/processor.h> 14#include <acpi/processor.h>
15#include <asm/acpi.h>
16#include <asm/mwait.h> 15#include <asm/mwait.h>
17#include <asm/special_insns.h> 16#include <asm/special_insns.h>
18 17
@@ -89,7 +88,8 @@ static long acpi_processor_ffh_cstate_probe_cpu(void *_cx)
89 retval = 0; 88 retval = 0;
90 /* If the HW does not support any sub-states in this C-state */ 89 /* If the HW does not support any sub-states in this C-state */
91 if (num_cstate_subtype == 0) { 90 if (num_cstate_subtype == 0) {
92 pr_warn(FW_BUG "ACPI MWAIT C-state 0x%x not supported by HW (0x%x)\n", cx->address, edx_part); 91 pr_warn(FW_BUG "ACPI MWAIT C-state 0x%x not supported by HW (0x%x)\n",
92 cx->address, edx_part);
93 retval = -1; 93 retval = -1;
94 goto out; 94 goto out;
95 } 95 }
@@ -104,8 +104,8 @@ static long acpi_processor_ffh_cstate_probe_cpu(void *_cx)
104 if (!mwait_supported[cstate_type]) { 104 if (!mwait_supported[cstate_type]) {
105 mwait_supported[cstate_type] = 1; 105 mwait_supported[cstate_type] = 1;
106 printk(KERN_DEBUG 106 printk(KERN_DEBUG
107 "Monitor-Mwait will be used to enter C-%d " 107 "Monitor-Mwait will be used to enter C-%d state\n",
108 "state\n", cx->type); 108 cx->type);
109 } 109 }
110 snprintf(cx->desc, 110 snprintf(cx->desc,
111 ACPI_CX_DESC_LEN, "ACPI FFH INTEL MWAIT 0x%x", 111 ACPI_CX_DESC_LEN, "ACPI FFH INTEL MWAIT 0x%x",
@@ -166,6 +166,7 @@ EXPORT_SYMBOL_GPL(acpi_processor_ffh_cstate_enter);
166static int __init ffh_cstate_init(void) 166static int __init ffh_cstate_init(void)
167{ 167{
168 struct cpuinfo_x86 *c = &boot_cpu_data; 168 struct cpuinfo_x86 *c = &boot_cpu_data;
169
169 if (c->x86_vendor != X86_VENDOR_INTEL) 170 if (c->x86_vendor != X86_VENDOR_INTEL)
170 return -1; 171 return -1;
171 172