From mboxrd@z Thu Jan 1 00:00:00 1970 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 03BB43905E6; Sat, 12 Sep 2026 16:27:52 +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=1789230475; cv=none; b=iIf8XGrxL7WJCTo0W/f+DzkUTPuM610XZ51UPiajuE7oO+QRV1S5R+3SwMk4BTLiGG7gEdG2c+TP9GEpuFppW77X08VfyMxzufXF1Xt4dqDK8ljlqt1/M+6Uxfu+ss0+gPl9NdnuxXVQYBh5PNS5SekJ19XqIErIfPHiMYy94+g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789230475; c=relaxed/simple; bh=PCIefjN9U/2LJZDfO0kDerza3uzHHTWKPHFztnEl7p0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=pzf9Cr8bi+ppOgIRPJAqYlIdVOAqAOKWiUGvyRXqX6p/KRtLXNMq7LOT89ydTiK7W0tfmuwH6dz9xB7GpLdROBbB5lU4ej7/Aet4NeieBYQ7mQGuXDRGZcGPqE3/gu+273Ls6bFPXpGQA00dRFnYrCkbthkT/b340QDht4ejoaI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=PnO7xfd4; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="PnO7xfd4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 836951F000FF; Sat, 12 Sep 2026 16:27:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789230472; bh=bgYYCyLkpaIzR+AyP4PTiHg2tKMPh1CX7Xhr/GYH6Vw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=PnO7xfd4b9FooHoaqCoNH9xarqeJZ79Swz1md+4kAqBNSYNGULKW+NdPjukgwPIhB UhB02E5FXmhzv7vm1K3n3WX+Ha7mgKGJDTab+RUfdxu8ZIu4eUQll/npjJVxH2s1rj 2VERTXM5i/0KpzkWkZKeIJ4Hv6Zp5JSNqYmbeA28= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Sebastian Reichel , Sasha Levin Subject: [PATCH 6.1 0784/1191] power: supply: sc2731_charger: Convert to platform remove callback returning void Date: Sat, 12 Sep 2026 08:58:32 +0200 Message-ID: <20260912065605.886553406@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065548.086904252@linuxfoundation.org> References: <20260912065548.086904252@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Uwe Kleine-König [ Upstream commit 0569d4cfa800ba303647dbf8170d1e89bdee3ed9 ] 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() is 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/20230918133700.1254499-25-u.kleine-koenig@pengutronix.de Signed-off-by: Sebastian Reichel Stable-dep-of: dfc859bb8d33 ("power: supply: sc2731_charger: cancel work on remove") Signed-off-by: Sasha Levin --- drivers/power/supply/sc2731_charger.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/power/supply/sc2731_charger.c b/drivers/power/supply/sc2731_charger.c index 9ac17cf7a1260..b3d8b1ca97da7 100644 --- a/drivers/power/supply/sc2731_charger.c +++ b/drivers/power/supply/sc2731_charger.c @@ -511,13 +511,11 @@ static int sc2731_charger_probe(struct platform_device *pdev) return 0; } -static int sc2731_charger_remove(struct platform_device *pdev) +static void sc2731_charger_remove(struct platform_device *pdev) { struct sc2731_charger_info *info = platform_get_drvdata(pdev); usb_unregister_notifier(info->usb_phy, &info->usb_notify); - - return 0; } static const struct of_device_id sc2731_charger_of_match[] = { @@ -532,7 +530,7 @@ static struct platform_driver sc2731_charger_driver = { .of_match_table = sc2731_charger_of_match, }, .probe = sc2731_charger_probe, - .remove = sc2731_charger_remove, + .remove_new = sc2731_charger_remove, }; module_platform_driver(sc2731_charger_driver); -- 2.53.0