From patchwork Tue Dec 20 09:22:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastien Nocera X-Patchwork-Id: 35002 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp2863032wrn; Tue, 20 Dec 2022 01:24:07 -0800 (PST) X-Google-Smtp-Source: AMrXdXsAOdFvVQ3I2+2bLqVJJ1PlqHyJQ5jkI9dMPqyVJ6BL11NiixeoLVTK/uJOXqITFbISVr/8 X-Received: by 2002:a05:6402:334:b0:470:72d9:a9ed with SMTP id q20-20020a056402033400b0047072d9a9edmr1290678edw.7.1671528247459; Tue, 20 Dec 2022 01:24:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671528247; cv=none; d=google.com; s=arc-20160816; b=mVoAoWS48Bm+0b44qSqHlWPnu2/ELd7mbh42kx6hiRROXsG/XdukwXJBT/KHS8zCdZ 1iY5m3OtPmXkOVP9xhNnXMJ2/IKfLQo1GHO/2ZSLbNnJM8iO9uTeUE0ADS3YRKPuMxBx 7R2C6scAxb0BMKGRyrSE0pn52hmUAnA9r6h0iF3Q0VfvEegcTWxZeHDpKXnsQHLh6JaZ LS6hEK2hT/dgDy7K5jkaXbTUZXI6FKWDP8I1bhavLjobkEqsDLWKLYMCX6VLsaP80S83 tgj5NSQ6wJgMqAx76dTl+TBx8j1JdRYG34RPSeqeysHMTKeVBpBafv1DhiIJYuAe0d26 j+hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=YWEjMiL2o5Af6JdWdb9gn2uyVMzmJ9Yil88l4CDcJYM=; b=Sj57d2oKGGyUyQgs7qDuCwRcfCQXWr2ZSVCEJz2YUbwu7/dfAQQFdPxSmpB8X/xj++ 4SnnVHJ+n20ilyxhPm0x3m8wROjI65Onpw4tn27YsxwMN+B3GZdYH+f0a/xD1p65XD2R +PbG4jHcUb5zHrqGfrz5RrY21rM4qjjJqP14N3l6v11zU/vwp/c++hzvTDtBJIFkJhfZ yGNCOmY2W0feQr+OyKsD19MIS1iQJZYZHMK4TbLxUWS5A4LhAv2kDPm5OX74KVbvnctR a6ixr5nhhHWHju41ZvbZnX4MmAXXN6NySfSs4G1GiSinM6Q/4YGAw16xzI7HOIjkzWaX WKBw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v6-20020a056402348600b004627d582888si11618870edc.24.2022.12.20.01.23.44; Tue, 20 Dec 2022 01:24:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233477AbiLTJWc (ORCPT + 99 others); Tue, 20 Dec 2022 04:22:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233413AbiLTJWQ (ORCPT ); Tue, 20 Dec 2022 04:22:16 -0500 Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24E3F5F98; Tue, 20 Dec 2022 01:22:15 -0800 (PST) Received: (Authenticated sender: hadess@hadess.net) by mail.gandi.net (Postfix) with ESMTPSA id 916B91C0005; Tue, 20 Dec 2022 09:22:12 +0000 (UTC) From: Bastien Nocera To: linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jiri Kosina , Benjamin Tissoires , "Peter F . Patel-Schneider" , =?utf-8?q?Filipe_La?= =?utf-8?q?=C3=ADns?= , Nestor Lopez Casado Subject: [PATCH 3/3] HID: logitech-hidpp: Remove HIDPP_QUIRK_NO_HIDINPUT quirk Date: Tue, 20 Dec 2022 10:22:07 +0100 Message-Id: <20221220092207.428640-3-hadess@hadess.net> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221220092207.428640-1-hadess@hadess.net> References: <20221220092207.428640-1-hadess@hadess.net> MIME-Version: 1.0 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752724403705918964?= X-GMAIL-MSGID: =?utf-8?q?1752724403705918964?= HIDPP_QUIRK_NO_HIDINPUT isn't used by any devices but still happens to work as HIDPP_QUIRK_DELAYED_INIT is defined to the same value. Remove HIDPP_QUIRK_NO_HIDINPUT and use HIDPP_QUIRK_DELAYED_INIT everywhere instead. Signed-off-by: Bastien Nocera --- drivers/hid/hid-logitech-hidpp.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c index b4e4a8c79c75..2092fb1be627 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c @@ -67,7 +67,7 @@ MODULE_PARM_DESC(disable_tap_to_click, /* bits 2..20 are reserved for classes */ /* #define HIDPP_QUIRK_CONNECT_EVENTS BIT(21) disabled */ #define HIDPP_QUIRK_WTP_PHYSICAL_BUTTONS BIT(22) -#define HIDPP_QUIRK_NO_HIDINPUT BIT(23) +#define HIDPP_QUIRK_DELAYED_INIT BIT(23) #define HIDPP_QUIRK_FORCE_OUTPUT_REPORTS BIT(24) #define HIDPP_QUIRK_UNIFYING BIT(25) #define HIDPP_QUIRK_HIDPP_WHEELS BIT(26) @@ -83,8 +83,6 @@ MODULE_PARM_DESC(disable_tap_to_click, HIDPP_CAPABILITY_HIDPP20_HI_RES_SCROLL | \ HIDPP_CAPABILITY_HIDPP20_HI_RES_WHEEL) -#define HIDPP_QUIRK_DELAYED_INIT HIDPP_QUIRK_NO_HIDINPUT - #define HIDPP_CAPABILITY_HIDPP10_BATTERY BIT(0) #define HIDPP_CAPABILITY_HIDPP20_BATTERY BIT(1) #define HIDPP_CAPABILITY_BATTERY_MILEAGE BIT(2) @@ -4205,7 +4203,7 @@ static void hidpp_connect_event(struct hidpp_device *hidpp) if (hidpp->capabilities & HIDPP_CAPABILITY_HI_RES_SCROLL) hi_res_scroll_enable(hidpp); - if (!(hidpp->quirks & HIDPP_QUIRK_NO_HIDINPUT) || hidpp->delayed_input) + if (!(hidpp->quirks & HIDPP_QUIRK_DELAYED_INIT) || hidpp->delayed_input) /* if the input nodes are already created, we can stop now */ return; @@ -4436,7 +4434,7 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id) hid_hw_close(hdev); hid_hw_stop(hdev); - if (hidpp->quirks & HIDPP_QUIRK_NO_HIDINPUT) + if (hidpp->quirks & HIDPP_QUIRK_DELAYED_INIT) connect_mask &= ~HID_CONNECT_HIDINPUT; /* Now export the actual inputs and hidraw nodes to the world */