From patchwork Fri Dec 15 13:59:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 179313 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp9297265dys; Fri, 15 Dec 2023 06:04:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IGzwQUSM0011Rt5nEiJISKiI3JetitnDipJcrUiTLH4ZrZUZPpVTu1ChtWYfuIhJFj37/Q5 X-Received: by 2002:a05:6a00:390c:b0:6d0:d864:e357 with SMTP id fh12-20020a056a00390c00b006d0d864e357mr2594755pfb.40.1702649055975; Fri, 15 Dec 2023 06:04:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702649055; cv=none; d=google.com; s=arc-20160816; b=DgxonF1VN+MyZ1IA1+GkumhePCEx5OdTjgaxPZiP2Zoml4LWaK9R3ulCnQlohKab7Z yFiGNZsIM+99DIuI3xt+bdGJ7b318ypEozzwOdBmYMK7gWkJng/FqtOicGLagJeXtgN7 9te/k7FlzbwFL1JfiseFolrFDAe5TjgmIE2nEemNk+sVEdeN0jt5KdjIxjyV6Wv4gfCH r//Gzk8LDw8wNc12Ozm6bE+5Uea0RFF631SlLf0fhkpDQOAynCGLwhcsx0SDLyJPJ1iN qQsdWVdL4pE4E+sPSyXdKWQW/4JT5wlj0kMUcJ3S2TK7PqvyA2875ENSYKIE/O0CB1hO Y+pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=20Vi/XB4GFKjOYIMOxBOkOs+8kfHID7Uy/Q+K60MH9g=; fh=kV/WDZstGnpNGETldQN5Z0wXDX1YPMFGuFk2o6XhPiM=; b=g/vniK88luP3yiYKVfHj1ahjgnnuqflx8x1RrOVkCvPKFM09AGbOihU8vKGznDEKPi kY5W68eSIfWUCU2gxas96nRbIzt3UMOW8Bht+VaZWdHJaUVNXCn+RnDThCAZntRjWQ/4 +BJGt7RNTGv7IQAlh/FPzHtxEmbElHR4dLo0kzinYLSkmsSXPybIHWRT9+77cSIZtBQJ 4g1ggKPrGvW8vN1iYFLZrQeuVLDiEPjEDjbUShzVoy1G89/VJeooHgjC4GJDPUdeyPJK hXQZUkeLPXsjggop3QC6XchgfqGpnkzQizdQxXZgOdATP+Io7cF3xT9kau/P4QMn7sy1 PumA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-1065-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-1065-ouuuleilei=gmail.com@vger.kernel.org" Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id a15-20020a056a000c8f00b006cbd28f1f43si13479016pfv.47.2023.12.15.06.04.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 06:04:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-1065-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-1065-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-1065-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id CD52CB23685 for ; Fri, 15 Dec 2023 14:03:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 97E7239FD4; Fri, 15 Dec 2023 13:59:43 +0000 (UTC) X-Original-To: linux-kernel@vger.kernel.org Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B10BF34CEF for ; Fri, 15 Dec 2023 13:59:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rE8iw-0002lt-07; Fri, 15 Dec 2023 14:59:30 +0100 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rE8iv-00G2ZZ-GT; Fri, 15 Dec 2023 14:59:29 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1rE8iv-003cCM-6y; Fri, 15 Dec 2023 14:59:29 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Will Deacon , Mark Rutland Cc: Ilkka Koskinen , Suzuki K Poulose , Besar Wicaksono , Robin Murphy , Raag Jadav , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/18] perf: arm_cspmu: Convert to platform remove callback returning void Date: Fri, 15 Dec 2023 14:59:06 +0100 Message-ID: <9ff5a467569dd51b2fc44e11594ad5db7ea15f57.1702648125.git.u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.42.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1848; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=iD85+6TB8xZ09uwwdBXf03XK6NMXrN2+ozmtzMTXttY=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlfFur3mWCsTZ86/mocSQ45ul+pTIzr/UQuUm4F y0mpEKykPeJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZXxbqwAKCRCPgPtYfRL+ Tq6oCACP7hKGGnlzlmcvQgf4nkNUaeLKlAPgMCQdyZ0osuj2C2NgpL1+vFuAF49i+xnFDzSWHx5 cFIdv+uqL1DQYFS7IQtjXivdUirncexZl8ICb771sPGL04cEHuD64Wu9Rz+bvVMGvQubWywHjE7 C9OxuDIJTeRKBJAFuQU1tVOIZwGhkKqlsI8pDPaXkhuTxQ/I2l4hsYw0ylM4v2ZvSc+aKAxHocl aPeWW8BWq4toRCOGsN3lrJFEOKy4Li4C1BZIt/hqmjN/NPc3c3ldakJjkp908CbIiHeL4lBIHEF a0PIaknWlp/z9xDdH9nCXSHGXfh9Mlof++TiXd6u7WC28sR+ X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785356936385517617 X-GMAIL-MSGID: 1785356936385517617 The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is ignored (apart from emitting a warning) and this typically results in resource leaks. To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new(), which already returns void. Eventually after all drivers are converted, .remove_new() will be renamed to .remove(). Trivially convert this driver from always returning zero in the remove callback to the void returning variant. Signed-off-by: Uwe Kleine-König --- drivers/perf/arm_cspmu/arm_cspmu.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/perf/arm_cspmu/arm_cspmu.c b/drivers/perf/arm_cspmu/arm_cspmu.c index 50b89b989ce7..3513bf50fefa 100644 --- a/drivers/perf/arm_cspmu/arm_cspmu.c +++ b/drivers/perf/arm_cspmu/arm_cspmu.c @@ -1252,14 +1252,12 @@ static int arm_cspmu_device_probe(struct platform_device *pdev) return ret; } -static int arm_cspmu_device_remove(struct platform_device *pdev) +static void arm_cspmu_device_remove(struct platform_device *pdev) { struct arm_cspmu *cspmu = platform_get_drvdata(pdev); perf_pmu_unregister(&cspmu->pmu); cpuhp_state_remove_instance(arm_cspmu_cpuhp_state, &cspmu->cpuhp_node); - - return 0; } static const struct platform_device_id arm_cspmu_id[] = { @@ -1274,7 +1272,7 @@ static struct platform_driver arm_cspmu_driver = { .suppress_bind_attrs = true, }, .probe = arm_cspmu_device_probe, - .remove = arm_cspmu_device_remove, + .remove_new = arm_cspmu_device_remove, .id_table = arm_cspmu_id, };