From patchwork Mon Nov 21 06:51:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 9438961 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 2BFA8600BA for ; Mon, 21 Nov 2016 06:52:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1D3CC28236 for ; Mon, 21 Nov 2016 06:52:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0FAE328904; Mon, 21 Nov 2016 06:52:22 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, 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 482A528236 for ; Mon, 21 Nov 2016 06:52:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751324AbcKUGwU (ORCPT ); Mon, 21 Nov 2016 01:52:20 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:36777 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751019AbcKUGwT (ORCPT ); Mon, 21 Nov 2016 01:52:19 -0500 Received: by mail-pf0-f194.google.com with SMTP id c4so15132612pfb.3; Sun, 20 Nov 2016 22:52:19 -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=AWPEw7OgJQYDPMLiK3Uz+GcZU/hKzYCZqv35G7l955PRwXir8Rw0j842nBWuvu17pD xp1eG66pVpcmhvHzjQITpjb5fZPveYaadG6Hck4pAs9REgaHdCn6LL3QndH/ePLNTwPg H5kkaD9NPst+naThF+TBsqeU575kp5510xEE0y75UJ7C3K0JiQpUB4KAA5JQdrPygmtC qv8TNBtvOwh9gHXN0ZBxhlB+W3F45HpubmL+9GoNPigIwtSQr0duNMkIWM1vWBemyhME vBTR+qOA1A7gve5WjXy9W1dLAscYT+Mr28FBBaJkstnhbRTjYfvj5SqeJnIC68L2vHx+ pIPA== 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=D7+ALuloKm80gmD1B0xT+B64F0HWL+sZwix0zmSUXGpue2y1njWADsCxxgaebh7AI+ 42MmoyW8hwlhWIu5DJCBBx3bxBf6GPBjIYqnWDjA/nNg7Y7AKowfIS/9L4/meebAR4yx 0YzJJ14uTrz+ZUvJmL1P6WD4YfxcqMNiKO+fGovlqv18PrLAUqpckP9SvWlSs9I07ir5 33JEqKM+PpJoBR9GKno1FODdpph+O1/chT6bIkg0+LJacEf78/dYvzZmzXOpV91lfI7+ 8I6Irvqw1VkWh9unbwmegTUn+f5aaiyB9NWY6Lz+oI1gLFA2dIecB8YsraEe/o5iwAUP BYQg== X-Gm-Message-State: AKaTC021LoyNco9ScEMiFKIiBHPs7WQ9i5wsA07L2ntTWZUqmXtxOer9Qh+axDb98BgsLw== X-Received: by 10.99.132.194 with SMTP id k185mr28604833pgd.171.1479711138638; Sun, 20 Nov 2016 22:52:18 -0800 (PST) Received: from localhost.localdomain ([2601:647:4701:31a:320e:d5ff:febd:81c]) by smtp.googlemail.com with ESMTPSA id r124sm16429134pgr.6.2016.11.20.22.52.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 Nov 2016 22:52:18 -0800 (PST) From: Nick Desaulniers To: rjw@rjwysocki.net Cc: 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, 20 Nov 2016 22:51:49 -0800 Message-Id: <20161121065149.9760-1-nick.desaulniers@gmail.com> X-Mailer: git-send-email 2.9.3 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;