From nobody Fri Dec 19 20:13:29 2025 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 AD00CEB64DA for ; Fri, 16 Jun 2023 06:23:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239240AbjFPGXh (ORCPT ); Fri, 16 Jun 2023 02:23:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239734AbjFPGWQ (ORCPT ); Fri, 16 Jun 2023 02:22:16 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0F402D61 for ; Thu, 15 Jun 2023 23:22:14 -0700 (PDT) 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 1qA2q8-0006nZ-72; Fri, 16 Jun 2023 08:21:44 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qA2q5-007kxN-E7; Fri, 16 Jun 2023 08:21:41 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qA2q4-003FU5-DB; Fri, 16 Jun 2023 08:21:40 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer , Jonathan Cameron Subject: [PATCH v6 03/26] PM / devfreq: rockchip-dfi: use consistent name for private data struct Date: Fri, 16 Jun 2023 08:20:38 +0200 Message-Id: <20230616062101.601837-4-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230616062101.601837-1-s.hauer@pengutronix.de> References: <20230616062101.601837-1-s.hauer@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The variable name for the private data struct is 'info' in some functions and 'data' in others. Both names do not give a clue what type the variable has, so consistently use 'dfi'. Reviewed-by: Heiko Stuebner Reviewed-by: Jonathan Cameron Reviewed-by: Sebastian Reichel Link: https://lore.kernel.org/r/20230524083153.2046084-4-s.hauer@pengutroni= x.de Signed-off-by: Sascha Hauer --- drivers/devfreq/event/rockchip-dfi.c | 72 ++++++++++++++-------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/r= ockchip-dfi.c index 467f9f42d38f7..e19e5acaa362c 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -59,13 +59,13 @@ struct rockchip_dfi { =20 static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *= edev) { - struct rockchip_dfi *info =3D devfreq_event_get_drvdata(edev); - void __iomem *dfi_regs =3D info->regs; + struct rockchip_dfi *dfi =3D devfreq_event_get_drvdata(edev); + void __iomem *dfi_regs =3D dfi->regs; u32 val; u32 ddr_type; =20 /* get ddr type */ - regmap_read(info->regmap_pmu, RK3399_PMUGRF_OS_REG2, &val); + regmap_read(dfi->regmap_pmu, RK3399_PMUGRF_OS_REG2, &val); ddr_type =3D (val >> RK3399_PMUGRF_DDRTYPE_SHIFT) & RK3399_PMUGRF_DDRTYPE_MASK; =20 @@ -84,28 +84,28 @@ static void rockchip_dfi_start_hardware_counter(struct = devfreq_event_dev *edev) =20 static void rockchip_dfi_stop_hardware_counter(struct devfreq_event_dev *e= dev) { - struct rockchip_dfi *info =3D devfreq_event_get_drvdata(edev); - void __iomem *dfi_regs =3D info->regs; + struct rockchip_dfi *dfi =3D devfreq_event_get_drvdata(edev); + void __iomem *dfi_regs =3D dfi->regs; =20 writel_relaxed(SOFTWARE_DIS, dfi_regs + DDRMON_CTRL); } =20 static int rockchip_dfi_get_busier_ch(struct devfreq_event_dev *edev) { - struct rockchip_dfi *info =3D devfreq_event_get_drvdata(edev); + struct rockchip_dfi *dfi =3D devfreq_event_get_drvdata(edev); u32 tmp, max =3D 0; u32 i, busier_ch =3D 0; - void __iomem *dfi_regs =3D info->regs; + void __iomem *dfi_regs =3D dfi->regs; =20 rockchip_dfi_stop_hardware_counter(edev); =20 /* Find out which channel is busier */ for (i =3D 0; i < RK3399_DMC_NUM_CH; i++) { - info->ch_usage[i].access =3D readl_relaxed(dfi_regs + + dfi->ch_usage[i].access =3D readl_relaxed(dfi_regs + DDRMON_CH0_DFI_ACCESS_NUM + i * 20) * 4; - info->ch_usage[i].total =3D readl_relaxed(dfi_regs + + dfi->ch_usage[i].total =3D readl_relaxed(dfi_regs + DDRMON_CH0_COUNT_NUM + i * 20); - tmp =3D info->ch_usage[i].access; + tmp =3D dfi->ch_usage[i].access; if (tmp > max) { busier_ch =3D i; max =3D tmp; @@ -118,20 +118,20 @@ static int rockchip_dfi_get_busier_ch(struct devfreq_= event_dev *edev) =20 static int rockchip_dfi_disable(struct devfreq_event_dev *edev) { - struct rockchip_dfi *info =3D devfreq_event_get_drvdata(edev); + struct rockchip_dfi *dfi =3D devfreq_event_get_drvdata(edev); =20 rockchip_dfi_stop_hardware_counter(edev); - clk_disable_unprepare(info->clk); + clk_disable_unprepare(dfi->clk); =20 return 0; } =20 static int rockchip_dfi_enable(struct devfreq_event_dev *edev) { - struct rockchip_dfi *info =3D devfreq_event_get_drvdata(edev); + struct rockchip_dfi *dfi =3D devfreq_event_get_drvdata(edev); int ret; =20 - ret =3D clk_prepare_enable(info->clk); + ret =3D clk_prepare_enable(dfi->clk); if (ret) { dev_err(&edev->dev, "failed to enable dfi clk: %d\n", ret); return ret; @@ -149,13 +149,13 @@ static int rockchip_dfi_set_event(struct devfreq_even= t_dev *edev) static int rockchip_dfi_get_event(struct devfreq_event_dev *edev, struct devfreq_event_data *edata) { - struct rockchip_dfi *info =3D devfreq_event_get_drvdata(edev); + struct rockchip_dfi *dfi =3D devfreq_event_get_drvdata(edev); int busier_ch; =20 busier_ch =3D rockchip_dfi_get_busier_ch(edev); =20 - edata->load_count =3D info->ch_usage[busier_ch].access; - edata->total_count =3D info->ch_usage[busier_ch].total; + edata->load_count =3D dfi->ch_usage[busier_ch].access; + edata->total_count =3D dfi->ch_usage[busier_ch].total; =20 return 0; } @@ -176,47 +176,47 @@ MODULE_DEVICE_TABLE(of, rockchip_dfi_id_match); static int rockchip_dfi_probe(struct platform_device *pdev) { struct device *dev =3D &pdev->dev; - struct rockchip_dfi *data; + struct rockchip_dfi *dfi; struct devfreq_event_desc *desc; struct device_node *np =3D pdev->dev.of_node, *node; =20 - data =3D devm_kzalloc(dev, sizeof(struct rockchip_dfi), GFP_KERNEL); - if (!data) + dfi =3D devm_kzalloc(dev, sizeof(*dfi), GFP_KERNEL); + if (!dfi) return -ENOMEM; =20 - data->regs =3D devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(data->regs)) - return PTR_ERR(data->regs); + dfi->regs =3D devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(dfi->regs)) + return PTR_ERR(dfi->regs); =20 - data->clk =3D devm_clk_get(dev, "pclk_ddr_mon"); - if (IS_ERR(data->clk)) - return dev_err_probe(dev, PTR_ERR(data->clk), + dfi->clk =3D devm_clk_get(dev, "pclk_ddr_mon"); + if (IS_ERR(dfi->clk)) + return dev_err_probe(dev, PTR_ERR(dfi->clk), "Cannot get the clk pclk_ddr_mon\n"); =20 node =3D of_parse_phandle(np, "rockchip,pmu", 0); if (!node) return dev_err_probe(&pdev->dev, -ENODEV, "Can't find pmu_grf registers\= n"); =20 - data->regmap_pmu =3D syscon_node_to_regmap(node); + dfi->regmap_pmu =3D syscon_node_to_regmap(node); of_node_put(node); - if (IS_ERR(data->regmap_pmu)) - return PTR_ERR(data->regmap_pmu); + if (IS_ERR(dfi->regmap_pmu)) + return PTR_ERR(dfi->regmap_pmu); =20 - data->dev =3D dev; + dfi->dev =3D dev; =20 - desc =3D &data->desc; + desc =3D &dfi->desc; desc->ops =3D &rockchip_dfi_ops; - desc->driver_data =3D data; + desc->driver_data =3D dfi; desc->name =3D np->name; =20 - data->edev =3D devm_devfreq_event_add_edev(&pdev->dev, desc); - if (IS_ERR(data->edev)) { + dfi->edev =3D devm_devfreq_event_add_edev(&pdev->dev, desc); + if (IS_ERR(dfi->edev)) { dev_err(&pdev->dev, "failed to add devfreq-event device\n"); - return PTR_ERR(data->edev); + return PTR_ERR(dfi->edev); } =20 - platform_set_drvdata(pdev, data); + platform_set_drvdata(pdev, dfi); =20 return 0; } --=20 2.39.2