From patchwork Mon Dec 12 07:25:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 9470087 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 68CB760573 for ; Mon, 12 Dec 2016 07:26:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 590A927F94 for ; Mon, 12 Dec 2016 07:26:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B49C28459; Mon, 12 Dec 2016 07:26:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 32C4827F94 for ; Mon, 12 Dec 2016 07:26:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750984AbcLLH0I (ORCPT ); Mon, 12 Dec 2016 02:26:08 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:36655 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750918AbcLLH0H (ORCPT ); Mon, 12 Dec 2016 02:26:07 -0500 Received: by mail-pg0-f68.google.com with SMTP id x23so142493pgx.3; Sun, 11 Dec 2016 23:26:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=gLkR7NTTNZ+YdAslA+1RycghBOIwDVBDDn1QthumCf4=; b=txhSELYTmVN6vHYbOrAjbFZavsqhEvUzOLAJCfFBOLn8fTZfrKbvbwhjcK67fPZlFM kieWQeNTHToC7+gaqlqmmClbSb1KK02Kpt4XJoH6VSeNUEd5B7s//vLluyDG2LFlodE5 qwkwtfmhRwc6CgliqUxKzVGRY0KcGt+8ZEJ4B4b7nbqu/Nr7gMSAPFIITY1zISyLwDkj XXhHOW/LBLpzHQgX9M1qWsEfI7nTWeK8fPit5/rIMY1E1jKdbcaWTK6lTIZrkx45YghX /GPpvkIvWrMbCk38KsO/VSusOa9tZhJsMrpZlqyh/WyD4u2hnkjL3X4KOQpXoFujzC5n bTFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=gLkR7NTTNZ+YdAslA+1RycghBOIwDVBDDn1QthumCf4=; b=KJgNIymLQFAyOYmrSCEeN6XE5RqaPKFbjP/Mm350JGgv/M2Pz61TG8GyuAK52W4bLq 9sv4NHMRv+5CRqCAOmCJlDrx+97x2L3HXAzrTSlqKwDxblz9vP/Elh9xunQBuOUUlZMT NMs5CFGmisTMWPVon8rl6eyNFNUo2DBEssZ1g0O3aCVb1eHaN+US1p+FyzFl2D9WKl+F IebSt58SzLsOlAfFAmD3dH6kxVZN9D8hCN1Zv//HbOdoGDbGhurggIJ8ZwiykSZq0N0K X4ng2NJWf+K+r9ls399jRynDt1DxpuVxiny30aoML1xxbEaP38HKCfDC71eroXTxa1ht /rlQ== X-Gm-Message-State: AKaTC018B9plfZuRcTGCn15ftG3UWLyCvwY5LHsnefBrznU7OIaiw+dKdXo0X5Yxt1Ew9Q== X-Received: by 10.84.129.35 with SMTP id 32mr146631537plb.179.1481527566627; Sun, 11 Dec 2016 23:26:06 -0800 (PST) Received: from localhost.localdomain ([2601:647:4701:31a:320e:d5ff:febd:81c]) by smtp.googlemail.com with ESMTPSA id t193sm74518528pgb.4.2016.12.11.23.26.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Dec 2016 23:26:05 -0800 (PST) From: Nick Desaulniers Cc: rjw@rjwysocki.net, len.brown@intel.com, pavel@ucw.cz, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, x86@kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Nick Desaulniers Subject: [PATCH] ACPI: small formatting fixes Date: Sun, 11 Dec 2016 23:25:41 -0800 Message-Id: <20161212072541.28435-1-nick.desaulniers@gmail.com> X-Mailer: git-send-email 2.9.3 To: unlisted-recipients:; (no To-header on input) Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A quick cleanup that passes scripts/checkpatch.pl -f . Signed-off-by: Nick Desaulniers --- arch/x86/kernel/acpi/cstate.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/x86/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c index af15f44..ed52aec 100644 --- a/arch/x86/kernel/acpi/cstate.c +++ b/arch/x86/kernel/acpi/cstate.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2005 Intel Corporation - * Venkatesh Pallipadi - * - Added _PDC for SMP C-states on Intel CPUs + * Venkatesh Pallipadi + * - Added _PDC for SMP C-states on Intel CPUs */ #include @@ -12,7 +12,6 @@ #include #include -#include #include #include @@ -50,8 +49,8 @@ void acpi_processor_power_init_bm_check(struct acpi_processor_flags *flags, * P4, Core and beyond CPUs */ if (c->x86_vendor == X86_VENDOR_INTEL && - (c->x86 > 0xf || (c->x86 == 6 && c->x86_model >= 0x0f))) - flags->bm_control = 0; + (c->x86 > 0xf || (c->x86 == 6 && c->x86_model >= 0x0f))) + flags->bm_control = 0; } EXPORT_SYMBOL(acpi_processor_power_init_bm_check); @@ -89,7 +88,8 @@ static long acpi_processor_ffh_cstate_probe_cpu(void *_cx) retval = 0; /* If the HW does not support any sub-states in this C-state */ if (num_cstate_subtype == 0) { - pr_warn(FW_BUG "ACPI MWAIT C-state 0x%x not supported by HW (0x%x)\n", cx->address, edx_part); + pr_warn(FW_BUG "ACPI MWAIT C-state 0x%x not supported by HW (0x%x)\n", + cx->address, edx_part); retval = -1; goto out; } @@ -103,9 +103,8 @@ static long acpi_processor_ffh_cstate_probe_cpu(void *_cx) if (!mwait_supported[cstate_type]) { mwait_supported[cstate_type] = 1; - printk(KERN_DEBUG - "Monitor-Mwait will be used to enter C-%d " - "state\n", cx->type); + pr_debug("Monitor-Mwait will be used to enter C-%d state\n", + cx->type); } snprintf(cx->desc, ACPI_CX_DESC_LEN, "ACPI FFH INTEL MWAIT 0x%x", @@ -159,13 +158,14 @@ void __cpuidle acpi_processor_ffh_cstate_enter(struct acpi_processor_cx *cx) percpu_entry = per_cpu_ptr(cpu_cstate_entry, cpu); mwait_idle_with_hints(percpu_entry->states[cx->index].eax, - percpu_entry->states[cx->index].ecx); + percpu_entry->states[cx->index].ecx); } EXPORT_SYMBOL_GPL(acpi_processor_ffh_cstate_enter); static int __init ffh_cstate_init(void) { struct cpuinfo_x86 *c = &boot_cpu_data; + if (c->x86_vendor != X86_VENDOR_INTEL) return -1;