From patchwork Tue Nov 22 19:18:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 628726 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 632EFC4332F for ; Tue, 22 Nov 2022 19:18:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231808AbiKVTSO (ORCPT ); Tue, 22 Nov 2022 14:18:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234488AbiKVTSJ (ORCPT ); Tue, 22 Nov 2022 14:18:09 -0500 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36F1724F28; Tue, 22 Nov 2022 11:18:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669144687; x=1700680687; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=JzC+t1MWJwxB8Fmck04OqHk780e/xmaFSEEbGTIwRWo=; b=hRCmGYuAGEKqeIZOQ+r0VrJ2TBJzn8Uu7Qu7qejRvy4hShz4SCAXpDBf 17eRIDePxq101OGsVGnIDGUBC/JCeeTVsnpJxqKVNEzI0I6Yo9c5pN7HH Us9ILDYqhr17HQ1Ti18gTmoKg3HLua/Oafj/ral8EHTig2rYrYZsRGBTk Eg3VwjDP1HYeE0fwRajgJojRisqphczsZL2mmLrk4cxr5ansMYtI2vKIl cHeFZ/IiUG8N9c0FXYNXsetdIixYjm7YasX2Q/2PJkZ8DTl1QA7CZwtL2 djzkQEO8O472maQOY4YMhllyKNCfyW6zv3kgHTNHAIN85aWj67vGhCBcs w==; X-IronPort-AV: E=McAfee;i="6500,9779,10539"; a="315716801" X-IronPort-AV: E=Sophos;i="5.96,184,1665471600"; d="scan'208";a="315716801" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Nov 2022 11:18:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10539"; a="730515659" X-IronPort-AV: E=Sophos;i="5.96,184,1665471600"; d="scan'208";a="730515659" Received: from black.fi.intel.com ([10.237.72.28]) by FMSMGA003.fm.intel.com with ESMTP; 22 Nov 2022 11:18:01 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 7F37F128; Tue, 22 Nov 2022 21:18:26 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jiri Kosina , Benjamin Tissoires Subject: [PATCH v1 1/2] HID: i2c-hid: acpi: Drop unneded NULL check of adev Date: Tue, 22 Nov 2022 21:18:20 +0200 Message-Id: <20221122191821.18076-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org The driver is enumerated on ACPI platforms, so adev is valid. Since there is no valid I²C ID table provided, there is no possibility to bind a device to this driver via user space. Hence, drop unneeded NULL check of adev. Signed-off-by: Andy Shevchenko --- drivers/hid/i2c-hid/i2c-hid-acpi.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/hid/i2c-hid/i2c-hid-acpi.c b/drivers/hid/i2c-hid/i2c-hid-acpi.c index b96ae15e0ad9..661a87dbd584 100644 --- a/drivers/hid/i2c-hid/i2c-hid-acpi.c +++ b/drivers/hid/i2c-hid/i2c-hid-acpi.c @@ -48,8 +48,9 @@ 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 int i2c_hid_acpi_get_descriptor(struct i2c_hid_acpi *ihid_acpi) { + struct acpi_device *adev = ihid_acpi->adev; acpi_handle handle = acpi_device_handle(adev); union acpi_object *obj; u16 hid_descriptor_address; @@ -81,29 +82,22 @@ static int i2c_hid_acpi_probe(struct i2c_client *client) { struct device *dev = &client->dev; struct i2c_hid_acpi *ihid_acpi; - struct acpi_device *adev; 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->adev = adev; + ihid_acpi->adev = ACPI_COMPANION(dev); ihid_acpi->ops.shutdown_tail = i2c_hid_acpi_shutdown_tail; - ret = i2c_hid_acpi_get_descriptor(adev); + ret = i2c_hid_acpi_get_descriptor(ihid_acpi); if (ret < 0) return ret; hid_descriptor_address = ret; - acpi_device_fix_up_power(adev); + acpi_device_fix_up_power(ihid_acpi->adev); if (acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0) { device_set_wakeup_capable(dev, true); From patchwork Tue Nov 22 19:18:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 627804 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32D50C433FE for ; Tue, 22 Nov 2022 19:18:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234126AbiKVTSR (ORCPT ); Tue, 22 Nov 2022 14:18:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234498AbiKVTSK (ORCPT ); Tue, 22 Nov 2022 14:18:10 -0500 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E88FD28E1B; Tue, 22 Nov 2022 11:18:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669144690; x=1700680690; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wCUPllZUwt3RNiQWNSRhSsZ3MYzfpI1ZWxBokU8qb/8=; b=iSvD5VY+1TvgGeSbb078p91/09IQZj9jRCJZK/LqCsdZsJS+NEXD4kmx GaWFsY0GMCWaFWLCvl5au2Ekj51A224XvkR+fCjU1aJcV5e3HuybzEZdF E593ikxhFuCM93DbsO7pxaxnF/tbkiVrpuZUdf0NGtEOgS4CoPwn7SUT2 KWF1kkYAfV8w3p+XoRfUic6W/GVKOc5Nd+bbSuT52UpbaDf+eaDCMK8/2 Axn++MCLDwHi3thMtusGDYXSVoqJGWIeNXvSplOiOgINlGfcXlkAFVFvo codTYsHO3GV1BzQ407C6fjylEkoeO/b2DSmY3GyonMdLCNMW/htAlHTvm Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10539"; a="315716804" X-IronPort-AV: E=Sophos;i="5.96,184,1665471600"; d="scan'208";a="315716804" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Nov 2022 11:18:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10539"; a="730515666" X-IronPort-AV: E=Sophos;i="5.96,184,1665471600"; d="scan'208";a="730515666" Received: from black.fi.intel.com ([10.237.72.28]) by FMSMGA003.fm.intel.com with ESMTP; 22 Nov 2022 11:18:03 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 52E2212B; Tue, 22 Nov 2022 21:18:28 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jiri Kosina , Benjamin Tissoires Subject: [PATCH v1 2/2] HID: i2c-hid: acpi: Unify ACPI ID tables format Date: Tue, 22 Nov 2022 21:18:21 +0200 Message-Id: <20221122191821.18076-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221122191821.18076-1-andriy.shevchenko@linux.intel.com> References: <20221122191821.18076-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Unify ACPI ID tables format by: - surrounding HID by spaces - dropping unnecessary driver_data assignment to 0 - dropping comma at the terminator entry Signed-off-by: Andy Shevchenko --- drivers/hid/i2c-hid/i2c-hid-acpi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/hid/i2c-hid/i2c-hid-acpi.c b/drivers/hid/i2c-hid/i2c-hid-acpi.c index 661a87dbd584..37a03411e785 100644 --- a/drivers/hid/i2c-hid/i2c-hid-acpi.c +++ b/drivers/hid/i2c-hid/i2c-hid-acpi.c @@ -39,8 +39,8 @@ static const struct acpi_device_id i2c_hid_acpi_blacklist[] = { * The CHPN0001 ACPI device, which is used to describe the Chipone * ICN8505 controller, has a _CID of PNP0C50 but is not HID compatible. */ - {"CHPN0001", 0 }, - { }, + { "CHPN0001" }, + { } }; /* HID I²C Device: 3cdff6f7-4267-4555-ad05-b30a3d8938de */ @@ -109,9 +109,9 @@ static int i2c_hid_acpi_probe(struct i2c_client *client) } static const struct acpi_device_id i2c_hid_acpi_match[] = { - {"ACPI0C50", 0 }, - {"PNP0C50", 0 }, - { }, + { "ACPI0C50" }, + { "PNP0C50" }, + { } }; MODULE_DEVICE_TABLE(acpi, i2c_hid_acpi_match);