From patchwork Thu Oct 12 10:23:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 151906 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp1117848vqb; Thu, 12 Oct 2023 03:24:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH78Brm8IH50tvOaXrYalM4ek+wz/9/Z9dw0l/FrhHvITQzjN9kFbPznD/aDXVvU0erkIj5 X-Received: by 2002:a05:6830:6c14:b0:6c6:473c:9ca0 with SMTP id ds20-20020a0568306c1400b006c6473c9ca0mr24574684otb.3.1697106253332; Thu, 12 Oct 2023 03:24:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697106253; cv=none; d=google.com; s=arc-20160816; b=j915d4VZOE9Alyi55ON4Ap36UaJxykoNKKRRHiH1FD71zVS5IwRNM1TR1wJl97AiSe sHqAjp8s9Hgl8ZTHtwYlaslYjJYK1Y9uieTagIS/C1JQLHwc/bSDd8UIV97+Iq3Lq9Ed u3biuldC1qICSUfiXDdFE160QM29H9W6tRKxpXwCHB2Qj5qBM1OCX+MT1J6nB1af5fli GYSYcHujj+u4n8nAerpQkEuqM8GE31U7Jj4a+nZMYQvDiFFtmkshN0x9OVGhusluZGQh oAJg5FFe9Na7C9QVDdfaS6j1aqxBmeyeZAhedYNWJiCzZsTIhAr6HyVeJc+aqgXPZHKD T0Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=GDkT80A/jtoVkuj9J4SnCoJbf/78QeDTUDuEZoIOcfc=; fh=xUtS4Ye9bvz4mnbfL9bwsYffunq5fde5WqM/qGGhhDQ=; b=n72FJ4LIIrBlpJgFgHpPqCUVTwoqBENP6usBkRwPHqJxhfLQfqcPsxwsjEO73prvFS DY6/Kh8NTs3FUQdpYkjAsDfIV6IWD/8LgRxy2ZdZcCTF1VKG+G+2yrmV5RZSKKJAl7B2 8pyRJvfHDGpiHZ0U7vE7MtfvLzbHaomDF6XG4kXqudd++OU3B8j0gfm9zAzJkC7WRMaE VrJN13j/EEagQUGRN8mjDNHNA/lIH6jq9Sg6oDdWepZYlM3gfv22gGuhB1gwykAj5Qeu ja/0NQzGx/0EFb4hD9fN14yVxkKZGazFSZ2vDAKkp1h+0opmQ8AZETuVWAuAamSnBg27 HdLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=IxEIFffO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id k9-20020a056a00168900b0069342aef90bsi14607766pfc.3.2023.10.12.03.24.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 03:24:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=IxEIFffO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 8AC9881222AD; Thu, 12 Oct 2023 03:24:09 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377813AbjJLKX6 (ORCPT + 19 others); Thu, 12 Oct 2023 06:23:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347111AbjJLKXw (ORCPT ); Thu, 12 Oct 2023 06:23:52 -0400 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88A0CD3; Thu, 12 Oct 2023 03:23:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1697106227; bh=dcNGhXp5FPTom7QF06OFWt6twK9Wx0jnbCF/HnZ41vM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=IxEIFffOIC37ReXiTicel+yXLwHpChvLvrPq5QvxGftNl0sTXr6LNSyA3qazcweoj kEp0rmPIun58vHqP6kaUkoSA4vTSKCd+WrY6xBl0PdPlPGdQX7lO0RFGa0MW2rF+tl F7d+9YguOHYV/qFTj11zoovw6XbwvJPnG3QgPn1E= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Thu, 12 Oct 2023 12:23:38 +0200 Subject: [PATCH 1/4] HID: core: remove #ifdef CONFIG_PM from hid_driver MIME-Version: 1.0 Message-Id: <20231012-hid-pm_ptr-v1-1-0a71531ca93b@weissschuh.net> References: <20231012-hid-pm_ptr-v1-0-0a71531ca93b@weissschuh.net> In-Reply-To: <20231012-hid-pm_ptr-v1-0-0a71531ca93b@weissschuh.net> To: Jiri Kosina , Benjamin Tissoires Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1697106227; l=1175; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=dcNGhXp5FPTom7QF06OFWt6twK9Wx0jnbCF/HnZ41vM=; b=Iad8VW67+qA6YLgatRKUO/dbPz3xzTYuvOSHdHEpMdPKfTICbIfy4mSCjas9tG9y14b1Q5eNN 58M7fGLO+jMAhHHV3SuHZoD3CSvt+G3f25G61eBrc9MgUUFGGNLWWuL X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Thu, 12 Oct 2023 03:24:09 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779544886450609419 X-GMAIL-MSGID: 1779544886450609419 Allow HID drivers to pass ->suspend, ->resume and ->reset_resume via pm_ptr(). Through the usage of pm_ptr() the CONFIG_PM-dependent code will always be compiled, protecting against bitrot. The linker will then garbage-collect the unused function avoiding any overhead. The only overhead in the final kernel image and at runtime are a few extra bytes in 'struct hid_driver'. The same approach is chosen by 'struct usb_driver' and other subsystems. Signed-off-by: Thomas Weißschuh --- include/linux/hid.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/hid.h b/include/linux/hid.h index 964ca1f15e3f..5a8387a4a712 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -833,11 +833,11 @@ struct hid_driver { void (*feature_mapping)(struct hid_device *hdev, struct hid_field *field, struct hid_usage *usage); -#ifdef CONFIG_PM + int (*suspend)(struct hid_device *hdev, pm_message_t message); int (*resume)(struct hid_device *hdev); int (*reset_resume)(struct hid_device *hdev); -#endif + /* private: */ struct device_driver driver; }; From patchwork Thu Oct 12 10:23:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 151908 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp1118087vqb; Thu, 12 Oct 2023 03:24:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEKT5DHsSwAQXWJBc21eb/Q3rKEoJ2+KRjKgYahHK2fWZhYmAVI6YDtxe9gNo0fprb1ed4m X-Received: by 2002:a17:902:e5c1:b0:1c3:6d97:e897 with SMTP id u1-20020a170902e5c100b001c36d97e897mr26580001plf.5.1697106282985; Thu, 12 Oct 2023 03:24:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697106282; cv=none; d=google.com; s=arc-20160816; b=h6qNOMymQg3bdWU+J9+yktj+og+NxtLXSeFELfghsENQQBg5EvTp4EpnbE0Sq7rFts x3+jhnmYVvQIsXBt/MuH0vgOcZ9gSFVsy0rqGOxoxfP8MQ5bnoDngvQsZo4gub0GQq9H zvqNxK+SjgrqsuyJ6h92fFCe57pm3VQ8TWRCSMu8RlFJjZk491x79ebGBDUdPxaPm33B h9MEh05r6YEiLfsmYm08iVqJYfAPbHaP3G0lJg0UfX/nqJU592ewyKSngp01OlnF+hST CINKBy6E5h9S8jao8y2JmLDdd0vS3iGutwaONMUhwX/J/YZXWOvR43MPKcBWHAh/PQjC HYhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=N91HDW84wyihKKOst7mAkJTSURWMo/HOEyfaJglaoUE=; fh=xUtS4Ye9bvz4mnbfL9bwsYffunq5fde5WqM/qGGhhDQ=; b=WB6dibYYgDT0KLmS509farqGmwWWayB4pxrIYRxKHpwPZEZPOqc7GEnP4JLp1aD9mx Ff8LsaILIzJ1TLSeScreBgv82vG3MDsHCmwdfayV49WiArHaGRoTe4hoC83XGXyYX5Dc HyIGMvjEveLDo3riR5OV22Ex7akK5SxDByOSLf0No7VWyEKxqVKHf0X8+wM4m1BV3kLn 5p/NUH45B5P7cEUg4KI0VyOXlyB636WVoRL5v8x2DpKKmJ7QWTdDSxosRdt05spAF8dv zvi5Xri523xasXaE1aZDxdPqdVe0CKXkyH7wGiG9fbBxpEuzpOc7ba6I7fzymL2uaFuI Z/5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=rE7peiHE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id u8-20020a170903124800b001c20db2510asi2068750plh.53.2023.10.12.03.24.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 03:24:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=rE7peiHE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id B001D81A4FE6; Thu, 12 Oct 2023 03:24:40 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377801AbjJLKYH (ORCPT + 19 others); Thu, 12 Oct 2023 06:24:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347120AbjJLKXw (ORCPT ); Thu, 12 Oct 2023 06:23:52 -0400 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9505D7; Thu, 12 Oct 2023 03:23:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1697106227; bh=alxO7xFWraA3HKM6WF41cUbPDoefLV3zZhv5I90E+pg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=rE7peiHE79iPAIiKLaF0z/949FLJ/Zy4UCL+cNac8N6NcqZdKIxFaw0cJlnM1gWTR j15Ej4Uyo85TUj4naLqIYbTrz5witbF5s+X8Vm7IZyT3Bz8felUWwe/mTjExTs+YRO v07pzvJbFfHJnc1RJ2Krkqf5EZQ4cQ+4XtYmwD/0= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Thu, 12 Oct 2023 12:23:39 +0200 Subject: [PATCH 2/4] HID: usbhid: remove #ifdef CONFIG_PM MIME-Version: 1.0 Message-Id: <20231012-hid-pm_ptr-v1-2-0a71531ca93b@weissschuh.net> References: <20231012-hid-pm_ptr-v1-0-0a71531ca93b@weissschuh.net> In-Reply-To: <20231012-hid-pm_ptr-v1-0-0a71531ca93b@weissschuh.net> To: Jiri Kosina , Benjamin Tissoires Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1697106227; l=1539; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=alxO7xFWraA3HKM6WF41cUbPDoefLV3zZhv5I90E+pg=; b=QZGILVOJ+QPVXAY6Zni77eIF0Yi697+rGGIobSGwqD/pkwi/PhoZXOeEfnzUUGYNGtyCSDWc+ uIpEsguUtBWBcXXSKwecJem0jyUsiScgV+6RI3orm8tGu70OZQf7tqH X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Thu, 12 Oct 2023 03:24:40 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779544917432295318 X-GMAIL-MSGID: 1779544917432295318 Through the usage of pm_ptr() the CONFIG_PM-dependent code will always be compiled, protecting against bitrot. The linker will then garbage-collect the unused function avoiding any overhead. Signed-off-by: Thomas Weißschuh --- drivers/hid/usbhid/hid-core.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index 257dd73e37bf..a90ed2ceae84 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -1562,7 +1562,6 @@ static int hid_post_reset(struct usb_interface *intf) return 0; } -#ifdef CONFIG_PM static int hid_resume_common(struct hid_device *hid, bool driver_suspended) { int status = 0; @@ -1654,8 +1653,6 @@ static int hid_reset_resume(struct usb_interface *intf) return status; } -#endif /* CONFIG_PM */ - static const struct usb_device_id hid_usb_ids[] = { { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS, .bInterfaceClass = USB_INTERFACE_CLASS_HID }, @@ -1668,11 +1665,9 @@ static struct usb_driver hid_driver = { .name = "usbhid", .probe = usbhid_probe, .disconnect = usbhid_disconnect, -#ifdef CONFIG_PM - .suspend = hid_suspend, - .resume = hid_resume, - .reset_resume = hid_reset_resume, -#endif + .suspend = pm_ptr(hid_suspend), + .resume = pm_ptr(hid_resume), + .reset_resume = pm_ptr(hid_reset_resume), .pre_reset = hid_pre_reset, .post_reset = hid_post_reset, .id_table = hid_usb_ids, From patchwork Thu Oct 12 10:23:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 151909 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp1118134vqb; Thu, 12 Oct 2023 03:24:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IErQ6zwwVnXzTiiEIL7so1GpDI/fZ5iWEZ2TgBFi5ALCeOsNjzh+UEDJqzVpUN8N0fWQ9Po X-Received: by 2002:a05:6830:6206:b0:6b9:d3bd:3985 with SMTP id cd6-20020a056830620600b006b9d3bd3985mr24921736otb.1.1697106289787; Thu, 12 Oct 2023 03:24:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697106289; cv=none; d=google.com; s=arc-20160816; b=0QH8TxsvXz2TsFZV3/PLEtc1DWpSG4CC88w/ABZ3TasmT1H+MPqzNNx3B42rZgcDTd bb8xgGJJRggueESBivUoYVluw+Nn7WuwH/V6FrjhDpoWjF+g5xU5TcGWmzKzubqnAv5d E7qMjEMjPbtmtmZltj146lXRHvUusJpB1O/AqjDf7qFeg9lhGBVwmwnBi/cyXhwkQAqm bsLafUBlsmcTv7q3rtGJuTDHde1Z8/acyz6E02Rq8Z6foc4Kg/J2PbwWSEQUV2JKLlyv pgjCU2uE7EZKkujOQWMUYTlkHlVao6unSPSykS4/1CNNSP1QfJGblv2NBvrN2H1GyFCU TuvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=EpzQEIzSvLBT+b3/kyQ5OHK9aDN6uF6iBrhSJR17YUI=; fh=xUtS4Ye9bvz4mnbfL9bwsYffunq5fde5WqM/qGGhhDQ=; b=PxHCthF3LaXldJ8r6iaRcBHxFrOcUNG1f6rfDw611DBTY4oOLpCas57PFdoQBRxfk1 EfGi3yq3dYPkLeoVAELRJY5gK2NYFDs9jgmBLmbcLodnhMfi+wDw0Whk7Pj6o1aADqBn 1QkM2x58J58UBH7K5jBa0ZXkU6VxMJB5oT/aoFgZJvQNKt55tUfl3SG6aD+edFnFlALu an3PR98UF9xsvgLW73AaokuY6sgrmeSSaNoaNRu9cC6r9WhQleRjN4O2GnYJM/hTTmK4 h6Vm+iPI+enEk6iV0a0fNt46Ac8gxsLbrI39QXC1ldtVb4+pX2XI2L5652aormn7jLpH WKrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=WSw3ac5i; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id bv130-20020a632e88000000b005775e17f552si1935985pgb.249.2023.10.12.03.24.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 03:24:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=WSw3ac5i; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id C154F8257E29; Thu, 12 Oct 2023 03:24:47 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378005AbjJLKYX (ORCPT + 19 others); Thu, 12 Oct 2023 06:24:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347126AbjJLKXw (ORCPT ); Thu, 12 Oct 2023 06:23:52 -0400 Received: from todd.t-8ch.de (todd.t-8ch.de [IPv6:2a01:4f8:c010:41de::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7E18D6; Thu, 12 Oct 2023 03:23:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1697106227; bh=YveTPkYULLlyEsdLlGA46f1LzhfC/wP+L0Bg43PHoWM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=WSw3ac5i301zeAp93+JgG8P+/dbjE6iJwrFUgvgDOcmbL+ihwU1NJW6dnRY5bSNAT K1XArJ0hoKRw49I+WWAvIFZQzDyvTos6aP7M77giF2PMcLFGCPSKQqtTzga9I7/Jb/ xaSOHAmGmSbCIal7m6S7U9LRsCpXENQoDnQu1+8w= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Thu, 12 Oct 2023 12:23:40 +0200 Subject: [PATCH 3/4] HID: multitouch: remove #ifdef CONFIG_PM MIME-Version: 1.0 Message-Id: <20231012-hid-pm_ptr-v1-3-0a71531ca93b@weissschuh.net> References: <20231012-hid-pm_ptr-v1-0-0a71531ca93b@weissschuh.net> In-Reply-To: <20231012-hid-pm_ptr-v1-0-0a71531ca93b@weissschuh.net> To: Jiri Kosina , Benjamin Tissoires Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1697106227; l=1381; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=YveTPkYULLlyEsdLlGA46f1LzhfC/wP+L0Bg43PHoWM=; b=i7mP2224uBTGN/Zh76uFUX2dWrxHLRZqal53sVh/xAs7qvfoXcmHUigUcyaoqKjkusVT48IFQ KzCQUgxJJTbAyUUO8Ltk+LzVUb/rArUYbqPhCDY+vtmLPSRnwwmZG4r X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Thu, 12 Oct 2023 03:24:47 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779544925110971676 X-GMAIL-MSGID: 1779544925110971676 Through the usage of pm_ptr() the CONFIG_PM-dependent code will always be compiled, protecting against bitrot. The linker will then garbage-collect the unused function avoiding any overhead. Signed-off-by: Thomas Weißschuh --- drivers/hid/hid-multitouch.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 521b2ffb4244..2cdfc2a70a83 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -1802,7 +1802,6 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id) return 0; } -#ifdef CONFIG_PM static int mt_suspend(struct hid_device *hdev, pm_message_t state) { struct mt_device *td = hid_get_drvdata(hdev); @@ -1836,7 +1835,6 @@ static int mt_resume(struct hid_device *hdev) return 0; } -#endif static void mt_remove(struct hid_device *hdev) { @@ -2255,10 +2253,8 @@ static struct hid_driver mt_driver = { .usage_table = mt_grabbed_usages, .event = mt_event, .report = mt_report, -#ifdef CONFIG_PM - .suspend = mt_suspend, - .reset_resume = mt_reset_resume, - .resume = mt_resume, -#endif + .suspend = pm_ptr(mt_suspend), + .reset_resume = pm_ptr(mt_reset_resume), + .resume = pm_ptr(mt_resume), }; module_hid_driver(mt_driver); From patchwork Thu Oct 12 10:23:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 151907 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp1118003vqb; Thu, 12 Oct 2023 03:24:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF6676vPbvomIKJphYMiiBA8qW5QPYDZjLylQPqqxTBcWtbIVBYFQTmAT2uXAUY/50iuXra X-Received: by 2002:a05:6a21:a587:b0:163:c167:964a with SMTP id gd7-20020a056a21a58700b00163c167964amr29323766pzc.1.1697106274760; Thu, 12 Oct 2023 03:24:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697106274; cv=none; d=google.com; s=arc-20160816; b=nRZMjTG3yeOCF813QPDRwabEV8vSNoND4ZMiGfF+SmjfOdulSzxy/QdQ1rHZvY6VQF B5BQKAPJnMmB9hmAXVFW64DSeit1mWHAsRmYU0rKcRcdHqxJrNRUCYYaqiOvqplbU7iZ VQYopr2JggUQSxPnOo5wi8megNfxfVkl74VzqYbsSZEK03NAEXCK+/E8pYuqXRHbqWnm mHzIDZRmds4EdoJsykYbI4N7iUasepjrWWJqGqbGxSAV6LUUIpaiPn4Fi74xBhGdJLVU gy3vilxpDpx+38aPG0MErQ+ZpIuIZGW4g40msqMfVs3AX354IBVWiLchxL8vJAE1+9Kl 9kxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=VSuoJrReoYVfVeUtVRZnFW+kG/xLu5QHvu/L5FYjwyU=; fh=xUtS4Ye9bvz4mnbfL9bwsYffunq5fde5WqM/qGGhhDQ=; b=0HxmzTChusYlA3l49iw8RXhQFRNmG6FZM/vlqzfTuScV4P1GQrH/FOdz7pP6vF3XhR wO1Qr/IvOD9rhmdoKhkE8cuy/CIv7m0kP1JG5ObwmeIcnuLjWal825Fg78cON7SMIYvy BTdYAoxDXsgWp1VU0ZDnqVGpQcQmHeGYteDMfY3fPXEjfzkhKSNl3CKiE/mQ8ir17gvz 8vDNNFgYfLHL/k143dfx0flUG1/OzboSGzyEnQblvFBrwt0JRSRC0ntBayCWETQ28x7e 1/FCxoXIHT6ucaYAuvEzcE385DkmaZN+aqIReTb8FJ2P19Tbkp6L6onN2RsDJGbksOf+ qVnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=oWroPJNT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id b22-20020a639316000000b00584c5117901si1989675pge.59.2023.10.12.03.24.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 03:24:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=oWroPJNT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 67AD08257E23; Thu, 12 Oct 2023 03:24:31 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377631AbjJLKYQ (ORCPT + 19 others); Thu, 12 Oct 2023 06:24:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347133AbjJLKXw (ORCPT ); Thu, 12 Oct 2023 06:23:52 -0400 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC586D8; Thu, 12 Oct 2023 03:23:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1697106227; bh=5SDzzt7XMUNLkvBvYEQuCiuGLibIrAFTowagRCe9Ajs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=oWroPJNTMC8gtNsmULdL/9mutmcnqCq14qB3jD6uP8AeUqfk55rqGzOP+tshfTy+G UoacmJ39q0qb5cpMrvr+HqrDDuJmqA0DV3JpdrwnoVCNNqnoSW5eK3gBAzmirhKuZv qm3W1ENvyB5QtWZ4EppYfkq64C8rRifigulx8JR0= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Thu, 12 Oct 2023 12:23:41 +0200 Subject: [PATCH 4/4] HID: rmi: remove #ifdef CONFIG_PM MIME-Version: 1.0 Message-Id: <20231012-hid-pm_ptr-v1-4-0a71531ca93b@weissschuh.net> References: <20231012-hid-pm_ptr-v1-0-0a71531ca93b@weissschuh.net> In-Reply-To: <20231012-hid-pm_ptr-v1-0-0a71531ca93b@weissschuh.net> To: Jiri Kosina , Benjamin Tissoires Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1697106227; l=1495; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=5SDzzt7XMUNLkvBvYEQuCiuGLibIrAFTowagRCe9Ajs=; b=M2Rn5UBq5P/gACg74ZfSclny/wCeyqbwxYn0CkHIk8fyb5HNmVZAcKUVOI7MrfDzNO2ubN77k UYptybFID/7BMvOT6sF2m4865QwQnEePXz3yrgm89ADgYFLSrkHFqGq X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Thu, 12 Oct 2023 03:24:31 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779544908772611403 X-GMAIL-MSGID: 1779544908772611403 Through the usage of pm_ptr() the CONFIG_PM-dependent code will always be compiled, protecting against bitrot. The linker will then garbage-collect the unused function avoiding any overhead. Signed-off-by: Thomas Weißschuh --- drivers/hid/hid-rmi.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c index 84e7ba5314d3..d4af17fdba46 100644 --- a/drivers/hid/hid-rmi.c +++ b/drivers/hid/hid-rmi.c @@ -436,7 +436,6 @@ static void rmi_report(struct hid_device *hid, struct hid_report *report) input_sync(field->hidinput->input); } -#ifdef CONFIG_PM static int rmi_suspend(struct hid_device *hdev, pm_message_t message) { struct rmi_data *data = hid_get_drvdata(hdev); @@ -483,7 +482,6 @@ static int rmi_post_resume(struct hid_device *hdev) hid_hw_close(hdev); return ret; } -#endif /* CONFIG_PM */ static int rmi_hid_reset(struct rmi_transport_dev *xport, u16 reset_addr) { @@ -774,11 +772,9 @@ static struct hid_driver rmi_driver = { .report = rmi_report, .input_mapping = rmi_input_mapping, .input_configured = rmi_input_configured, -#ifdef CONFIG_PM - .suspend = rmi_suspend, - .resume = rmi_post_resume, - .reset_resume = rmi_post_resume, -#endif + .suspend = pm_ptr(rmi_suspend), + .resume = pm_ptr(rmi_post_resume), + .reset_resume = pm_ptr(rmi_post_resume), }; module_hid_driver(rmi_driver);