From patchwork Fri Nov 16 13:18:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jouke Witteveen X-Patchwork-Id: 10686355 X-Patchwork-Delegate: andy.shevchenko@gmail.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6DCFF14BD for ; Fri, 16 Nov 2018 13:18:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 57CBC2BED0 for ; Fri, 16 Nov 2018 13:18:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 48E2A2BF93; Fri, 16 Nov 2018 13:18:09 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 DB1D02BED0 for ; Fri, 16 Nov 2018 13:18:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727727AbeKPXaa (ORCPT ); Fri, 16 Nov 2018 18:30:30 -0500 Received: from mail-ed1-f66.google.com ([209.85.208.66]:36443 "EHLO mail-ed1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727711AbeKPXa3 (ORCPT ); Fri, 16 Nov 2018 18:30:29 -0500 Received: by mail-ed1-f66.google.com with SMTP id f23so10395822edb.3 for ; Fri, 16 Nov 2018 05:18:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=JAUadwmbgSDO6NC4ttETHqFWdjBzck2NSYGnL1NcUac=; b=ixxWdLHM4GhAmNZ6IRhDVxq087xSreycdA0iG836tWQImsdm8INWkyqtI3wmsZwCBC di+9ya2ieXoq7M85xAmTsp+PT9sPgmJ+qQrCZIduxUqGHcMyyBVKfLpt/tkceXfbYnaV ZZ7LZtDu092S14MHvmJB5CX/C7Ojv6NQ1wZG/izkLCVb72dbvfsX+63SdIqWx2QR4koZ ky5sZQ0BEg/k7Kb0QnWewnUIqmC5++snpfUaNWtVqPpnD+a+xJ4waAZ30lZlXt5LqnZN g4Sp8sBALEYfCL3cgP+qplW1MGsLk7uJwBZ6PGRDNMVt6v25MA+67/mLI555S0kzCxYH G9sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=JAUadwmbgSDO6NC4ttETHqFWdjBzck2NSYGnL1NcUac=; b=IqR+uu4LFvhogxprv/jgy4C28//U8VXqfTv1mfgHrKYbjubhtL37S0FMKtoNj8hB17 6CYEojIhWxUoSegCrpYNI/tZkCloVdHBNj0uE3wI/w5Mmf4Vmx+2X2SnwY84LG+4tPDK jXU5bogJB3qjk/erw9BYFLK/l1k8iO548Esf+GMoznkoYFPcpilwkMbIafQCF98ltaOj PgAQ18tqyxJ7Lg+HVP5JM17ZqmjxTCgx3+Boot48QlwBkZENeR5lB9cf9Y8cpBDj5eh3 jE2UHTTzoPVh/GwjGOHFbR4kR/JZm40G4UGShQcN8n7mv+Sv6oX5zEZQijO5AX3hMj2w r9pQ== X-Gm-Message-State: AGRZ1gLdsz8NT7YuBAK6lUc9VVAHXquWxAir6RY+u70vEQioWviiqDi4 CacpIRSSW90iPUrtSTAn/OFnLN3g X-Google-Smtp-Source: AJdET5fm0taOOxB5V8dBbDqjJ/hw8q9ipI1z1C1YwwCoa7WrmPJ6ze7AmCgR4QLTzh12gIqdNbMWPw== X-Received: by 2002:a50:92ca:: with SMTP id l10mr9103961eda.286.1542374286211; Fri, 16 Nov 2018 05:18:06 -0800 (PST) Received: from Mindship-05.localdomain (ip5653397a.direct-adsl.nl. [86.83.57.122]) by smtp.gmail.com with ESMTPSA id n7-v6sm7388898edq.66.2018.11.16.05.18.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 16 Nov 2018 05:18:05 -0800 (PST) Date: Fri, 16 Nov 2018 14:18:00 +0100 From: Jouke Witteveen To: ibm-acpi@hmh.eng.br, dvhart@infradead.org, andy@infradead.org Cc: ibm-acpi-devel@lists.sourceforge.net, platform-driver-x86@vger.kernel.org Subject: [PATCH] platform/x86: thinkpad_acpi: Cleanup quirks macros Message-ID: <20181116131800.GA11114@Mindship-05.localdomain> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jouke Witteveen Acked-by: Henrique de Moraes Holschuh --- The only difference in the generated code is that the quirk values are now within parentheses. drivers/platform/x86/thinkpad_acpi.c | 45 ++++++++-------------------- 1 file changed, 13 insertions(+), 32 deletions(-) diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index fde08a997..e1e51bfb3 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -478,6 +478,12 @@ do { \ .ec = TPACPI_MATCH_ANY, \ .quirks = (__quirk) } +#define TPACPI_QEC_IBM(__id1, __id2, __quirk) \ + { .vendor = PCI_VENDOR_ID_IBM, \ + .bios = TPACPI_MATCH_ANY, \ + .ec = TPID(__id1, __id2), \ + .quirks = (__quirk) } + #define TPACPI_QEC_LNV(__id1, __id2, __quirk) \ { .vendor = PCI_VENDOR_ID_LENOVO, \ .bios = TPACPI_MATCH_ANY, \ @@ -5973,9 +5979,6 @@ static const struct tpacpi_quirk led_useful_qtable[] __initconst = { }, }; -#undef TPACPI_LEDQ_IBM -#undef TPACPI_LEDQ_LNV - static enum led_access_mode __init led_init_detect_mode(void) { acpi_status status; @@ -8710,40 +8713,18 @@ static const struct attribute_group fan_attr_group = { .attrs = fan_attributes, }; -#define TPACPI_FAN_Q1 0x0001 /* Unitialized HFSP */ +#define TPACPI_FAN_Q1 0x0001 /* Unitialized HFSP */ #define TPACPI_FAN_2FAN 0x0002 /* EC 0x31 bit 0 selects fan2 */ -#define TPACPI_FAN_QI(__id1, __id2, __quirks) \ - { .vendor = PCI_VENDOR_ID_IBM, \ - .bios = TPACPI_MATCH_ANY, \ - .ec = TPID(__id1, __id2), \ - .quirks = __quirks } - -#define TPACPI_FAN_QL(__id1, __id2, __quirks) \ - { .vendor = PCI_VENDOR_ID_LENOVO, \ - .bios = TPACPI_MATCH_ANY, \ - .ec = TPID(__id1, __id2), \ - .quirks = __quirks } - -#define TPACPI_FAN_QB(__id1, __id2, __quirks) \ - { .vendor = PCI_VENDOR_ID_LENOVO, \ - .bios = TPID(__id1, __id2), \ - .ec = TPACPI_MATCH_ANY, \ - .quirks = __quirks } - static const struct tpacpi_quirk fan_quirk_table[] __initconst = { - TPACPI_FAN_QI('1', 'Y', TPACPI_FAN_Q1), - TPACPI_FAN_QI('7', '8', TPACPI_FAN_Q1), - TPACPI_FAN_QI('7', '6', TPACPI_FAN_Q1), - TPACPI_FAN_QI('7', '0', TPACPI_FAN_Q1), - TPACPI_FAN_QL('7', 'M', TPACPI_FAN_2FAN), - TPACPI_FAN_QB('N', '1', TPACPI_FAN_2FAN), + TPACPI_QEC_IBM('1', 'Y', TPACPI_FAN_Q1), + TPACPI_QEC_IBM('7', '8', TPACPI_FAN_Q1), + TPACPI_QEC_IBM('7', '6', TPACPI_FAN_Q1), + TPACPI_QEC_IBM('7', '0', TPACPI_FAN_Q1), + TPACPI_QEC_LNV('7', 'M', TPACPI_FAN_2FAN), + TPACPI_Q_LNV('N', '1', TPACPI_FAN_2FAN), }; -#undef TPACPI_FAN_QL -#undef TPACPI_FAN_QI -#undef TPACPI_FAN_QB - static int __init fan_init(struct ibm_init_struct *iibm) { int rc;