From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77179EEB57D for ; Sat, 9 Sep 2023 01:15:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236218AbjIIBPG (ORCPT ); Fri, 8 Sep 2023 21:15:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239746AbjIIBPE (ORCPT ); Fri, 8 Sep 2023 21:15:04 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25A6326A5; Fri, 8 Sep 2023 18:14:33 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 09D0AC4163D; Sat, 9 Sep 2023 01:13:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694222001; bh=zVMpq/gM87f5AGttmVO2xueTDbmIF7lgyde3fz1QGYU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hPVfODX7MsR7oYgFjmOCh0XpLWhVF0i34YtuYWqXkXxJplrEN+FyzS7qq5Fu7Zj1s JCxNA205jDqkrZWdTLUx2rIAznckt/sFPWhHb+XzRIhbiiVAOqVBlZCtsqr9mxd8uI bJE2TG2ardA8PXMk4f77o6qO0rR3KGym/PZwYx+drZF3bHZTBK9SSGsfpcB3HHWP4P J87niGa6c/iDKBnAblf5IFzv+PxPLCpUw9wffiWgSHGSmHjLSS3dM6XVLhJkv1wWAW vc455vI1VCYUtML3ZGztYAqcpup2m+vBn+Oi0lnKScdyQrfDup3KITR7DVEkuHSD4w j9jofP0xdXhVg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mark Brown , Jernej Skrabec , Daniel Lezcano , Sasha Levin , anarsoul@gmail.com, tiny.windzz@gmail.com, rafael@kernel.org, wens@csie.org, samuel@sholland.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev Subject: [PATCH AUTOSEL 6.1 3/3] thermal/drivers/sun8i: Free calibration nvmem after reading it Date: Fri, 8 Sep 2023 21:13:14 -0400 Message-Id: <20230909011314.3581953-3-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230909011314.3581953-1-sashal@kernel.org> References: <20230909011314.3581953-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.52 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mark Brown [ Upstream commit c51592a95f360aabf2b8a5691c550e1749dc41eb ] The sun8i thermal driver reads calibration data via the nvmem API at startup, updating the device configuration and not referencing the data again. Rather than explicitly freeing the nvmem data the driver relies on devm_ to release it, even though the data is never referenced again. The allocation is still tracked so it's not leaked but this is notable when looking at the code and is a little wasteful so let's instead explicitly free the nvmem after we're done with it. Signed-off-by: Mark Brown Acked-by: Jernej Skrabec Signed-off-by: Daniel Lezcano Link: https://lore.kernel.org/r/20230719-thermal-sun8i-free-nvmem-v1-1-f553d5afef79@kernel.org Signed-off-by: Sasha Levin --- drivers/thermal/sun8i_thermal.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/sun8i_thermal.c b/drivers/thermal/sun8i_thermal.c index 80614b6adfac5..5776ecc8d0c76 100644 --- a/drivers/thermal/sun8i_thermal.c +++ b/drivers/thermal/sun8i_thermal.c @@ -286,7 +286,7 @@ static int sun8i_ths_calibrate(struct ths_device *tmdev) size_t callen; int ret = 0; - calcell = devm_nvmem_cell_get(dev, "calibration"); + calcell = nvmem_cell_get(dev, "calibration"); if (IS_ERR(calcell)) { if (PTR_ERR(calcell) == -EPROBE_DEFER) return -EPROBE_DEFER; @@ -316,6 +316,8 @@ static int sun8i_ths_calibrate(struct ths_device *tmdev) kfree(caldata); out: + if (!IS_ERR(calcell)) + nvmem_cell_put(calcell); return ret; } -- 2.40.1