From patchwork Wed Dec 27 16:26:30 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: 183517 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp1532870dyb; Wed, 27 Dec 2023 08:28:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IFc+W7apdRyEIXn1O9Ne/NU7+lAtHz6t4VzO9Pgt4xkuXRRKPfwcj1eiRE+6S3z+aNn/n84 X-Received: by 2002:a17:903:64f:b0:1d3:e8a5:7562 with SMTP id kh15-20020a170903064f00b001d3e8a57562mr9061527plb.96.1703694529666; Wed, 27 Dec 2023 08:28:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703694529; cv=none; d=google.com; s=arc-20160816; b=CwGPJIPWjOSwHRY80kNm2uNJgRFygDx7GaSDtNSq1v6IXbTGUcPbrXRE012L97DHHl Tt+CshwzO7Ww3Stlx+8L2uO3gaXFIXst+8tAXUzeOym37CWTHLGia5q69bA+OO2zrrgd mS4CJXW5f25pLp4AcekesN71ecuEdfBbtDzFH4rvAO4+adhdRaZX89GRJtAhcnhdpQm2 J2Pq0e9G6GIAEOPtP4yk9pdwo7Cwu0HH3XKbV+As5wF+JnOjxqrOAb3f3N4Ryrk30hWE Oy+foEdVU2HIlNnd6s0CiEBoe8k+R566rIQpA5Nhw8e1ad7TRiIcej5K4tpQr1qiBGFV S5eg== 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=iJY904N8dFa8rzKR8rqm677qF50oUnB3c7C5PyshRnU=; fh=WXH/H6gYz9bVDOIibGH+OfHRp+5L9a5qtXixZYpucCQ=; b=fTMAgXuLYxcVO2jUuHYrFXJ7sFpQZHnab0SSfCzmYe3lXDgjg+RXQKdaI3h5n7n/Rn AdZrzl1EqBWzcIILTvfo0xiIP0+QEToIlHQqXDtwYCGU3z+fb1Amc6F1emuu9uQGEy3l 6N+mk/b0MVtxGtutD80X3nmvwKK2LrY6A1Hg0OctdRVU5N+beat5yP17m3uUDc+GCc7C Qz6NFXM+j8fqYrm7yNNAubU25nxvFOT0wr+QoRq9ANFyen+a1gXzIYr2SYTPH/IIVP2V cOSZ4hXI9v7ug9FYo2C2w57m3aq2Vs2O1aDDjHU1wGmj1UXkHyAYZt3ZtEvCtzvLyduK I7Tg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-12126-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-12126-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 o17-20020a635d51000000b00584ca25959csi11639742pgm.540.2023.12.27.08.28.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Dec 2023 08:28:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-12126-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-12126-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-12126-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 5AD2FB22A1D for ; Wed, 27 Dec 2023 16:27:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A64F947F49; Wed, 27 Dec 2023 16:26:56 +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 D0A654643C for ; Wed, 27 Dec 2023 16:26:53 +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 1rIWk0-00059r-38; Wed, 27 Dec 2023 17:26:44 +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 1rIWjx-001tZZ-Qh; Wed, 27 Dec 2023 17:26:42 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rIWjy-001Wn1-2g; Wed, 27 Dec 2023 17:26:42 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Gabriel Somlo , "Michael S. Tsirkin" Cc: kernel@pengutronix.de, qemu-devel@nongnu.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/11] firmware: qemu_fw_cfg: Convert to platform remove callback returning void Date: Wed, 27 Dec 2023 17:26:30 +0100 Message-ID: <8d7d86a24ea36985845c17b6da0933fedbf99ad8.1703693980.git.u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.43.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=1964; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=Nuh2zfgdzxmPQm9xjM7Qd8aGlwMSzi2SytLozr/ldNI=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBljFA4SiZA8Czr5oUw4pC3X33baRdQ2zK8UNaGd qJkOIfRcM+JATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZYxQOAAKCRCPgPtYfRL+ TiVtB/9jFGL9M1pmYrAxhcbUa8Fjt8yPqmgn+z7SvuziuDVEWqFHjFWJ8VQZBJ5zynq/yVPl1f6 urdnJg6eOFNj0PYq6BeEZ0EBhieCqObdsqUavigZblPpdxkoUx+3OknYd6j30HbZY3oT2XIJb7g z8LpDGjq3AtUsQvnbSDQnY2Yo/6iw96gEaXu2oAj6UECO8y+KSbYOOhmw320RX5KTlY0lrGlFl1 JHVQBU5OErrYaujF0lFh2gCB3ZMzwHWgidVCDjnKmdMZShf75AeOFCD20INk02WCoNgbKOxzM6S iYLX9UIsbnWxPSzM3Y6UDLK4MeGi4N/dEn96Fg/SHu+Ia7E2 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: 1786453195338788043 X-GMAIL-MSGID: 1786453195338788043 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 Reviewed-by: Philippe Mathieu-Daudé Acked-by: Michael S. Tsirkin --- drivers/firmware/qemu_fw_cfg.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c index 1448f61173b3..03da9a4354f8 100644 --- a/drivers/firmware/qemu_fw_cfg.c +++ b/drivers/firmware/qemu_fw_cfg.c @@ -731,7 +731,7 @@ static int fw_cfg_sysfs_probe(struct platform_device *pdev) return err; } -static int fw_cfg_sysfs_remove(struct platform_device *pdev) +static void fw_cfg_sysfs_remove(struct platform_device *pdev) { pr_debug("fw_cfg: unloading.\n"); fw_cfg_sysfs_cache_cleanup(); @@ -739,7 +739,6 @@ static int fw_cfg_sysfs_remove(struct platform_device *pdev) fw_cfg_io_cleanup(); fw_cfg_kset_unregister_recursive(fw_cfg_fname_kset); fw_cfg_kobj_cleanup(fw_cfg_sel_ko); - return 0; } static const struct of_device_id fw_cfg_sysfs_mmio_match[] = { @@ -758,7 +757,7 @@ MODULE_DEVICE_TABLE(acpi, fw_cfg_sysfs_acpi_match); static struct platform_driver fw_cfg_sysfs_driver = { .probe = fw_cfg_sysfs_probe, - .remove = fw_cfg_sysfs_remove, + .remove_new = fw_cfg_sysfs_remove, .driver = { .name = "fw_cfg", .of_match_table = fw_cfg_sysfs_mmio_match,