Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
PM / devfreq: rockchip-dfi: use consistent name for private data struct
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'.
Link: https://lore.kernel.org/lkml/20230704093242.583575-4-s.hauer@pengutronix.de/
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
authored by
Sascha Hauer
and committed by
Chanwoo Choi
9325b3ec
bbf47900
+36
-36
+36
-36
drivers/devfreq/event/rockchip-dfi.c
+36
-36
drivers/devfreq/event/rockchip-dfi.c
···
59
59
60
60
static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev)
61
61
{
62
-
struct rockchip_dfi *info = devfreq_event_get_drvdata(edev);
63
-
void __iomem *dfi_regs = info->regs;
62
+
struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev);
63
+
void __iomem *dfi_regs = dfi->regs;
64
64
u32 val;
65
65
u32 ddr_type;
66
66
67
67
/* get ddr type */
68
-
regmap_read(info->regmap_pmu, RK3399_PMUGRF_OS_REG2, &val);
68
+
regmap_read(dfi->regmap_pmu, RK3399_PMUGRF_OS_REG2, &val);
69
69
ddr_type = (val >> RK3399_PMUGRF_DDRTYPE_SHIFT) &
70
70
RK3399_PMUGRF_DDRTYPE_MASK;
71
71
···
84
84
85
85
static void rockchip_dfi_stop_hardware_counter(struct devfreq_event_dev *edev)
86
86
{
87
-
struct rockchip_dfi *info = devfreq_event_get_drvdata(edev);
88
-
void __iomem *dfi_regs = info->regs;
87
+
struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev);
88
+
void __iomem *dfi_regs = dfi->regs;
89
89
90
90
writel_relaxed(SOFTWARE_DIS, dfi_regs + DDRMON_CTRL);
91
91
}
92
92
93
93
static int rockchip_dfi_get_busier_ch(struct devfreq_event_dev *edev)
94
94
{
95
-
struct rockchip_dfi *info = devfreq_event_get_drvdata(edev);
95
+
struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev);
96
96
u32 tmp, max = 0;
97
97
u32 i, busier_ch = 0;
98
-
void __iomem *dfi_regs = info->regs;
98
+
void __iomem *dfi_regs = dfi->regs;
99
99
100
100
rockchip_dfi_stop_hardware_counter(edev);
101
101
102
102
/* Find out which channel is busier */
103
103
for (i = 0; i < RK3399_DMC_NUM_CH; i++) {
104
-
info->ch_usage[i].access = readl_relaxed(dfi_regs +
104
+
dfi->ch_usage[i].access = readl_relaxed(dfi_regs +
105
105
DDRMON_CH0_DFI_ACCESS_NUM + i * 20) * 4;
106
-
info->ch_usage[i].total = readl_relaxed(dfi_regs +
106
+
dfi->ch_usage[i].total = readl_relaxed(dfi_regs +
107
107
DDRMON_CH0_COUNT_NUM + i * 20);
108
-
tmp = info->ch_usage[i].access;
108
+
tmp = dfi->ch_usage[i].access;
109
109
if (tmp > max) {
110
110
busier_ch = i;
111
111
max = tmp;
···
118
118
119
119
static int rockchip_dfi_disable(struct devfreq_event_dev *edev)
120
120
{
121
-
struct rockchip_dfi *info = devfreq_event_get_drvdata(edev);
121
+
struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev);
122
122
123
123
rockchip_dfi_stop_hardware_counter(edev);
124
-
clk_disable_unprepare(info->clk);
124
+
clk_disable_unprepare(dfi->clk);
125
125
126
126
return 0;
127
127
}
128
128
129
129
static int rockchip_dfi_enable(struct devfreq_event_dev *edev)
130
130
{
131
-
struct rockchip_dfi *info = devfreq_event_get_drvdata(edev);
131
+
struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev);
132
132
int ret;
133
133
134
-
ret = clk_prepare_enable(info->clk);
134
+
ret = clk_prepare_enable(dfi->clk);
135
135
if (ret) {
136
136
dev_err(&edev->dev, "failed to enable dfi clk: %d\n", ret);
137
137
return ret;
···
149
149
static int rockchip_dfi_get_event(struct devfreq_event_dev *edev,
150
150
struct devfreq_event_data *edata)
151
151
{
152
-
struct rockchip_dfi *info = devfreq_event_get_drvdata(edev);
152
+
struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev);
153
153
int busier_ch;
154
154
155
155
busier_ch = rockchip_dfi_get_busier_ch(edev);
156
156
157
-
edata->load_count = info->ch_usage[busier_ch].access;
158
-
edata->total_count = info->ch_usage[busier_ch].total;
157
+
edata->load_count = dfi->ch_usage[busier_ch].access;
158
+
edata->total_count = dfi->ch_usage[busier_ch].total;
159
159
160
160
return 0;
161
161
}
···
176
176
static int rockchip_dfi_probe(struct platform_device *pdev)
177
177
{
178
178
struct device *dev = &pdev->dev;
179
-
struct rockchip_dfi *data;
179
+
struct rockchip_dfi *dfi;
180
180
struct devfreq_event_desc *desc;
181
181
struct device_node *np = pdev->dev.of_node, *node;
182
182
183
-
data = devm_kzalloc(dev, sizeof(struct rockchip_dfi), GFP_KERNEL);
184
-
if (!data)
183
+
dfi = devm_kzalloc(dev, sizeof(*dfi), GFP_KERNEL);
184
+
if (!dfi)
185
185
return -ENOMEM;
186
186
187
-
data->regs = devm_platform_ioremap_resource(pdev, 0);
188
-
if (IS_ERR(data->regs))
189
-
return PTR_ERR(data->regs);
187
+
dfi->regs = devm_platform_ioremap_resource(pdev, 0);
188
+
if (IS_ERR(dfi->regs))
189
+
return PTR_ERR(dfi->regs);
190
190
191
-
data->clk = devm_clk_get(dev, "pclk_ddr_mon");
192
-
if (IS_ERR(data->clk))
193
-
return dev_err_probe(dev, PTR_ERR(data->clk),
191
+
dfi->clk = devm_clk_get(dev, "pclk_ddr_mon");
192
+
if (IS_ERR(dfi->clk))
193
+
return dev_err_probe(dev, PTR_ERR(dfi->clk),
194
194
"Cannot get the clk pclk_ddr_mon\n");
195
195
196
196
node = of_parse_phandle(np, "rockchip,pmu", 0);
197
197
if (!node)
198
198
return dev_err_probe(&pdev->dev, -ENODEV, "Can't find pmu_grf registers\n");
199
199
200
-
data->regmap_pmu = syscon_node_to_regmap(node);
200
+
dfi->regmap_pmu = syscon_node_to_regmap(node);
201
201
of_node_put(node);
202
-
if (IS_ERR(data->regmap_pmu))
203
-
return PTR_ERR(data->regmap_pmu);
202
+
if (IS_ERR(dfi->regmap_pmu))
203
+
return PTR_ERR(dfi->regmap_pmu);
204
204
205
-
data->dev = dev;
205
+
dfi->dev = dev;
206
206
207
-
desc = &data->desc;
207
+
desc = &dfi->desc;
208
208
desc->ops = &rockchip_dfi_ops;
209
-
desc->driver_data = data;
209
+
desc->driver_data = dfi;
210
210
desc->name = np->name;
211
211
212
-
data->edev = devm_devfreq_event_add_edev(&pdev->dev, desc);
213
-
if (IS_ERR(data->edev)) {
212
+
dfi->edev = devm_devfreq_event_add_edev(&pdev->dev, desc);
213
+
if (IS_ERR(dfi->edev)) {
214
214
dev_err(&pdev->dev,
215
215
"failed to add devfreq-event device\n");
216
-
return PTR_ERR(data->edev);
216
+
return PTR_ERR(dfi->edev);
217
217
}
218
218
219
-
platform_set_drvdata(pdev, data);
219
+
platform_set_drvdata(pdev, dfi);
220
220
221
221
return 0;
222
222
}