@@ -73,9 +73,8 @@ struct rockchip_dfi {
73
73
unsigned int max_channels ;
74
74
};
75
75
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 )
77
77
{
78
- struct rockchip_dfi * dfi = devfreq_event_get_drvdata (edev );
79
78
void __iomem * dfi_regs = dfi -> regs ;
80
79
81
80
/* clear DDRMON_CTRL setting */
@@ -103,18 +102,16 @@ static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev)
103
102
dfi_regs + DDRMON_CTRL );
104
103
}
105
104
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 )
107
106
{
108
- struct rockchip_dfi * dfi = devfreq_event_get_drvdata (edev );
109
107
void __iomem * dfi_regs = dfi -> regs ;
110
108
111
109
writel_relaxed (HIWORD_UPDATE (0 , DDRMON_CTRL_SOFTWARE_EN ),
112
110
dfi_regs + DDRMON_CTRL );
113
111
}
114
112
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 )
116
114
{
117
- struct rockchip_dfi * dfi = devfreq_event_get_drvdata (edev );
118
115
u32 i ;
119
116
void __iomem * dfi_regs = dfi -> regs ;
120
117
@@ -132,7 +129,7 @@ static int rockchip_dfi_disable(struct devfreq_event_dev *edev)
132
129
{
133
130
struct rockchip_dfi * dfi = devfreq_event_get_drvdata (edev );
134
131
135
- rockchip_dfi_stop_hardware_counter (edev );
132
+ rockchip_dfi_stop_hardware_counter (dfi );
136
133
clk_disable_unprepare (dfi -> clk );
137
134
138
135
return 0 ;
@@ -149,7 +146,7 @@ static int rockchip_dfi_enable(struct devfreq_event_dev *edev)
149
146
return ret ;
150
147
}
151
148
152
- rockchip_dfi_start_hardware_counter (edev );
149
+ rockchip_dfi_start_hardware_counter (dfi );
153
150
return 0 ;
154
151
}
155
152
@@ -167,7 +164,7 @@ static int rockchip_dfi_get_event(struct devfreq_event_dev *edev,
167
164
u32 access = 0 , total = 0 ;
168
165
int i ;
169
166
170
- rockchip_dfi_read_counters (edev , & count );
167
+ rockchip_dfi_read_counters (dfi , & count );
171
168
172
169
/* We can only report one channel, so find the busiest one */
173
170
for (i = 0 ; i < dfi -> max_channels ; i ++ ) {
0 commit comments