From patchwork Fri Feb 26 19:32:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 387914 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49592C4332E for ; Fri, 26 Feb 2021 19:36:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 02E2F64F37 for ; Fri, 26 Feb 2021 19:36:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229586AbhBZTgs (ORCPT ); Fri, 26 Feb 2021 14:36:48 -0500 Received: from mga12.intel.com ([192.55.52.136]:43224 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230212AbhBZTgn (ORCPT ); Fri, 26 Feb 2021 14:36:43 -0500 IronPort-SDR: NYq5XWYqFkzWKjDlzC4FF39SnJZbKBkEnofGX3Ol9tzH/WMTaBgmsIFe9JdZcJwlTpSw4vqod4 FbcuZ3j/IdIw== X-IronPort-AV: E=McAfee;i="6000,8403,9907"; a="165195469" X-IronPort-AV: E=Sophos;i="5.81,209,1610438400"; d="scan'208";a="165195469" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Feb 2021 11:34:48 -0800 IronPort-SDR: pGtGVYUupHM0ZQHpyOyNPVYf+iuxYF7RTrSq7NcyCCyLINPVB+mMx/6oBLVPnzCTzU4i50NHdc sEbfdr9zBORw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,209,1610438400"; d="scan'208";a="584709647" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga005.jf.intel.com with ESMTP; 26 Feb 2021 11:34:46 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 82C8654A; Fri, 26 Feb 2021 21:32:28 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , Douglas Anderson , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jiri Kosina , Benjamin Tissoires Subject: [PATCH v2 3/4] HID: i2c-hid: acpi: Move GUID out of function and described it Date: Fri, 26 Feb 2021 21:32:24 +0200 Message-Id: <20210226193225.47129-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210226193225.47129-1-andriy.shevchenko@linux.intel.com> References: <20210226193225.47129-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Move static GUID variable out of the function and add a comment how it looks like in the human readable representation. While at it, include uuid.h since the guid_t type is defined in it. Signed-off-by: Andy Shevchenko --- v2: rebased on top of patch 1 that used to be separate change drivers/hid/i2c-hid/i2c-hid-acpi.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/hid/i2c-hid/i2c-hid-acpi.c b/drivers/hid/i2c-hid/i2c-hid-acpi.c index 70955f21349a..a4810f199d59 100644 --- a/drivers/hid/i2c-hid/i2c-hid-acpi.c +++ b/drivers/hid/i2c-hid/i2c-hid-acpi.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "i2c-hid.h" @@ -42,11 +43,13 @@ static const struct acpi_device_id i2c_hid_acpi_blacklist[] = { { }, }; +/* HID I²C Device: 3cdff6f7-4267-4555-ad05-b30a3d8938de */ +static guid_t i2c_hid_guid = + GUID_INIT(0x3CDFF6F7, 0x4267, 0x4555, + 0xAD, 0x05, 0xB3, 0x0A, 0x3D, 0x89, 0x38, 0xDE); + static int i2c_hid_acpi_get_descriptor(struct acpi_device *adev) { - static guid_t i2c_hid_guid = - GUID_INIT(0x3CDFF6F7, 0x4267, 0x4555, - 0xAD, 0x05, 0xB3, 0x0A, 0x3D, 0x89, 0x38, 0xDE); acpi_handle handle = acpi_device_handle(adev); union acpi_object *obj; u16 hid_descriptor_address; From patchwork Fri Feb 26 19:32:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 387915 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57651C433E0 for ; Fri, 26 Feb 2021 19:36:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 13D0764F1F for ; Fri, 26 Feb 2021 19:36:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229752AbhBZTge (ORCPT ); Fri, 26 Feb 2021 14:36:34 -0500 Received: from mga04.intel.com ([192.55.52.120]:5179 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229751AbhBZTgd (ORCPT ); Fri, 26 Feb 2021 14:36:33 -0500 IronPort-SDR: 452iDf6s4syYs+u6WA+XI8VLJPzP9SV9NsJngC8WW+5XS4ZTqhsC2/aT3urlzsa2UYmrcefywr B9hAAHiuBOgA== X-IronPort-AV: E=McAfee;i="6000,8403,9907"; a="183519109" X-IronPort-AV: E=Sophos;i="5.81,209,1610438400"; d="scan'208";a="183519109" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Feb 2021 11:34:48 -0800 IronPort-SDR: p8A4BkKzUvM5PSJDwOEEtLry4Ks1U7UPpe1GyuwVDVDRFQl+xuSLrEd9wPqzOV7hqeH097O0hY OrwGwGYfwJcQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,209,1610438400"; d="scan'208";a="443191951" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga001.jf.intel.com with ESMTP; 26 Feb 2021 11:34:46 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 8E3305D6; Fri, 26 Feb 2021 21:32:28 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , Douglas Anderson , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jiri Kosina , Benjamin Tissoires Subject: [PATCH v2 4/4] HID: i2c-hid: acpi: Drop redundant ACPI_PTR() Date: Fri, 26 Feb 2021 21:32:25 +0200 Message-Id: <20210226193225.47129-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210226193225.47129-1-andriy.shevchenko@linux.intel.com> References: <20210226193225.47129-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org The driver depends on ACPI, ACPI_PTR() resolution is always the same. Otherwise a compiler may produce a warning. That said, the rule of thumb either ugly ifdeffery with ACPI_PTR or none should be used in a driver. Signed-off-by: Andy Shevchenko Acked-by: Benjamin Tissoires --- v2: no changes drivers/hid/i2c-hid/i2c-hid-acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hid/i2c-hid/i2c-hid-acpi.c b/drivers/hid/i2c-hid/i2c-hid-acpi.c index a4810f199d59..a6f0257a26de 100644 --- a/drivers/hid/i2c-hid/i2c-hid-acpi.c +++ b/drivers/hid/i2c-hid/i2c-hid-acpi.c @@ -126,7 +126,7 @@ static struct i2c_driver i2c_hid_acpi_driver = { .name = "i2c_hid_acpi", .pm = &i2c_hid_core_pm, .probe_type = PROBE_PREFER_ASYNCHRONOUS, - .acpi_match_table = ACPI_PTR(i2c_hid_acpi_match), + .acpi_match_table = i2c_hid_acpi_match, }, .probe_new = i2c_hid_acpi_probe,