Skip to content

Commit b82932f

Browse files
saschahauerchanwoochoi
authored andcommitted
PM / devfreq: rockchip-dfi: Pass private data struct to internal functions
The internal functions do not need the struct devfreq_event_dev *, so pass them the struct rockchip_dfi *. This is a preparation for adding perf support later which doesn't have a struct devfreq_event_dev *. Link: https://lore.kernel.org/all/[email protected]/ Reviewed-by: Jonathan Cameron <[email protected]> Reviewed-by: Sebastian Reichel <[email protected]> Acked-by: Chanwoo Choi <[email protected]> Signed-off-by: Sascha Hauer <[email protected]> Signed-off-by: Chanwoo Choi <[email protected]>
1 parent d8c6e33 commit b82932f

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

drivers/devfreq/event/rockchip-dfi.c

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,8 @@ struct rockchip_dfi {
7373
unsigned int max_channels;
7474
};
7575

76-
static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev)
76+
static void rockchip_dfi_start_hardware_counter(struct rockchip_dfi *dfi)
7777
{
78-
struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev);
7978
void __iomem *dfi_regs = dfi->regs;
8079

8180
/* clear DDRMON_CTRL setting */
@@ -103,18 +102,16 @@ static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev)
103102
dfi_regs + DDRMON_CTRL);
104103
}
105104

106-
static void rockchip_dfi_stop_hardware_counter(struct devfreq_event_dev *edev)
105+
static void rockchip_dfi_stop_hardware_counter(struct rockchip_dfi *dfi)
107106
{
108-
struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev);
109107
void __iomem *dfi_regs = dfi->regs;
110108

111109
writel_relaxed(HIWORD_UPDATE(0, DDRMON_CTRL_SOFTWARE_EN),
112110
dfi_regs + DDRMON_CTRL);
113111
}
114112

115-
static void rockchip_dfi_read_counters(struct devfreq_event_dev *edev, struct dmc_count *count)
113+
static void rockchip_dfi_read_counters(struct rockchip_dfi *dfi, struct dmc_count *count)
116114
{
117-
struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev);
118115
u32 i;
119116
void __iomem *dfi_regs = dfi->regs;
120117

@@ -132,7 +129,7 @@ static int rockchip_dfi_disable(struct devfreq_event_dev *edev)
132129
{
133130
struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev);
134131

135-
rockchip_dfi_stop_hardware_counter(edev);
132+
rockchip_dfi_stop_hardware_counter(dfi);
136133
clk_disable_unprepare(dfi->clk);
137134

138135
return 0;
@@ -149,7 +146,7 @@ static int rockchip_dfi_enable(struct devfreq_event_dev *edev)
149146
return ret;
150147
}
151148

152-
rockchip_dfi_start_hardware_counter(edev);
149+
rockchip_dfi_start_hardware_counter(dfi);
153150
return 0;
154151
}
155152

@@ -167,7 +164,7 @@ static int rockchip_dfi_get_event(struct devfreq_event_dev *edev,
167164
u32 access = 0, total = 0;
168165
int i;
169166

170-
rockchip_dfi_read_counters(edev, &count);
167+
rockchip_dfi_read_counters(dfi, &count);
171168

172169
/* We can only report one channel, so find the busiest one */
173170
for (i = 0; i < dfi->max_channels; i++) {

0 commit comments

Comments
 (0)