From patchwork Tue Nov 21 10:36:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Schiffer X-Patchwork-Id: 167637 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp528255vqb; Tue, 21 Nov 2023 02:37:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IHIi3CWwAhW8xMi6cDUJ+zV1KNBvZ8IZg77nhtzsdtmyb8U0fqMkWTXnACndIe28sC5hNXp X-Received: by 2002:aa7:86cd:0:b0:68f:c1e0:a2c4 with SMTP id h13-20020aa786cd000000b0068fc1e0a2c4mr3154061pfo.3.1700563063021; Tue, 21 Nov 2023 02:37:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700563063; cv=none; d=google.com; s=arc-20160816; b=E1Z6gDBXPRSIQEMS0hLCVkNZ7afkZY3Y8QgLubiq6wiKMy/k40cBFm3BRnoMHmctDo H7vGbHoG0C2sFHTR8xVh5E3Vfem2EJ8orvT6Lg3dByAn7Cgqw5A3pbw+DwVUHMpiSJeH Ov/mcXWu6OEH+Nml5VUTTuIC9nJP1Mx61ceE3wvVPmK0cBoXI6CsTXiA8VQxkSQY+QV2 f+x6rntk2KnvVOlF+lU2p5ruoGYZpOuxlvOLtsbPNS9ZjLLoPiZE4KTJl5NF+fbuGKfG f8SHYiSoe2+zgfttLsu/9q4twTc7GZmFfzv4ppE9QlaYRMAsGsynzZ6zgUFLy1A10qqn v6Fw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=/BuOSICs5te6V9ljUk+eVtExi5LOcGJYUpjHjgNW5Hk=; fh=2hsh50ieWPV+Ewc6Kf1hazbFom9HJ86TgHDleS6PUPE=; b=Dz85PUMkHRlV/pZaCns33EJfP4v9ODFhfhR1DB3Vxhh3ipdgCH9c7MCm2ZshU49DAa XqfCByvd1h7URpf+9Q1cHFNEeikolwUiARE0OeFiHjPyaJuJir8TZ+Zs9F6WAZoh7Xjz DBDIfTyHhNjoqiCkFp6YSfMU1id5LU3OMEcKC+GVe3M8x3p9w7eugLJfd1kZhkHhSmXE cZ5T73RCZSgFgTB/1jxQFJmPsu5dym2iX8LsWuAaFWiJTZWr69VJTXAYORl8Rxd1NREY iHajyMHicp8dayQv5a0uA9521WLkS0TKK6Hy7uo5za/iY+R/YbPvr1Skj+EmLUXFI83o WfEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tq-group.com header.s=key1 header.b=P5YNhls8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=tq-group.com Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id b12-20020a056a00114c00b006bf53365ac4si10290663pfm.139.2023.11.21.02.37.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 02:37:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@tq-group.com header.s=key1 header.b=P5YNhls8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=tq-group.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 29EDA80320CB; Tue, 21 Nov 2023 02:37:35 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234077AbjKUKhV (ORCPT + 99 others); Tue, 21 Nov 2023 05:37:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233992AbjKUKhI (ORCPT ); Tue, 21 Nov 2023 05:37:08 -0500 Received: from mx1.tq-group.com (mx1.tq-group.com [93.104.207.81]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C2BCD78; Tue, 21 Nov 2023 02:36:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1700563010; x=1732099010; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=/BuOSICs5te6V9ljUk+eVtExi5LOcGJYUpjHjgNW5Hk=; b=P5YNhls8Xyip+vIaTNvc+NyTtzaN6Kk9jptDDv79bgNaYvxE44aP+vNq Ji34xcxI6aYx99SfUrgGUnrTdoeTjysZkImo4HAIFAYtYdvRiuJIOxBf2 L/ikUu1KL/xXXgtWXf0QaI5FZVmuV74iWAMe7iGGSHhnn2yy2HOs/2w92 HfNJUuDbmW7Yl8zAJq0y+TMH/dlpgLADLmPlHF9gG4QaWjsYHYWKvsxKM N1k0PQU9iavk3f3dcoVkew5fDrvvJOI41KSmTCYYwRTlmO/TcScC/NIsH vPHLyd8AvDm62jjk7e0H7NMLh+frzmXX3ibiRT06TXYJh2e+HFxB5hhcy w==; X-IronPort-AV: E=Sophos;i="6.04,215,1695679200"; d="scan'208";a="34092750" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 21 Nov 2023 11:36:47 +0100 Received: from localhost.localdomain (SCHIFFERM-M2.tq-net.de [10.121.49.20]) by vtuxmail01.tq-net.de (Postfix) with ESMTPA id 2F03A280075; Tue, 21 Nov 2023 11:36:47 +0100 (CET) From: Matthias Schiffer To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux@ew.tq-group.com, Matthias Schiffer Subject: [PATCH] Input: synaptics-rmi4 - remove no-op reset handler Date: Tue, 21 Nov 2023 11:36:33 +0100 Message-ID: <20231121103633.42978-1-matthias.schiffer@ew.tq-group.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Tue, 21 Nov 2023 02:37:36 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783169614373781543 X-GMAIL-MSGID: 1783169614373781543 None of the individual function drivers have ever implemented a reset() operation, meaning that reset_one_function() and in turn rmi_driver_process_reset_requests() have always been no-ops. Get rid of them. Signed-off-by: Matthias Schiffer --- drivers/input/rmi4/rmi_bus.h | 1 - drivers/input/rmi4/rmi_driver.c | 38 --------------------------------- 2 files changed, 39 deletions(-) diff --git a/drivers/input/rmi4/rmi_bus.h b/drivers/input/rmi4/rmi_bus.h index 25df6320f9f1d..9b0860a8b06f9 100644 --- a/drivers/input/rmi4/rmi_bus.h +++ b/drivers/input/rmi4/rmi_bus.h @@ -80,7 +80,6 @@ struct rmi_function_handler { int (*probe)(struct rmi_function *fn); void (*remove)(struct rmi_function *fn); int (*config)(struct rmi_function *fn); - int (*reset)(struct rmi_function *fn); irqreturn_t (*attention)(int irq, void *ctx); int (*suspend)(struct rmi_function *fn); int (*resume)(struct rmi_function *fn); diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c index 258d5fe3d395c..131add4b9affd 100644 --- a/drivers/input/rmi4/rmi_driver.c +++ b/drivers/input/rmi4/rmi_driver.c @@ -57,25 +57,6 @@ void rmi_free_function_list(struct rmi_device *rmi_dev) data->f34_container = NULL; } -static int reset_one_function(struct rmi_function *fn) -{ - struct rmi_function_handler *fh; - int retval = 0; - - if (!fn || !fn->dev.driver) - return 0; - - fh = to_rmi_function_handler(fn->dev.driver); - if (fh->reset) { - retval = fh->reset(fn); - if (retval < 0) - dev_err(&fn->dev, "Reset failed with code %d.\n", - retval); - } - - return retval; -} - static int configure_one_function(struct rmi_function *fn) { struct rmi_function_handler *fh; @@ -95,21 +76,6 @@ static int configure_one_function(struct rmi_function *fn) return retval; } -static int rmi_driver_process_reset_requests(struct rmi_device *rmi_dev) -{ - struct rmi_driver_data *data = dev_get_drvdata(&rmi_dev->dev); - struct rmi_function *entry; - int retval; - - list_for_each_entry(entry, &data->function_list, node) { - retval = reset_one_function(entry); - if (retval < 0) - return retval; - } - - return 0; -} - static int rmi_driver_process_config_requests(struct rmi_device *rmi_dev) { struct rmi_driver_data *data = dev_get_drvdata(&rmi_dev->dev); @@ -445,10 +411,6 @@ static int rmi_driver_reset_handler(struct rmi_device *rmi_dev) return error; } - error = rmi_driver_process_reset_requests(rmi_dev); - if (error < 0) - return error; - error = rmi_driver_process_config_requests(rmi_dev); if (error < 0) return error;