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