From nobody Wed Sep 10 08:24:45 2025 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) (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 AB2EB1D7995; Fri, 5 Sep 2025 13:24:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=124.126.103.232 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757078700; cv=none; b=uKsfY6wSQjYa07WpmgeXEvaXuKthXsoGFkyGV5U0P2FcFy9PnIOGC5EU0Riz149HrpIkLDugCyLzRnxeG2VO9k0EZZ8t2Be7d6xQKwo/5iZ4UJ4lSMZvwiqHBgtbE/l3s9TNhhav3U7O7jdc2lUP2MJmttDvvawzCAhpdeF3G8A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757078700; c=relaxed/simple; bh=zI8LSVUIEAXBAXevXKLvocIGcksp4e+H6QqZHmOJ4mw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=epmJ+TMSvftpH0q8MsmB8TzvHvWoaSuvoN7wtTdW+DoGs4x4KSAF2pVCpHSETh7VpFghcWh8pMOKUsY95EMyWe6Y+xvhNhAHSPwFCY7kJ/OaeaqPY5dsupyVgM/eS52nQpLGZcycon0y0M6SxYT9hbfFWxLZrl7u2KzjB5+cNHQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn; spf=pass smtp.mailfrom=kylinos.cn; arc=none smtp.client-ip=124.126.103.232 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kylinos.cn X-UUID: b44a3dfa8a5b11f0b29709d653e92f7d-20250905 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.45,REQID:b8a8a8e9-2660-4e89-a43a-f9d5a297e17a,IP:0,U RL:0,TC:0,Content:-5,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:-5 X-CID-META: VersionHash:6493067,CLOUDID:d547413c6b29f7a2761f5c65158ef560,BulkI D:nil,BulkQuantity:0,Recheck:0,SF:81|82|102|850,TC:nil,Content:0|50,EDM:-3 ,IP:nil,URL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV :0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: b44a3dfa8a5b11f0b29709d653e92f7d-20250905 Received: from mail.kylinos.cn [(10.44.16.175)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA) with ESMTP id 342664798; Fri, 05 Sep 2025 21:24:51 +0800 Received: from mail.kylinos.cn (localhost [127.0.0.1]) by mail.kylinos.cn (NSMail) with SMTP id 716AAE008FA3; Fri, 5 Sep 2025 21:24:51 +0800 (CST) X-ns-mid: postfix-68BAE4A1-8445755 Received: from localhost.localdomain (unknown [172.25.120.24]) by mail.kylinos.cn (NSMail) with ESMTPA id 1F509E008FA4; Fri, 5 Sep 2025 21:24:41 +0800 (CST) From: Zihuan Zhang To: "Rafael J . wysocki" , Viresh Kumar , Jonathan Cameron , Catalin Marinas , Will Deacon , Borislav Petkov , Dave Hansen , Srinivas Pandruvada , Michael Ellerman , Krzysztof Kozlowski , Alim Akhtar , Thierry Reding , MyungJoo Ham , Kyungmin Park , Chanwoo Choi , Jani Nikula , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Simona Vetter , Daniel Lezcano , Sascha Hauer , Shawn Guo , Eduardo Valentin , Keerthy Cc: Ben Horgan , zhenglifeng , Zhang Rui , Len Brown , Lukasz Luba , Pengutronix Kernel Team , Beata Michalska , Fabio Estevam , Pavel Machek , Sumit Gupta , Prasanna Kumar T S M , Sudeep Holla , Yicong Yang , linux-pm@vger.kernel.org, linux-acpi@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, imx@lists.linux.dev, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, Zihuan Zhang Subject: [PATCH v5 4/6] PM / devfreq: Use scope-based cleanup helper Date: Fri, 5 Sep 2025 21:24:11 +0800 Message-Id: <20250905132413.1376220-5-zhangzihuan@kylinos.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250905132413.1376220-1-zhangzihuan@kylinos.cn> References: <20250905132413.1376220-1-zhangzihuan@kylinos.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace the manual cpufreq_cpu_put() with __free(put_cpufreq_policy) annotation for policy references. This reduces the risk of reference counting mistakes and aligns the code with the latest kernel style. No functional change intended. Signed-off-by: Zihuan Zhang --- drivers/devfreq/governor_passive.c | 60 +++++++++++------------------- 1 file changed, 22 insertions(+), 38 deletions(-) diff --git a/drivers/devfreq/governor_passive.c b/drivers/devfreq/governor_= passive.c index 953cf9a1e9f7..5afaea39377e 100644 --- a/drivers/devfreq/governor_passive.c +++ b/drivers/devfreq/governor_passive.c @@ -80,24 +80,23 @@ static int get_target_freq_with_cpufreq(struct devfreq = *devfreq, struct devfreq_passive_data *p_data =3D (struct devfreq_passive_data *)devfreq->data; struct devfreq_cpu_data *parent_cpu_data; - struct cpufreq_policy *policy; unsigned long cpu, cpu_cur, cpu_min, cpu_max, cpu_percent; unsigned long dev_min, dev_max; unsigned long freq =3D 0; int ret =3D 0; =20 for_each_online_cpu(cpu) { - policy =3D cpufreq_cpu_get(cpu); + struct cpufreq_policy *policy __free(put_cpufreq_policy) =3D + cpufreq_cpu_get(cpu); + if (!policy) { ret =3D -EINVAL; continue; } =20 parent_cpu_data =3D get_parent_cpu_data(p_data, policy); - if (!parent_cpu_data) { - cpufreq_cpu_put(policy); + if (!parent_cpu_data) continue; - } =20 /* Get target freq via required opps */ cpu_cur =3D parent_cpu_data->cur_freq * HZ_PER_KHZ; @@ -106,7 +105,6 @@ static int get_target_freq_with_cpufreq(struct devfreq = *devfreq, devfreq->opp_table, &cpu_cur); if (freq) { *target_freq =3D max(freq, *target_freq); - cpufreq_cpu_put(policy); continue; } =20 @@ -121,7 +119,6 @@ static int get_target_freq_with_cpufreq(struct devfreq = *devfreq, freq =3D dev_min + mult_frac(dev_max - dev_min, cpu_percent, 100); =20 *target_freq =3D max(freq, *target_freq); - cpufreq_cpu_put(policy); } =20 return ret; @@ -255,8 +252,6 @@ static int cpufreq_passive_register_notifier(struct dev= freq *devfreq) =3D (struct devfreq_passive_data *)devfreq->data; struct device *dev =3D devfreq->dev.parent; struct opp_table *opp_table =3D NULL; - struct devfreq_cpu_data *parent_cpu_data; - struct cpufreq_policy *policy; struct device *cpu_dev; unsigned int cpu; int ret; @@ -273,37 +268,34 @@ static int cpufreq_passive_register_notifier(struct d= evfreq *devfreq) } =20 for_each_possible_cpu(cpu) { - policy =3D cpufreq_cpu_get(cpu); - if (!policy) { - ret =3D -EPROBE_DEFER; - goto err; - } + struct cpufreq_policy *policy __free(put_cpufreq_policy) =3D + cpufreq_cpu_get(cpu); =20 - parent_cpu_data =3D get_parent_cpu_data(p_data, policy); - if (parent_cpu_data) { - cpufreq_cpu_put(policy); + if (!policy) + return -EPROBE_DEFER; + + struct devfreq_cpu_data *initial_parent_cpu_data =3D + get_parent_cpu_data(p_data, policy); + + if (initial_parent_cpu_data) continue; - } =20 - parent_cpu_data =3D kzalloc(sizeof(*parent_cpu_data), - GFP_KERNEL); - if (!parent_cpu_data) { - ret =3D -ENOMEM; - goto err_put_policy; - } + struct devfreq_cpu_data *parent_cpu_data __free(kfree) =3D + kzalloc(sizeof(*parent_cpu_data), GFP_KERNEL); + + if (!parent_cpu_data) + return -ENOMEM; =20 cpu_dev =3D get_cpu_device(cpu); if (!cpu_dev) { dev_err(dev, "failed to get cpu device\n"); - ret =3D -ENODEV; - goto err_free_cpu_data; + return -ENODEV; } =20 opp_table =3D dev_pm_opp_get_opp_table(cpu_dev); if (IS_ERR(opp_table)) { dev_err(dev, "failed to get opp_table of cpu%d\n", cpu); - ret =3D PTR_ERR(opp_table); - goto err_free_cpu_data; + return PTR_ERR(opp_table); } =20 parent_cpu_data->dev =3D cpu_dev; @@ -313,8 +305,8 @@ static int cpufreq_passive_register_notifier(struct dev= freq *devfreq) parent_cpu_data->min_freq =3D policy->cpuinfo.min_freq; parent_cpu_data->max_freq =3D policy->cpuinfo.max_freq; =20 - list_add_tail(&parent_cpu_data->node, &p_data->cpu_data_list); - cpufreq_cpu_put(policy); + list_add_tail(&(no_free_ptr(parent_cpu_data)->node, + &p_data->cpu_data_list); } =20 mutex_lock(&devfreq->lock); @@ -324,14 +316,6 @@ static int cpufreq_passive_register_notifier(struct de= vfreq *devfreq) dev_err(dev, "failed to update the frequency\n"); =20 return ret; - -err_free_cpu_data: - kfree(parent_cpu_data); -err_put_policy: - cpufreq_cpu_put(policy); -err: - - return ret; } =20 static int devfreq_passive_notifier_call(struct notifier_block *nb, --=20 2.25.1