From patchwork Fri Feb 26 19:32:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 12107111 X-Patchwork-Delegate: jikos@jikos.cz 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 9B84AC433E6 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 565C864F1B for ; Fri, 26 Feb 2021 19:36:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230032AbhBZTgg (ORCPT ); Fri, 26 Feb 2021 14:36:36 -0500 Received: from mga03.intel.com ([134.134.136.65]:22836 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229586AbhBZTge (ORCPT ); Fri, 26 Feb 2021 14:36:34 -0500 IronPort-SDR: aRoO/1DtjZ5Pss0awOAlhQCstt1jiAk433dGqDCWs31if3FnrsQJJWFcD46cBaN4qtLwt0beCx SDgKUwtnMziw== X-IronPort-AV: E=McAfee;i="6000,8403,9907"; a="186030723" X-IronPort-AV: E=Sophos;i="5.81,209,1610438400"; d="scan'208";a="186030723" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Feb 2021 11:34:47 -0800 IronPort-SDR: WoMmuMPcC0dWiYJlMlJ1m6U5UpBKi5fmmakFoEKZoaH2mC5BMom8oEPOGCwLUns+Aox8wGp4cs NBtL4rNnNshg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,209,1610438400"; d="scan'208";a="516620000" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga004.jf.intel.com with ESMTP; 26 Feb 2021 11:34:46 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 6D84217E; 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 1/4] HID: i2c-hid: acpi: Get ACPI companion only once and reuse it Date: Fri, 26 Feb 2021 21:32:22 +0200 Message-Id: <20210226193225.47129-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Currently the ACPI companion and handle are retrieved and checked a few times in different functions. Instead get ACPI companion only once and reuse it everywhere. Signed-off-by: Andy Shevchenko --- v2: used companion indeed everywhere (i2c_hid_acpi_shutdown_tail() included) drivers/hid/i2c-hid/i2c-hid-acpi.c | 36 +++++++++++++----------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/drivers/hid/i2c-hid/i2c-hid-acpi.c b/drivers/hid/i2c-hid/i2c-hid-acpi.c index bb8c00e6be78..7225a6bc42f0 100644 --- a/drivers/hid/i2c-hid/i2c-hid-acpi.c +++ b/drivers/hid/i2c-hid/i2c-hid-acpi.c @@ -30,7 +30,7 @@ struct i2c_hid_acpi { struct i2chid_ops ops; - struct i2c_client *client; + struct acpi_device *adev; }; static const struct acpi_device_id i2c_hid_acpi_blacklist[] = { @@ -42,29 +42,22 @@ static const struct acpi_device_id i2c_hid_acpi_blacklist[] = { { }, }; -static int i2c_hid_acpi_get_descriptor(struct i2c_client *client) +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; - struct acpi_device *adev; - acpi_handle handle; u16 hid_descriptor_address; - handle = ACPI_HANDLE(&client->dev); - if (!handle || acpi_bus_get_device(handle, &adev)) { - dev_err(&client->dev, "Error could not get ACPI device\n"); - return -ENODEV; - } - if (acpi_match_device_ids(adev, i2c_hid_acpi_blacklist) == 0) return -ENODEV; obj = acpi_evaluate_dsm_typed(handle, &i2c_hid_guid, 1, 1, NULL, ACPI_TYPE_INTEGER); if (!obj) { - dev_err(&client->dev, "Error _DSM call to get HID descriptor address failed\n"); + acpi_handle_err(handle, "Error _DSM call to get HID descriptor address failed\n"); return -ENODEV; } @@ -76,10 +69,9 @@ static int i2c_hid_acpi_get_descriptor(struct i2c_client *client) static void i2c_hid_acpi_shutdown_tail(struct i2chid_ops *ops) { - struct i2c_hid_acpi *ihid_acpi = - container_of(ops, struct i2c_hid_acpi, ops); - struct device *dev = &ihid_acpi->client->dev; - acpi_device_set_power(ACPI_COMPANION(dev), ACPI_STATE_D3_COLD); + struct i2c_hid_acpi *ihid_acpi = container_of(ops, struct i2c_hid_acpi, ops); + + acpi_device_set_power(ihid_acpi->adev, ACPI_STATE_D3_COLD); } static int i2c_hid_acpi_probe(struct i2c_client *client, @@ -91,21 +83,25 @@ static int i2c_hid_acpi_probe(struct i2c_client *client, u16 hid_descriptor_address; int ret; + adev = ACPI_COMPANION(dev); + if (!adev) { + dev_err(&client->dev, "Error could not get ACPI device\n"); + return -ENODEV; + } + ihid_acpi = devm_kzalloc(&client->dev, sizeof(*ihid_acpi), GFP_KERNEL); if (!ihid_acpi) return -ENOMEM; - ihid_acpi->client = client; + ihid_acpi->adev = adev; ihid_acpi->ops.shutdown_tail = i2c_hid_acpi_shutdown_tail; - ret = i2c_hid_acpi_get_descriptor(client); + ret = i2c_hid_acpi_get_descriptor(adev); if (ret < 0) return ret; hid_descriptor_address = ret; - adev = ACPI_COMPANION(dev); - if (adev) - acpi_device_fix_up_power(adev); + acpi_device_fix_up_power(adev); if (acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0) { device_set_wakeup_capable(dev, true); From patchwork Fri Feb 26 19:32:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 12107107 X-Patchwork-Delegate: jikos@jikos.cz 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 79C13C433DB 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 3A11664F29 for ; Fri, 26 Feb 2021 19:36:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229999AbhBZTge (ORCPT ); Fri, 26 Feb 2021 14:36:34 -0500 Received: from mga11.intel.com ([192.55.52.93]:54527 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229545AbhBZTgd (ORCPT ); Fri, 26 Feb 2021 14:36:33 -0500 IronPort-SDR: 6rB3hg69vXp0YXNvHUAdwqsK1jeqoNJ4YAr1s5CQ9aa7o8/0gUZN+N047d9vm/9LpsUE//m+ox cL2+d8/h0Reg== X-IronPort-AV: E=McAfee;i="6000,8403,9907"; a="182554249" X-IronPort-AV: E=Sophos;i="5.81,209,1610438400"; d="scan'208";a="182554249" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Feb 2021 11:34:47 -0800 IronPort-SDR: Trk6veX8D49gkI1LpqD8cBdaVHUElkAlyhfAjMkpzg67VEdUmKU+f3cPq1X+h7U+95xMkm33uh AfrU0KFl6Qqw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,209,1610438400"; d="scan'208";a="425575024" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 26 Feb 2021 11:34:46 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 780A811F; 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 2/4] HID: i2c-hid: acpi: Switch to new style i2c-driver probe function Date: Fri, 26 Feb 2021 21:32:23 +0200 Message-Id: <20210226193225.47129-2-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 Switch to the new style i2c-driver probe_new probe function. Signed-off-by: Andy Shevchenko --- v2: new patch drivers/hid/i2c-hid/i2c-hid-acpi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/hid/i2c-hid/i2c-hid-acpi.c b/drivers/hid/i2c-hid/i2c-hid-acpi.c index 7225a6bc42f0..70955f21349a 100644 --- a/drivers/hid/i2c-hid/i2c-hid-acpi.c +++ b/drivers/hid/i2c-hid/i2c-hid-acpi.c @@ -74,8 +74,7 @@ static void i2c_hid_acpi_shutdown_tail(struct i2chid_ops *ops) acpi_device_set_power(ihid_acpi->adev, ACPI_STATE_D3_COLD); } -static int i2c_hid_acpi_probe(struct i2c_client *client, - const struct i2c_device_id *dev_id) +static int i2c_hid_acpi_probe(struct i2c_client *client) { struct device *dev = &client->dev; struct i2c_hid_acpi *ihid_acpi; @@ -127,7 +126,7 @@ static struct i2c_driver i2c_hid_acpi_driver = { .acpi_match_table = ACPI_PTR(i2c_hid_acpi_match), }, - .probe = i2c_hid_acpi_probe, + .probe_new = i2c_hid_acpi_probe, .remove = i2c_hid_core_remove, .shutdown = i2c_hid_core_shutdown, }; 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: 12107113 X-Patchwork-Delegate: jikos@jikos.cz 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: 12107109 X-Patchwork-Delegate: jikos@jikos.cz 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,