From patchwork Mon Dec 12 23:28:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 9471561 X-Patchwork-Delegate: rjw@sisk.pl 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 6596B60760 for ; Mon, 12 Dec 2016 23:28:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 560E42852B for ; Mon, 12 Dec 2016 23:28:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 492132852E; Mon, 12 Dec 2016 23:28:44 +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 2039B2852B for ; Mon, 12 Dec 2016 23:28:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751710AbcLLX2l (ORCPT ); Mon, 12 Dec 2016 18:28:41 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34734 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751427AbcLLX2l (ORCPT ); Mon, 12 Dec 2016 18:28:41 -0500 Received: by mail-pf0-f193.google.com with SMTP id y68so4960957pfb.1; Mon, 12 Dec 2016 15:28:40 -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=22jv5YrOflXeN4F+rkQ5bqN+NgyzPw0/P0tKh3VSeOs=; b=WXTiT/iV9J0ZvWUqIBwjoOtKkj3y82OaA2GY5UqRBZ0I8JWPlukBGn0Zt6fx/ATPfv OcscivSXmKJ5cF/6wJ1mk1HsPLTd91hZcWqI6dBdBzGbf2nC/ikVjLy52itBn6es/w0m ZsAamo+426ZSYdmWCHKg/nU7cO05qUmCfF42Buvu175jXfoupBxybK0UNCG5fiA9zvcH xnlCQeumAzS/mL6WpBAhjKba1wAP1pmLJ+3utkni5TxvjyC6fzACua0k1EVRxcv6FLVk 1wvLrqe35+G8YjCyafGN9secuDACSAu++5vJjO7qtqfl+4XpBxziwJ3UTOsr1SGW0y+F qB+w== 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=22jv5YrOflXeN4F+rkQ5bqN+NgyzPw0/P0tKh3VSeOs=; b=EWdMI1A2C8g/jh0s3U/G8dZL0RHHjUft/eikbpaUP+XU8bgCY8elAwuFpyKmYulXZL tk8iLHpYMIwJoxoGP89e1bBg6kBKD6xpyJTSRv3GCeecOSzY+RbH9VH4fuREUw3gMxYZ HH7+OD/yyJQkwJRDIfIE6z1lz7ENgXpOlo/8VXBR0dOu7xwzkY1yzEhi2Xiegrv8FQua Y6x9a53wytq6WXI3ZnM5j7eEvnSshUpEhDrwW9Xxdj1Qb6p1vX0Y/nXaUIsuUrN1YaRR JNEoll1Xj5Gy2bsc6MbchiWyb0LhP+KLYKgTEHYp84NKpEDfB2h2LkxLWyqky1ENCheX TYLg== X-Gm-Message-State: AKaTC03sgZZ9UdpPJseVL4jkIdxawbhW1fEwg49wG4yAD5o18iPIN86OYSgINFgKcmTDQQ== X-Received: by 10.84.217.20 with SMTP id o20mr191615753pli.28.1481585320227; Mon, 12 Dec 2016 15:28:40 -0800 (PST) Received: from localhost.localdomain ([2601:647:4701:31a:320e:d5ff:febd:81c]) by smtp.googlemail.com with ESMTPSA id q20sm78302971pgn.39.2016.12.12.15.28.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Dec 2016 15:28:39 -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, joe@perches.com, Nick Desaulniers Subject: [PATCH v3] ACPI: small formatting fixes Date: Mon, 12 Dec 2016 15:28:05 -0800 Message-Id: <20161212232805.1588-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 with scripts/checkpatch.pl -f . Signed-off-by: Nick Desaulniers Acked-by: Pavel Machek --- arch/x86/kernel/acpi/cstate.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c index af15f44..8233a63 100644 --- a/arch/x86/kernel/acpi/cstate.c +++ b/arch/x86/kernel/acpi/cstate.c @@ -12,7 +12,6 @@ #include #include -#include #include #include @@ -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; } @@ -104,8 +104,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); + "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", @@ -166,6 +166,7 @@ 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;