projects / openwrt / staging / ldir.git / blob
? search:


a6e080d5c235772f557ab102974cce431e259e0d
[openwrt/staging/ldir.git] /
1 From 92ee95e52191107f8c8adea810232920358ae0e0 Mon Sep 17 00:00:00 2001
2 From: Razvan Stefanescu <razvan.stefanescu@nxp.com>
3 Date: Thu, 12 Apr 2018 15:19:10 +0300
4 Subject: [PATCH] staging: dpaa2-evb: change mc_command in fsl_mc_command
5
6 Adapt to the upstream changes.
7
8 Signed-off-by: Razvan Stefanescu <razvan.stefanescu@nxp.com>
9 ---
10 drivers/staging/fsl-dpaa2/evb/dpdmux.c | 60 +++++++++++++++++-----------------
11 1 file changed, 30 insertions(+), 30 deletions(-)
12
13 --- a/drivers/staging/fsl-dpaa2/evb/dpdmux.c
14 +++ b/drivers/staging/fsl-dpaa2/evb/dpdmux.c
15 @@ -55,7 +55,7 @@ int dpdmux_open(struct fsl_mc_io *mc_io,
16 int dpdmux_id,
17 u16 *token)
18 {
19 - struct mc_command cmd = { 0 };
20 + struct fsl_mc_command cmd = { 0 };
21 struct dpdmux_cmd_open *cmd_params;
22 int err;
23
24 @@ -92,7 +92,7 @@ int dpdmux_close(struct fsl_mc_io *mc_io
25 u32 cmd_flags,
26 u16 token)
27 {
28 - struct mc_command cmd = { 0 };
29 + struct fsl_mc_command cmd = { 0 };
30
31 /* prepare command */
32 cmd.header = mc_encode_cmd_header(DPDMUX_CMDID_CLOSE,
33 @@ -131,7 +131,7 @@ int dpdmux_create(struct fsl_mc_io *mc_i
34 const struct dpdmux_cfg *cfg,
35 u32 *obj_id)
36 {
37 - struct mc_command cmd = { 0 };
38 + struct fsl_mc_command cmd = { 0 };
39 struct dpdmux_cmd_create *cmd_params;
40 int err;
41
42 @@ -180,7 +180,7 @@ int dpdmux_destroy(struct fsl_mc_io *mc_
43 u32 cmd_flags,
44 u32 object_id)
45 {
46 - struct mc_command cmd = { 0 };
47 + struct fsl_mc_command cmd = { 0 };
48 struct dpdmux_cmd_destroy *cmd_params;
49
50 /* prepare command */
51 @@ -206,7 +206,7 @@ int dpdmux_enable(struct fsl_mc_io *mc_i
52 u32 cmd_flags,
53 u16 token)
54 {
55 - struct mc_command cmd = { 0 };
56 + struct fsl_mc_command cmd = { 0 };
57
58 /* prepare command */
59 cmd.header = mc_encode_cmd_header(DPDMUX_CMDID_ENABLE,
60 @@ -229,7 +229,7 @@ int dpdmux_disable(struct fsl_mc_io *mc_
61 u32 cmd_flags,
62 u16 token)
63 {
64 - struct mc_command cmd = { 0 };
65 + struct fsl_mc_command cmd = { 0 };
66
67 /* prepare command */
68 cmd.header = mc_encode_cmd_header(DPDMUX_CMDID_DISABLE,
69 @@ -254,7 +254,7 @@ int dpdmux_is_enabled(struct fsl_mc_io *
70 u16 token,
71 int *en)
72 {
73 - struct mc_command cmd = { 0 };
74 + struct fsl_mc_command cmd = { 0 };
75 struct dpdmux_rsp_is_enabled *rsp_params;
76 int err;
77
78 @@ -287,7 +287,7 @@ int dpdmux_reset(struct fsl_mc_io *mc_io
79 u32 cmd_flags,
80 u16 token)
81 {
82 - struct mc_command cmd = { 0 };
83 + struct fsl_mc_command cmd = { 0 };
84
85 /* prepare command */
86 cmd.header = mc_encode_cmd_header(DPDMUX_CMDID_RESET,
87 @@ -319,7 +319,7 @@ int dpdmux_set_irq_enable(struct fsl_mc_
88 u8 irq_index,
89 u8 en)
90 {
91 - struct mc_command cmd = { 0 };
92 + struct fsl_mc_command cmd = { 0 };
93 struct dpdmux_cmd_set_irq_enable *cmd_params;
94
95 /* prepare command */
96 @@ -350,7 +350,7 @@ int dpdmux_get_irq_enable(struct fsl_mc_
97 u8 irq_index,
98 u8 *en)
99 {
100 - struct mc_command cmd = { 0 };
101 + struct fsl_mc_command cmd = { 0 };
102 struct dpdmux_cmd_get_irq_enable *cmd_params;
103 struct dpdmux_rsp_get_irq_enable *rsp_params;
104 int err;
105 @@ -396,7 +396,7 @@ int dpdmux_set_irq_mask(struct fsl_mc_io
106 u8 irq_index,
107 u32 mask)
108 {
109 - struct mc_command cmd = { 0 };
110 + struct fsl_mc_command cmd = { 0 };
111 struct dpdmux_cmd_set_irq_mask *cmd_params;
112
113 /* prepare command */
114 @@ -430,7 +430,7 @@ int dpdmux_get_irq_mask(struct fsl_mc_io
115 u8 irq_index,
116 u32 *mask)
117 {
118 - struct mc_command cmd = { 0 };
119 + struct fsl_mc_command cmd = { 0 };
120 struct dpdmux_cmd_get_irq_mask *cmd_params;
121 struct dpdmux_rsp_get_irq_mask *rsp_params;
122 int err;
123 @@ -472,7 +472,7 @@ int dpdmux_get_irq_status(struct fsl_mc_
124 u8 irq_index,
125 u32 *status)
126 {
127 - struct mc_command cmd = { 0 };
128 + struct fsl_mc_command cmd = { 0 };
129 struct dpdmux_cmd_get_irq_status *cmd_params;
130 struct dpdmux_rsp_get_irq_status *rsp_params;
131 int err;
132 @@ -515,7 +515,7 @@ int dpdmux_clear_irq_status(struct fsl_m
133 u8 irq_index,
134 u32 status)
135 {
136 - struct mc_command cmd = { 0 };
137 + struct fsl_mc_command cmd = { 0 };
138 struct dpdmux_cmd_clear_irq_status *cmd_params;
139
140 /* prepare command */
141 @@ -544,7 +544,7 @@ int dpdmux_get_attributes(struct fsl_mc_
142 u16 token,
143 struct dpdmux_attr *attr)
144 {
145 - struct mc_command cmd = { 0 };
146 + struct fsl_mc_command cmd = { 0 };
147 struct dpdmux_rsp_get_attr *rsp_params;
148 int err;
149
150 @@ -585,7 +585,7 @@ int dpdmux_if_enable(struct fsl_mc_io *m
151 u16 if_id)
152 {
153 struct dpdmux_cmd_if *cmd_params;
154 - struct mc_command cmd = { 0 };
155 + struct fsl_mc_command cmd = { 0 };
156
157 /* prepare command */
158 cmd.header = mc_encode_cmd_header(DPDMUX_CMDID_IF_ENABLE,
159 @@ -613,7 +613,7 @@ int dpdmux_if_disable(struct fsl_mc_io *
160 u16 if_id)
161 {
162 struct dpdmux_cmd_if *cmd_params;
163 - struct mc_command cmd = { 0 };
164 + struct fsl_mc_command cmd = { 0 };
165
166 /* prepare command */
167 cmd.header = mc_encode_cmd_header(DPDMUX_CMDID_IF_DISABLE,
168 @@ -645,7 +645,7 @@ int dpdmux_set_max_frame_length(struct f
169 u16 token,
170 u16 max_frame_length)
171 {
172 - struct mc_command cmd = { 0 };
173 + struct fsl_mc_command cmd = { 0 };
174 struct dpdmux_cmd_set_max_frame_length *cmd_params;
175
176 /* prepare command */
177 @@ -671,7 +671,7 @@ int dpdmux_ul_reset_counters(struct fsl_
178 u32 cmd_flags,
179 u16 token)
180 {
181 - struct mc_command cmd = { 0 };
182 + struct fsl_mc_command cmd = { 0 };
183
184 /* prepare command */
185 cmd.header = mc_encode_cmd_header(DPDMUX_CMDID_UL_RESET_COUNTERS,
186 @@ -705,7 +705,7 @@ int dpdmux_if_set_accepted_frames(struct
187 u16 if_id,
188 const struct dpdmux_accepted_frames *cfg)
189 {
190 - struct mc_command cmd = { 0 };
191 + struct fsl_mc_command cmd = { 0 };
192 struct dpdmux_cmd_if_set_accepted_frames *cmd_params;
193
194 /* prepare command */
195 @@ -739,7 +739,7 @@ int dpdmux_if_get_attributes(struct fsl_
196 u16 if_id,
197 struct dpdmux_if_attr *attr)
198 {
199 - struct mc_command cmd = { 0 };
200 + struct fsl_mc_command cmd = { 0 };
201 struct dpdmux_cmd_if *cmd_params;
202 struct dpdmux_rsp_if_get_attr *rsp_params;
203 int err;
204 @@ -786,7 +786,7 @@ int dpdmux_if_remove_l2_rule(struct fsl_
205 u16 if_id,
206 const struct dpdmux_l2_rule *rule)
207 {
208 - struct mc_command cmd = { 0 };
209 + struct fsl_mc_command cmd = { 0 };
210 struct dpdmux_cmd_if_l2_rule *cmd_params;
211
212 /* prepare command */
213 @@ -826,7 +826,7 @@ int dpdmux_if_add_l2_rule(struct fsl_mc_
214 u16 if_id,
215 const struct dpdmux_l2_rule *rule)
216 {
217 - struct mc_command cmd = { 0 };
218 + struct fsl_mc_command cmd = { 0 };
219 struct dpdmux_cmd_if_l2_rule *cmd_params;
220
221 /* prepare command */
222 @@ -865,7 +865,7 @@ int dpdmux_if_get_counter(struct fsl_mc_
223 enum dpdmux_counter_type counter_type,
224 u64 *counter)
225 {
226 - struct mc_command cmd = { 0 };
227 + struct fsl_mc_command cmd = { 0 };
228 struct dpdmux_cmd_if_get_counter *cmd_params;
229 struct dpdmux_rsp_if_get_counter *rsp_params;
230 int err;
231 @@ -906,7 +906,7 @@ int dpdmux_if_set_link_cfg(struct fsl_mc
232 u16 if_id,
233 struct dpdmux_link_cfg *cfg)
234 {
235 - struct mc_command cmd = { 0 };
236 + struct fsl_mc_command cmd = { 0 };
237 struct dpdmux_cmd_if_set_link_cfg *cmd_params;
238
239 /* prepare command */
240 @@ -938,7 +938,7 @@ int dpdmux_if_get_link_state(struct fsl_
241 u16 if_id,
242 struct dpdmux_link_state *state)
243 {
244 - struct mc_command cmd = { 0 };
245 + struct fsl_mc_command cmd = { 0 };
246 struct dpdmux_cmd_if_get_link_state *cmd_params;
247 struct dpdmux_rsp_if_get_link_state *rsp_params;
248 int err;
249 @@ -989,7 +989,7 @@ int dpdmux_set_custom_key(struct fsl_mc_
250 u64 key_cfg_iova)
251 {
252 struct dpdmux_set_custom_key *cmd_params;
253 - struct mc_command cmd = { 0 };
254 + struct fsl_mc_command cmd = { 0 };
255
256 /* prepare command */
257 cmd.header = mc_encode_cmd_header(DPDMUX_CMDID_SET_CUSTOM_KEY,
258 @@ -1025,7 +1025,7 @@ int dpdmux_add_custom_cls_entry(struct f
259 struct dpdmux_cls_action *action)
260 {
261 struct dpdmux_cmd_add_custom_cls_entry *cmd_params;
262 - struct mc_command cmd = { 0 };
263 + struct fsl_mc_command cmd = { 0 };
264
265 /* prepare command */
266 cmd.header = mc_encode_cmd_header(DPDMUX_CMDID_ADD_CUSTOM_CLS_ENTRY,
267 @@ -1062,7 +1062,7 @@ int dpdmux_remove_custom_cls_entry(struc
268 struct dpdmux_rule_cfg *rule)
269 {
270 struct dpdmux_cmd_remove_custom_cls_entry *cmd_params;
271 - struct mc_command cmd = { 0 };
272 + struct fsl_mc_command cmd = { 0 };
273
274 /* prepare command */
275 cmd.header = mc_encode_cmd_header(DPDMUX_CMDID_REMOVE_CUSTOM_CLS_ENTRY,
276 @@ -1091,7 +1091,7 @@ int dpdmux_get_api_version(struct fsl_mc
277 u16 *major_ver,
278 u16 *minor_ver)
279 {
280 - struct mc_command cmd = { 0 };
281 + struct fsl_mc_command cmd = { 0 };
282 struct dpdmux_rsp_get_api_version *rsp_params;
283 int err;
284
Kevin D-Bs staging tree