Skip to content

Commit 5b04ced

Browse files
IoanaCiorneigregkh
IoanaCiornei
authored and
gregkh
committed
bus: fsl-mc: change mc_command in fsl_mc_command
The "struct mc_command" is a very generic name for a global kernel structure. Change its name in "struct fsl_mc_command". Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 12a0148 commit 5b04ced

File tree

10 files changed

+126
-126
lines changed

10 files changed

+126
-126
lines changed

‎drivers/bus/fsl-mc/dpbp.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ int dpbp_open(struct fsl_mc_io *mc_io,
3131
int dpbp_id,
3232
u16 *token)
3333
{
34-
struct mc_command cmd = { 0 };
34+
struct fsl_mc_command cmd = { 0 };
3535
struct dpbp_cmd_open *cmd_params;
3636
int err;
3737

@@ -68,7 +68,7 @@ int dpbp_close(struct fsl_mc_io *mc_io,
6868
u32 cmd_flags,
6969
u16 token)
7070
{
71-
struct mc_command cmd = { 0 };
71+
struct fsl_mc_command cmd = { 0 };
7272

7373
/* prepare command */
7474
cmd.header = mc_encode_cmd_header(DPBP_CMDID_CLOSE, cmd_flags,
@@ -91,7 +91,7 @@ int dpbp_enable(struct fsl_mc_io *mc_io,
9191
u32 cmd_flags,
9292
u16 token)
9393
{
94-
struct mc_command cmd = { 0 };
94+
struct fsl_mc_command cmd = { 0 };
9595

9696
/* prepare command */
9797
cmd.header = mc_encode_cmd_header(DPBP_CMDID_ENABLE, cmd_flags,
@@ -114,7 +114,7 @@ int dpbp_disable(struct fsl_mc_io *mc_io,
114114
u32 cmd_flags,
115115
u16 token)
116116
{
117-
struct mc_command cmd = { 0 };
117+
struct fsl_mc_command cmd = { 0 };
118118

119119
/* prepare command */
120120
cmd.header = mc_encode_cmd_header(DPBP_CMDID_DISABLE,
@@ -137,7 +137,7 @@ int dpbp_reset(struct fsl_mc_io *mc_io,
137137
u32 cmd_flags,
138138
u16 token)
139139
{
140-
struct mc_command cmd = { 0 };
140+
struct fsl_mc_command cmd = { 0 };
141141

142142
/* prepare command */
143143
cmd.header = mc_encode_cmd_header(DPBP_CMDID_RESET,
@@ -163,7 +163,7 @@ int dpbp_get_attributes(struct fsl_mc_io *mc_io,
163163
u16 token,
164164
struct dpbp_attr *attr)
165165
{
166-
struct mc_command cmd = { 0 };
166+
struct fsl_mc_command cmd = { 0 };
167167
struct dpbp_rsp_get_attributes *rsp_params;
168168
int err;
169169

‎drivers/bus/fsl-mc/dpcon.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ int dpcon_open(struct fsl_mc_io *mc_io,
3131
int dpcon_id,
3232
u16 *token)
3333
{
34-
struct mc_command cmd = { 0 };
34+
struct fsl_mc_command cmd = { 0 };
3535
struct dpcon_cmd_open *dpcon_cmd;
3636
int err;
3737

@@ -69,7 +69,7 @@ int dpcon_close(struct fsl_mc_io *mc_io,
6969
u32 cmd_flags,
7070
u16 token)
7171
{
72-
struct mc_command cmd = { 0 };
72+
struct fsl_mc_command cmd = { 0 };
7373

7474
/* prepare command */
7575
cmd.header = mc_encode_cmd_header(DPCON_CMDID_CLOSE,
@@ -93,7 +93,7 @@ int dpcon_enable(struct fsl_mc_io *mc_io,
9393
u32 cmd_flags,
9494
u16 token)
9595
{
96-
struct mc_command cmd = { 0 };
96+
struct fsl_mc_command cmd = { 0 };
9797

9898
/* prepare command */
9999
cmd.header = mc_encode_cmd_header(DPCON_CMDID_ENABLE,
@@ -117,7 +117,7 @@ int dpcon_disable(struct fsl_mc_io *mc_io,
117117
u32 cmd_flags,
118118
u16 token)
119119
{
120-
struct mc_command cmd = { 0 };
120+
struct fsl_mc_command cmd = { 0 };
121121

122122
/* prepare command */
123123
cmd.header = mc_encode_cmd_header(DPCON_CMDID_DISABLE,
@@ -141,7 +141,7 @@ int dpcon_reset(struct fsl_mc_io *mc_io,
141141
u32 cmd_flags,
142142
u16 token)
143143
{
144-
struct mc_command cmd = { 0 };
144+
struct fsl_mc_command cmd = { 0 };
145145

146146
/* prepare command */
147147
cmd.header = mc_encode_cmd_header(DPCON_CMDID_RESET,
@@ -166,7 +166,7 @@ int dpcon_get_attributes(struct fsl_mc_io *mc_io,
166166
u16 token,
167167
struct dpcon_attr *attr)
168168
{
169-
struct mc_command cmd = { 0 };
169+
struct fsl_mc_command cmd = { 0 };
170170
struct dpcon_rsp_get_attr *dpcon_rsp;
171171
int err;
172172

@@ -204,7 +204,7 @@ int dpcon_set_notification(struct fsl_mc_io *mc_io,
204204
u16 token,
205205
struct dpcon_notification_cfg *cfg)
206206
{
207-
struct mc_command cmd = { 0 };
207+
struct fsl_mc_command cmd = { 0 };
208208
struct dpcon_cmd_set_notification *dpcon_cmd;
209209

210210
/* prepare command */

‎drivers/bus/fsl-mc/dpmcp.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ int dpmcp_open(struct fsl_mc_io *mc_io,
3030
int dpmcp_id,
3131
u16 *token)
3232
{
33-
struct mc_command cmd = { 0 };
33+
struct fsl_mc_command cmd = { 0 };
3434
struct dpmcp_cmd_open *cmd_params;
3535
int err;
3636

@@ -66,7 +66,7 @@ int dpmcp_close(struct fsl_mc_io *mc_io,
6666
u32 cmd_flags,
6767
u16 token)
6868
{
69-
struct mc_command cmd = { 0 };
69+
struct fsl_mc_command cmd = { 0 };
7070

7171
/* prepare command */
7272
cmd.header = mc_encode_cmd_header(DPMCP_CMDID_CLOSE,
@@ -88,7 +88,7 @@ int dpmcp_reset(struct fsl_mc_io *mc_io,
8888
u32 cmd_flags,
8989
u16 token)
9090
{
91-
struct mc_command cmd = { 0 };
91+
struct fsl_mc_command cmd = { 0 };
9292

9393
/* prepare command */
9494
cmd.header = mc_encode_cmd_header(DPMCP_CMDID_RESET,

‎drivers/bus/fsl-mc/dprc.c‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ int dprc_open(struct fsl_mc_io *mc_io,
2424
int container_id,
2525
u16 *token)
2626
{
27-
struct mc_command cmd = { 0 };
27+
struct fsl_mc_command cmd = { 0 };
2828
struct dprc_cmd_open *cmd_params;
2929
int err;
3030

@@ -61,7 +61,7 @@ int dprc_close(struct fsl_mc_io *mc_io,
6161
u32 cmd_flags,
6262
u16 token)
6363
{
64-
struct mc_command cmd = { 0 };
64+
struct fsl_mc_command cmd = { 0 };
6565

6666
/* prepare command */
6767
cmd.header = mc_encode_cmd_header(DPRC_CMDID_CLOSE, cmd_flags,
@@ -88,7 +88,7 @@ int dprc_set_irq(struct fsl_mc_io *mc_io,
8888
u8 irq_index,
8989
struct dprc_irq_cfg *irq_cfg)
9090
{
91-
struct mc_command cmd = { 0 };
91+
struct fsl_mc_command cmd = { 0 };
9292
struct dprc_cmd_set_irq *cmd_params;
9393

9494
/* prepare command */
@@ -126,7 +126,7 @@ int dprc_set_irq_enable(struct fsl_mc_io *mc_io,
126126
u8 irq_index,
127127
u8 en)
128128
{
129-
struct mc_command cmd = { 0 };
129+
struct fsl_mc_command cmd = { 0 };
130130
struct dprc_cmd_set_irq_enable *cmd_params;
131131

132132
/* prepare command */
@@ -162,7 +162,7 @@ int dprc_set_irq_mask(struct fsl_mc_io *mc_io,
162162
u8 irq_index,
163163
u32 mask)
164164
{
165-
struct mc_command cmd = { 0 };
165+
struct fsl_mc_command cmd = { 0 };
166166
struct dprc_cmd_set_irq_mask *cmd_params;
167167

168168
/* prepare command */
@@ -194,7 +194,7 @@ int dprc_get_irq_status(struct fsl_mc_io *mc_io,
194194
u8 irq_index,
195195
u32 *status)
196196
{
197-
struct mc_command cmd = { 0 };
197+
struct fsl_mc_command cmd = { 0 };
198198
struct dprc_cmd_get_irq_status *cmd_params;
199199
struct dprc_rsp_get_irq_status *rsp_params;
200200
int err;
@@ -236,7 +236,7 @@ int dprc_clear_irq_status(struct fsl_mc_io *mc_io,
236236
u8 irq_index,
237237
u32 status)
238238
{
239-
struct mc_command cmd = { 0 };
239+
struct fsl_mc_command cmd = { 0 };
240240
struct dprc_cmd_clear_irq_status *cmd_params;
241241

242242
/* prepare command */
@@ -264,7 +264,7 @@ int dprc_get_attributes(struct fsl_mc_io *mc_io,
264264
u16 token,
265265
struct dprc_attributes *attr)
266266
{
267-
struct mc_command cmd = { 0 };
267+
struct fsl_mc_command cmd = { 0 };
268268
struct dprc_rsp_get_attributes *rsp_params;
269269
int err;
270270

@@ -302,7 +302,7 @@ int dprc_get_obj_count(struct fsl_mc_io *mc_io,
302302
u16 token,
303303
int *obj_count)
304304
{
305-
struct mc_command cmd = { 0 };
305+
struct fsl_mc_command cmd = { 0 };
306306
struct dprc_rsp_get_obj_count *rsp_params;
307307
int err;
308308

@@ -344,7 +344,7 @@ int dprc_get_obj(struct fsl_mc_io *mc_io,
344344
int obj_index,
345345
struct fsl_mc_obj_desc *obj_desc)
346346
{
347-
struct mc_command cmd = { 0 };
347+
struct fsl_mc_command cmd = { 0 };
348348
struct dprc_cmd_get_obj *cmd_params;
349349
struct dprc_rsp_get_obj *rsp_params;
350350
int err;
@@ -399,7 +399,7 @@ int dprc_set_obj_irq(struct fsl_mc_io *mc_io,
399399
u8 irq_index,
400400
struct dprc_irq_cfg *irq_cfg)
401401
{
402-
struct mc_command cmd = { 0 };
402+
struct fsl_mc_command cmd = { 0 };
403403
struct dprc_cmd_set_obj_irq *cmd_params;
404404

405405
/* prepare command */
@@ -440,7 +440,7 @@ int dprc_get_obj_region(struct fsl_mc_io *mc_io,
440440
u8 region_index,
441441
struct dprc_region_desc *region_desc)
442442
{
443-
struct mc_command cmd = { 0 };
443+
struct fsl_mc_command cmd = { 0 };
444444
struct dprc_cmd_get_obj_region *cmd_params;
445445
struct dprc_rsp_get_obj_region *rsp_params;
446446
int err;
@@ -482,7 +482,7 @@ int dprc_get_api_version(struct fsl_mc_io *mc_io,
482482
u16 *major_ver,
483483
u16 *minor_ver)
484484
{
485-
struct mc_command cmd = { 0 };
485+
struct fsl_mc_command cmd = { 0 };
486486
int err;
487487

488488
/* prepare command */
@@ -512,7 +512,7 @@ int dprc_get_container_id(struct fsl_mc_io *mc_io,
512512
u32 cmd_flags,
513513
int *container_id)
514514
{
515-
struct mc_command cmd = { 0 };
515+
struct fsl_mc_command cmd = { 0 };
516516
int err;
517517

518518
/* prepare command */

‎drivers/bus/fsl-mc/fsl-mc-bus.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ static int mc_get_version(struct fsl_mc_io *mc_io,
314314
u32 cmd_flags,
315315
struct mc_version *mc_ver_info)
316316
{
317-
struct mc_command cmd = { 0 };
317+
struct fsl_mc_command cmd = { 0 };
318318
struct dpmng_rsp_get_version *rsp_params;
319319
int err;
320320

‎drivers/bus/fsl-mc/mc-sys.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
#define MC_CMD_COMPLETION_POLLING_MIN_SLEEP_USECS 10
2929
#define MC_CMD_COMPLETION_POLLING_MAX_SLEEP_USECS 500
3030

31-
static enum mc_cmd_status mc_cmd_hdr_read_status(struct mc_command *cmd)
31+
static enum mc_cmd_status mc_cmd_hdr_read_status(struct fsl_mc_command *cmd)
3232
{
3333
struct mc_cmd_header *hdr = (struct mc_cmd_header *)&cmd->header;
3434

3535
return (enum mc_cmd_status)hdr->status;
3636
}
3737

38-
static u16 mc_cmd_hdr_read_cmdid(struct mc_command *cmd)
38+
static u16 mc_cmd_hdr_read_cmdid(struct fsl_mc_command *cmd)
3939
{
4040
struct mc_cmd_header *hdr = (struct mc_cmd_header *)&cmd->header;
4141
u16 cmd_id = le16_to_cpu(hdr->cmd_id);
@@ -94,8 +94,8 @@ static const char *mc_status_to_string(enum mc_cmd_status status)
9494
* @portal: pointer to an MC portal
9595
* @cmd: pointer to a filled command
9696
*/
97-
static inline void mc_write_command(struct mc_command __iomem *portal,
98-
struct mc_command *cmd)
97+
static inline void mc_write_command(struct fsl_mc_command __iomem *portal,
98+
struct fsl_mc_command *cmd)
9999
{
100100
int i;
101101

@@ -121,9 +121,9 @@ static inline void mc_write_command(struct mc_command __iomem *portal,
121121
*
122122
* Returns MC_CMD_STATUS_OK on Success; Error code otherwise.
123123
*/
124-
static inline enum mc_cmd_status mc_read_response(struct mc_command __iomem *
125-
portal,
126-
struct mc_command *resp)
124+
static inline enum mc_cmd_status mc_read_response(struct fsl_mc_command __iomem
125+
*portal,
126+
struct fsl_mc_command *resp)
127127
{
128128
int i;
129129
enum mc_cmd_status status;
@@ -156,7 +156,7 @@ static inline enum mc_cmd_status mc_read_response(struct mc_command __iomem *
156156
* @mc_status: MC command completion status
157157
*/
158158
static int mc_polling_wait_preemptible(struct fsl_mc_io *mc_io,
159-
struct mc_command *cmd,
159+
struct fsl_mc_command *cmd,
160160
enum mc_cmd_status *mc_status)
161161
{
162162
enum mc_cmd_status status;
@@ -202,7 +202,7 @@ static int mc_polling_wait_preemptible(struct fsl_mc_io *mc_io,
202202
* @mc_status: MC command completion status
203203
*/
204204
static int mc_polling_wait_atomic(struct fsl_mc_io *mc_io,
205-
struct mc_command *cmd,
205+
struct fsl_mc_command *cmd,
206206
enum mc_cmd_status *mc_status)
207207
{
208208
enum mc_cmd_status status;
@@ -241,7 +241,7 @@ static int mc_polling_wait_atomic(struct fsl_mc_io *mc_io,
241241
*
242242
* Returns '0' on Success; Error code otherwise.
243243
*/
244-
int mc_send_command(struct fsl_mc_io *mc_io, struct mc_command *cmd)
244+
int mc_send_command(struct fsl_mc_io *mc_io, struct fsl_mc_command *cmd)
245245
{
246246
int error;
247247
enum mc_cmd_status status;

0 commit comments

Comments
 (0)