From patchwork Wed Mar 15 15:06:54 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: 13176076 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0236BC61DA4 for ; Wed, 15 Mar 2023 15:13:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=07/sji9v8zK1sQfKuULaZkGpQcP3a9WoCTAaF0XBnqQ=; b=2luqZ3imF98utF lT4wwKYBRjIcWfrmbYCuuW60W0SPYWdlV9a1AJ1imTpnXAI46AXIUGgE+y53mGQ6d/zP+3aYpHfAU MkL/a3vTXhd6wGbLw2Jo3u1jmRC7lYamUzymZmpgS8+NqWhfQ5T2A/OtqKC8dtpY4ZwWLtq1zP7AP nWoUoUW6/napFAIFBdHFhDuR0ltMjNt/EebUuz7T+SQR95yk5ypnesUbnAcf3RbEfpH1AsziKKwrj zZ9zgeji883nlOWixYRHCXOuCEuPC9B1YlswT4TLH7hgOQJ+0LgIEBAo5poBLYU7Dox+t9G03eSg0 PLOXFI9y/oKSV+tW4nbQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pcSou-00DnzN-0T; Wed, 15 Mar 2023 15:13:40 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pcSkM-00DkAU-2y for linux-rockchip@bombadil.infradead.org; Wed, 15 Mar 2023 15:08:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-ID:Content-Description; bh=DmFjc5U25IWJxaQfuxhScHyrMDMnueYQitAoiBYcRlc=; b=q20P1o9n169KnwQLGuslvtyfAQ tE8k/Nc3m933R3kkaq5k/W2pWK3ed2DHn+AJlvr/fw6hLLDQYcYHjOGqqOBJl5dA6Va+vg/Pje/iV AKO740I4cP/l6EEmROkJe8RI4jOHIoqJ0WN2O1FYYZB1g3evWUP2mcS4SFAGEY71NkdYYoDCwCaNh ckjKdorXrgyCne9XndB0M69yc7YPERZ/65p8uhcMr0X7pabh6mDvkeulSK4ti5tS5zucHzVxEpKwi 7ckq9NIPGj/sn4GTLeZYnwZh5DQs5eHri4femz5rfsQmdQyrjPQVkjegxNNvgMS4bhHBFJ5FjkM15 AbsJiZXw==; Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by casper.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pcSkC-00Dw1J-Jv for linux-rockchip@lists.infradead.org; Wed, 15 Mar 2023 15:08:57 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pcSjs-00007m-6A; Wed, 15 Mar 2023 16:08:28 +0100 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pcSjo-004Kd4-CM; Wed, 15 Mar 2023 16:08:24 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pcSjn-0057jg-PB; Wed, 15 Mar 2023 16:08:23 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Heiko Stuebner Cc: alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, kernel@pengutronix.de Subject: [PATCH 122/173] ASoC: rockchip: rockchip_rt5645: Convert to platform remove callback returning void Date: Wed, 15 Mar 2023 16:06:54 +0100 Message-Id: <20230315150745.67084-123-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230315150745.67084-1-u.kleine-koenig@pengutronix.de> References: <20230315150745.67084-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1733; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=DYgV418G1HHJeUqCA1P1kSgz2wPVPuFAcd/9MCT5gwM=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBkEd6f1wJzQoQD2KJzDYqef/HTE55r9Gi6cw/3Y j+egw14J2yJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCZBHenwAKCRDB/BR4rcrs CStYB/wKLpGaEafdneDGlLIhen0gzV3CF324RUbG9aCV5HIu06+4ZtTa3ojtN2fdpsiyPnDSnQh RYSpAIJda34Z26emwUC1P7qwqjBqxDMT6K2gvK+8o99EdttfdR83juiiymJg/fAEX8U4OjtEWgC 9PT2Xtx6CoMIMkRkcbhDv2wOSchPsfLFxE+YkSWgQYrsBuAscZmMrkrfDY+0T1KRHgym7X1hTga UJAhaxFCxh5zhxy3OcmEuDhwCNvWcshLE62Hd9nvqr2z/b0aoetqFXh2aJw74WPWQKz6/mOaruf gQfin9fYn38PLvvIty1tW/im8tlNMtiOi743hv1yOZM9GQWc 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.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-rockchip@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230315_150849_236751_0EFD76A5 X-CRM114-Status: GOOD ( 13.11 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org 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 (mostly) ignored 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. Trivially convert this driver from always returning zero in the remove callback to the void returning variant. Signed-off-by: Uwe Kleine-König --- sound/soc/rockchip/rockchip_rt5645.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sound/soc/rockchip/rockchip_rt5645.c b/sound/soc/rockchip/rockchip_rt5645.c index d07cc5c813f2..e73a342b7953 100644 --- a/sound/soc/rockchip/rockchip_rt5645.c +++ b/sound/soc/rockchip/rockchip_rt5645.c @@ -206,14 +206,12 @@ static int snd_rk_mc_probe(struct platform_device *pdev) return ret; } -static int snd_rk_mc_remove(struct platform_device *pdev) +static void snd_rk_mc_remove(struct platform_device *pdev) { of_node_put(rk_dailink.cpus->of_node); rk_dailink.cpus->of_node = NULL; of_node_put(rk_dailink.codecs->of_node); rk_dailink.codecs->of_node = NULL; - - return 0; } static const struct of_device_id rockchip_rt5645_of_match[] = { @@ -225,7 +223,7 @@ MODULE_DEVICE_TABLE(of, rockchip_rt5645_of_match); static struct platform_driver snd_rk_mc_driver = { .probe = snd_rk_mc_probe, - .remove = snd_rk_mc_remove, + .remove_new = snd_rk_mc_remove, .driver = { .name = DRV_NAME, .pm = &snd_soc_pm_ops,