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 8D509EEB57F for ; Sat, 9 Sep 2023 01:15:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343705AbjIIBPH (ORCPT ); Fri, 8 Sep 2023 21:15:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238048AbjIIBPF (ORCPT ); Fri, 8 Sep 2023 21:15:05 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B99B11FDB; Fri, 8 Sep 2023 18:14:34 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A2E02C116A9; Sat, 9 Sep 2023 01:13:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694222008; bh=fqhdzrto9/FhQBa1hvJ7yJQ8qfxkPxO6H3qH5NP3oi4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=feYv12X35bcsAxexSLjCLnX3ZeYd6/OquioW7nUzq5T7/K/fATNsPLCg9IRU52LjI NM0ogL4cA4Wf+6xBxsjmvyvB4+x1H63S1biOS8BCCf4epFxIpAIMXLZ7vtPH1VVwrV wc8vN8YvAcDp5wS4fI2tcHzN1ok3HbciXfKEmuv45eaMs8DRUeVDacnXYA8LL4ZTsT PFzGEi0NPOkIfQEM8VOJye0uY8xwEHqAyzbY9SpxQ3aEVfeAGgh1xB6B4go4o1YHqI BLmc4S+UNwP5h/Pf8E6VzH39C+L0LByQQVRRfAbc2FlmfpZUAn1wgm84GKiduXEUC1 opmZBbOdv0PZg== 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 5.15 2/2] thermal/drivers/sun8i: Free calibration nvmem after reading it Date: Fri, 8 Sep 2023 21:13:22 -0400 Message-Id: <20230909011322.3582088-2-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230909011322.3582088-1-sashal@kernel.org> References: <20230909011322.3582088-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.131 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 cd464db064142..c1650b20e4975 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