Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 69CB93ADB9A for ; Wed, 9 Sep 2026 19:07:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788980840; cv=none; b=m+DBukyGUCGtz2/ll2BSZqPJMpmzV7eITyHrbE0/kyJ6SUCrBB21tJJyXl4ru9RDj3p/fBtCoXgM0S3FwyWBaOOZGI1yr8wa7B+09nfZPMN4Z5g4E/u96zWTacvZg1fSfx3x5BCehEDbUaVEDNSCiQAJI/8+rEjJaZ//hShdrU8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788980840; c=relaxed/simple; bh=cNH1ahMNCjYsZqs+0X4zCW0mAttDul7xHLGIbrZ57LA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=dRnfPTblQRIFxABvdaryPvqUTo/0nV/tcedSvXLYGCe4hqXnpB9vu3yTZx2k4HSNuuK6+Xgn59rnXoWUoynDpmuQizOzt9R8u8esabZonBAk6UT29dHA4EvFSpPwhSd+O0Z13o0nGMoT+h9N5nvzySFpciBfSzHpxagtEo8OUD4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=A9vEhpCO; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="A9vEhpCO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6328F1F00899; Wed, 9 Sep 2026 19:07:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788980838; bh=OyEH2eN/d5fMg146P31WmEB7i0thwilUzrzra80Ur2Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=A9vEhpCOesUtsUydVevEsL2fEEJ7RJFqZ30Kb0jcJs1UE5z8lp45krPDxPXOftPTg bkxyt948dL/vmPStyxAXyGNk+RUEiblrGUTrTuI7i0SvNzqqboRheNkZ5owgVSrJvj GWDVd6VIRMJIURzaE01LUfxyu4VlvMGXPdb/P/eeKZK4hHXgz1UvHCfXOex8evb0Ak 7T8AxSXJnmYR6pXzMeuNox+Y1dsgHcpbJWVhdvlTOO/Ns81zN+UzuO1ESKi64zNmxW MzqylsqlVU1zI6RzVtByOUx1Gz+qGTQQXcp37GMRl0lg/EU16bmUIiqUwtuLl/n/GP Zq3z+1UGSclCA== From: Sasha Levin To: stable@vger.kernel.org Cc: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Lee Jones , Sasha Levin Subject: [PATCH 5.15.y 2/3] mfd: sm501: Convert to platform remove callback returning void Date: Wed, 9 Sep 2026 15:07:14 -0400 Message-ID: <20260909190715.3536119-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260909190715.3536119-1-sashal@kernel.org> References: <2026090352-reptile-skyline-e58f@gregkh> <20260909190715.3536119-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Uwe Kleine-König [ Upstream commit c20fddf7acfb54d856c34208926701d32c25eb18 ] 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 Link: https://lore.kernel.org/r/20231123165627.492259-15-u.kleine-koenig@pengutronix.de Signed-off-by: Lee Jones Stable-dep-of: 83feedd9d83c ("mfd: sm501: Fix potential memory leaks during remove") Signed-off-by: Sasha Levin --- drivers/mfd/sm501.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c index 1865621d62f27..06e796883189e 100644 --- a/drivers/mfd/sm501.c +++ b/drivers/mfd/sm501.c @@ -1669,7 +1669,7 @@ static void sm501_pci_remove(struct pci_dev *dev) pci_disable_device(dev); } -static int sm501_plat_remove(struct platform_device *dev) +static void sm501_plat_remove(struct platform_device *dev) { struct sm501_devdata *sm = platform_get_drvdata(dev); @@ -1677,8 +1677,6 @@ static int sm501_plat_remove(struct platform_device *dev) iounmap(sm->regs); release_mem_region(sm->io_res->start, 0x100); - - return 0; } static const struct pci_device_id sm501_pci_tbl[] = { @@ -1709,7 +1707,7 @@ static struct platform_driver sm501_plat_driver = { .of_match_table = of_sm501_match_tbl, }, .probe = sm501_plat_probe, - .remove = sm501_plat_remove, + .remove_new = sm501_plat_remove, .suspend = pm_sleep_ptr(sm501_plat_suspend), .resume = pm_sleep_ptr(sm501_plat_resume), }; -- 2.53.0