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>

diff --git a/drivers/bus/fsl-mc/dpbp.c b/drivers/bus/fsl-mc/dpbp.c
index 0aeacc5..17e3c5d 100644 (file)
--- a/drivers/bus/fsl-mc/dpbp.c
+++ b/drivers/bus/fsl-mc/dpbp.c
@@ -31,7 +31,7 @@ int dpbp_open(struct fsl_mc_io *mc_io,
              int dpbp_id,
              u16 *token)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpbp_cmd_open *cmd_params;
        int err;
 
@@ -68,7 +68,7 @@ int dpbp_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(DPBP_CMDID_CLOSE, cmd_flags,
@@ -91,7 +91,7 @@ int dpbp_enable(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(DPBP_CMDID_ENABLE, cmd_flags,
@@ -114,7 +114,7 @@ int dpbp_disable(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(DPBP_CMDID_DISABLE,
@@ -137,7 +137,7 @@ int dpbp_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(DPBP_CMDID_RESET,
@@ -163,7 +163,7 @@ int dpbp_get_attributes(struct fsl_mc_io *mc_io,
                        u16 token,
                        struct dpbp_attr *attr)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpbp_rsp_get_attributes *rsp_params;
        int err;
 

diff --git a/drivers/bus/fsl-mc/dpcon.c b/drivers/bus/fsl-mc/dpcon.c
index a1ba819..760555d 100644 (file)
--- a/drivers/bus/fsl-mc/dpcon.c
+++ b/drivers/bus/fsl-mc/dpcon.c
@@ -31,7 +31,7 @@ int dpcon_open(struct fsl_mc_io *mc_io,
               int dpcon_id,
               u16 *token)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpcon_cmd_open *dpcon_cmd;
        int err;
 
@@ -69,7 +69,7 @@ int dpcon_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(DPCON_CMDID_CLOSE,
@@ -93,7 +93,7 @@ int dpcon_enable(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(DPCON_CMDID_ENABLE,
@@ -117,7 +117,7 @@ int dpcon_disable(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(DPCON_CMDID_DISABLE,
@@ -141,7 +141,7 @@ int dpcon_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(DPCON_CMDID_RESET,
@@ -166,7 +166,7 @@ int dpcon_get_attributes(struct fsl_mc_io *mc_io,
                         u16 token,
                         struct dpcon_attr *attr)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpcon_rsp_get_attr *dpcon_rsp;
        int err;
 
@@ -204,7 +204,7 @@ int dpcon_set_notification(struct fsl_mc_io *mc_io,
                           u16 token,
                           struct dpcon_notification_cfg *cfg)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpcon_cmd_set_notification *dpcon_cmd;
 
        /* prepare command */

diff --git a/drivers/bus/fsl-mc/dpmcp.c b/drivers/bus/fsl-mc/dpmcp.c
index 8d997b0..5fbd0db 100644 (file)
--- a/drivers/bus/fsl-mc/dpmcp.c
+++ b/drivers/bus/fsl-mc/dpmcp.c
@@ -30,7 +30,7 @@ int dpmcp_open(struct fsl_mc_io *mc_io,
               int dpmcp_id,
               u16 *token)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpmcp_cmd_open *cmd_params;
        int err;
 
@@ -66,7 +66,7 @@ int dpmcp_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(DPMCP_CMDID_CLOSE,
@@ -88,7 +88,7 @@ int dpmcp_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(DPMCP_CMDID_RESET,

diff --git a/drivers/bus/fsl-mc/dprc.c b/drivers/bus/fsl-mc/dprc.c
index 5c23e8d..1c3f621 100644 (file)
--- a/drivers/bus/fsl-mc/dprc.c
+++ b/drivers/bus/fsl-mc/dprc.c
@@ -24,7 +24,7 @@ int dprc_open(struct fsl_mc_io *mc_io,
              int container_id,
              u16 *token)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dprc_cmd_open *cmd_params;
        int err;
 
@@ -61,7 +61,7 @@ int dprc_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(DPRC_CMDID_CLOSE, cmd_flags,
@@ -88,7 +88,7 @@ int dprc_set_irq(struct fsl_mc_io *mc_io,
                 u8 irq_index,
                 struct dprc_irq_cfg *irq_cfg)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dprc_cmd_set_irq *cmd_params;
 
        /* prepare command */
@@ -126,7 +126,7 @@ int dprc_set_irq_enable(struct fsl_mc_io *mc_io,
                        u8 irq_index,
                        u8 en)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dprc_cmd_set_irq_enable *cmd_params;
 
        /* prepare command */
@@ -162,7 +162,7 @@ int dprc_set_irq_mask(struct fsl_mc_io *mc_io,
                      u8 irq_index,
                      u32 mask)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dprc_cmd_set_irq_mask *cmd_params;
 
        /* prepare command */
@@ -194,7 +194,7 @@ int dprc_get_irq_status(struct fsl_mc_io *mc_io,
                        u8 irq_index,
                        u32 *status)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dprc_cmd_get_irq_status *cmd_params;
        struct dprc_rsp_get_irq_status *rsp_params;
        int err;
@@ -236,7 +236,7 @@ int dprc_clear_irq_status(struct fsl_mc_io *mc_io,
                          u8 irq_index,
                          u32 status)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dprc_cmd_clear_irq_status *cmd_params;
 
        /* prepare command */
@@ -264,7 +264,7 @@ int dprc_get_attributes(struct fsl_mc_io *mc_io,
                        u16 token,
                        struct dprc_attributes *attr)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dprc_rsp_get_attributes *rsp_params;
        int err;
 
@@ -302,7 +302,7 @@ int dprc_get_obj_count(struct fsl_mc_io *mc_io,
                       u16 token,
                       int *obj_count)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dprc_rsp_get_obj_count *rsp_params;
        int err;
 
@@ -344,7 +344,7 @@ int dprc_get_obj(struct fsl_mc_io *mc_io,
                 int obj_index,
                 struct fsl_mc_obj_desc *obj_desc)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dprc_cmd_get_obj *cmd_params;
        struct dprc_rsp_get_obj *rsp_params;
        int err;
@@ -399,7 +399,7 @@ int dprc_set_obj_irq(struct fsl_mc_io *mc_io,
                     u8 irq_index,
                     struct dprc_irq_cfg *irq_cfg)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dprc_cmd_set_obj_irq *cmd_params;
 
        /* prepare command */
@@ -440,7 +440,7 @@ int dprc_get_obj_region(struct fsl_mc_io *mc_io,
                        u8 region_index,
                        struct dprc_region_desc *region_desc)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dprc_cmd_get_obj_region *cmd_params;
        struct dprc_rsp_get_obj_region *rsp_params;
        int err;
@@ -482,7 +482,7 @@ int dprc_get_api_version(struct fsl_mc_io *mc_io,
                         u16 *major_ver,
                         u16 *minor_ver)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        int err;
 
        /* prepare command */
@@ -512,7 +512,7 @@ int dprc_get_container_id(struct fsl_mc_io *mc_io,
                          u32 cmd_flags,
                          int *container_id)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        int err;
 
        /* prepare command */

diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c
index 1b333c4..5d8266c 100644 (file)
--- a/drivers/bus/fsl-mc/fsl-mc-bus.c
+++ b/drivers/bus/fsl-mc/fsl-mc-bus.c
@@ -314,7 +314,7 @@ static int mc_get_version(struct fsl_mc_io *mc_io,
                          u32 cmd_flags,
                          struct mc_version *mc_ver_info)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpmng_rsp_get_version *rsp_params;
        int err;
 

diff --git a/drivers/bus/fsl-mc/mc-sys.c b/drivers/bus/fsl-mc/mc-sys.c
index bd03f15..3221a7f 100644 (file)
--- a/drivers/bus/fsl-mc/mc-sys.c
+++ b/drivers/bus/fsl-mc/mc-sys.c
@@ -28,14 +28,14 @@
 #define MC_CMD_COMPLETION_POLLING_MIN_SLEEP_USECS    10
 #define MC_CMD_COMPLETION_POLLING_MAX_SLEEP_USECS    500
 
-static enum mc_cmd_status mc_cmd_hdr_read_status(struct mc_command *cmd)
+static enum mc_cmd_status mc_cmd_hdr_read_status(struct fsl_mc_command *cmd)
 {
        struct mc_cmd_header *hdr = (struct mc_cmd_header *)&cmd->header;
 
        return (enum mc_cmd_status)hdr->status;
 }
 
-static u16 mc_cmd_hdr_read_cmdid(struct mc_command *cmd)
+static u16 mc_cmd_hdr_read_cmdid(struct fsl_mc_command *cmd)
 {
        struct mc_cmd_header *hdr = (struct mc_cmd_header *)&cmd->header;
        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)
  * @portal: pointer to an MC portal
  * @cmd: pointer to a filled command
  */
-static inline void mc_write_command(struct mc_command __iomem *portal,
-                                   struct mc_command *cmd)
+static inline void mc_write_command(struct fsl_mc_command __iomem *portal,
+                                   struct fsl_mc_command *cmd)
 {
        int i;
 
@@ -121,9 +121,9 @@ static inline void mc_write_command(struct mc_command __iomem *portal,
  *
  * Returns MC_CMD_STATUS_OK on Success; Error code otherwise.
  */
-static inline enum mc_cmd_status mc_read_response(struct mc_command __iomem *
-                                                 portal,
-                                                 struct mc_command *resp)
+static inline enum mc_cmd_status mc_read_response(struct fsl_mc_command __iomem
+                                                 *portal,
+                                                 struct fsl_mc_command *resp)
 {
        int i;
        enum mc_cmd_status status;
@@ -156,7 +156,7 @@ static inline enum mc_cmd_status mc_read_response(struct mc_command __iomem *
  * @mc_status: MC command completion status
  */
 static int mc_polling_wait_preemptible(struct fsl_mc_io *mc_io,
-                                      struct mc_command *cmd,
+                                      struct fsl_mc_command *cmd,
                                       enum mc_cmd_status *mc_status)
 {
        enum mc_cmd_status status;
@@ -202,7 +202,7 @@ static int mc_polling_wait_preemptible(struct fsl_mc_io *mc_io,
  * @mc_status: MC command completion status
  */
 static int mc_polling_wait_atomic(struct fsl_mc_io *mc_io,
-                                 struct mc_command *cmd,
+                                 struct fsl_mc_command *cmd,
                                  enum mc_cmd_status *mc_status)
 {
        enum mc_cmd_status status;
@@ -241,7 +241,7 @@ static int mc_polling_wait_atomic(struct fsl_mc_io *mc_io,
  *
  * Returns '0' on Success; Error code otherwise.
  */
-int mc_send_command(struct fsl_mc_io *mc_io, struct mc_command *cmd)
+int mc_send_command(struct fsl_mc_io *mc_io, struct fsl_mc_command *cmd)
 {
        int error;
        enum mc_cmd_status status;

diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpni.c b/drivers/staging/fsl-dpaa2/ethernet/dpni.c
index b16ff5c..1a721c9 100644 (file)
--- a/drivers/staging/fsl-dpaa2/ethernet/dpni.c
+++ b/drivers/staging/fsl-dpaa2/ethernet/dpni.c
@@ -122,7 +122,7 @@ int dpni_open(struct fsl_mc_io *mc_io,
              int dpni_id,
              u16 *token)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_open *cmd_params;
 
        int err;
@@ -160,7 +160,7 @@ int dpni_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(DPNI_CMDID_CLOSE,
@@ -188,7 +188,7 @@ int dpni_set_pools(struct fsl_mc_io *mc_io,
                   u16 token,
                   const struct dpni_pools_cfg *cfg)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_set_pools *cmd_params;
        int i;
 
@@ -222,7 +222,7 @@ int dpni_enable(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(DPNI_CMDID_ENABLE,
@@ -245,7 +245,7 @@ int dpni_disable(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(DPNI_CMDID_DISABLE,
@@ -270,7 +270,7 @@ int dpni_is_enabled(struct fsl_mc_io *mc_io,
                    u16 token,
                    int *en)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_rsp_is_enabled *rsp_params;
        int err;
 
@@ -303,7 +303,7 @@ int dpni_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(DPNI_CMDID_RESET,
@@ -335,7 +335,7 @@ int dpni_set_irq_enable(struct fsl_mc_io *mc_io,
                        u8 irq_index,
                        u8 en)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_set_irq_enable *cmd_params;
 
        /* prepare command */
@@ -366,7 +366,7 @@ int dpni_get_irq_enable(struct fsl_mc_io *mc_io,
                        u8 irq_index,
                        u8 *en)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_get_irq_enable *cmd_params;
        struct dpni_rsp_get_irq_enable *rsp_params;
 
@@ -413,7 +413,7 @@ int dpni_set_irq_mask(struct fsl_mc_io *mc_io,
                      u8 irq_index,
                      u32 mask)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_set_irq_mask *cmd_params;
 
        /* prepare command */
@@ -447,7 +447,7 @@ int dpni_get_irq_mask(struct fsl_mc_io *mc_io,
                      u8 irq_index,
                      u32 *mask)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_get_irq_mask *cmd_params;
        struct dpni_rsp_get_irq_mask *rsp_params;
        int err;
@@ -489,7 +489,7 @@ int dpni_get_irq_status(struct fsl_mc_io *mc_io,
                        u8 irq_index,
                        u32 *status)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_get_irq_status *cmd_params;
        struct dpni_rsp_get_irq_status *rsp_params;
        int err;
@@ -532,7 +532,7 @@ int dpni_clear_irq_status(struct fsl_mc_io *mc_io,
                          u8 irq_index,
                          u32 status)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_clear_irq_status *cmd_params;
 
        /* prepare command */
@@ -561,7 +561,7 @@ int dpni_get_attributes(struct fsl_mc_io *mc_io,
                        u16 token,
                        struct dpni_attr *attr)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_rsp_get_attr *rsp_params;
 
        int err;
@@ -609,7 +609,7 @@ int dpni_set_errors_behavior(struct fsl_mc_io *mc_io,
                             u16 token,
                             struct dpni_error_cfg *cfg)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_set_errors_behavior *cmd_params;
 
        /* prepare command */
@@ -641,7 +641,7 @@ int dpni_get_buffer_layout(struct fsl_mc_io *mc_io,
                           enum dpni_queue_type qtype,
                           struct dpni_buffer_layout *layout)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_get_buffer_layout *cmd_params;
        struct dpni_rsp_get_buffer_layout *rsp_params;
        int err;
@@ -689,7 +689,7 @@ int dpni_set_buffer_layout(struct fsl_mc_io *mc_io,
                           enum dpni_queue_type qtype,
                           const struct dpni_buffer_layout *layout)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_set_buffer_layout *cmd_params;
 
        /* prepare command */
@@ -731,7 +731,7 @@ int dpni_set_offload(struct fsl_mc_io *mc_io,
                     enum dpni_offload type,
                     u32 config)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_set_offload *cmd_params;
 
        cmd.header = mc_encode_cmd_header(DPNI_CMDID_SET_OFFLOAD,
@@ -750,7 +750,7 @@ int dpni_get_offload(struct fsl_mc_io *mc_io,
                     enum dpni_offload type,
                     u32 *config)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_get_offload *cmd_params;
        struct dpni_rsp_get_offload *rsp_params;
        int err;
@@ -792,7 +792,7 @@ int dpni_get_qdid(struct fsl_mc_io *mc_io,
                  enum dpni_queue_type qtype,
                  u16 *qdid)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_get_qdid *cmd_params;
        struct dpni_rsp_get_qdid *rsp_params;
        int err;
@@ -830,7 +830,7 @@ int dpni_get_tx_data_offset(struct fsl_mc_io *mc_io,
                            u16 token,
                            u16 *data_offset)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_rsp_get_tx_data_offset *rsp_params;
        int err;
 
@@ -865,7 +865,7 @@ int dpni_set_link_cfg(struct fsl_mc_io *mc_io,
                      u16 token,
                      const struct dpni_link_cfg *cfg)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_set_link_cfg *cmd_params;
 
        /* prepare command */
@@ -894,7 +894,7 @@ int dpni_get_link_state(struct fsl_mc_io *mc_io,
                        u16 token,
                        struct dpni_link_state *state)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_rsp_get_link_state *rsp_params;
        int err;
 
@@ -933,7 +933,7 @@ int dpni_set_max_frame_length(struct fsl_mc_io *mc_io,
                              u16 token,
                              u16 max_frame_length)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_set_max_frame_length *cmd_params;
 
        /* prepare command */
@@ -963,7 +963,7 @@ int dpni_get_max_frame_length(struct fsl_mc_io *mc_io,
                              u16 token,
                              u16 *max_frame_length)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_rsp_get_max_frame_length *rsp_params;
        int err;
 
@@ -998,7 +998,7 @@ int dpni_set_multicast_promisc(struct fsl_mc_io *mc_io,
                               u16 token,
                               int en)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_set_multicast_promisc *cmd_params;
 
        /* prepare command */
@@ -1026,7 +1026,7 @@ int dpni_get_multicast_promisc(struct fsl_mc_io *mc_io,
                               u16 token,
                               int *en)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_rsp_get_multicast_promisc *rsp_params;
        int err;
 
@@ -1061,7 +1061,7 @@ int dpni_set_unicast_promisc(struct fsl_mc_io *mc_io,
                             u16 token,
                             int en)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_set_unicast_promisc *cmd_params;
 
        /* prepare command */
@@ -1089,7 +1089,7 @@ int dpni_get_unicast_promisc(struct fsl_mc_io *mc_io,
                             u16 token,
                             int *en)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_rsp_get_unicast_promisc *rsp_params;
        int err;
 
@@ -1124,7 +1124,7 @@ int dpni_set_primary_mac_addr(struct fsl_mc_io *mc_io,
                              u16 token,
                              const u8 mac_addr[6])
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_set_primary_mac_addr *cmd_params;
        int i;
 
@@ -1154,7 +1154,7 @@ int dpni_get_primary_mac_addr(struct fsl_mc_io *mc_io,
                              u16 token,
                              u8 mac_addr[6])
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_rsp_get_primary_mac_addr *rsp_params;
        int i, err;
 
@@ -1193,7 +1193,7 @@ int dpni_get_port_mac_addr(struct fsl_mc_io *mc_io,
                           u16 token,
                           u8 mac_addr[6])
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_rsp_get_port_mac_addr *rsp_params;
        int i, err;
 
@@ -1229,7 +1229,7 @@ int dpni_add_mac_addr(struct fsl_mc_io *mc_io,
                      u16 token,
                      const u8 mac_addr[6])
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_add_mac_addr *cmd_params;
        int i;
 
@@ -1259,7 +1259,7 @@ int dpni_remove_mac_addr(struct fsl_mc_io *mc_io,
                         u16 token,
                         const u8 mac_addr[6])
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_remove_mac_addr *cmd_params;
        int i;
 
@@ -1293,7 +1293,7 @@ int dpni_clear_mac_filters(struct fsl_mc_io *mc_io,
                           int unicast,
                           int multicast)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_clear_mac_filters *cmd_params;
 
        /* prepare command */
@@ -1327,7 +1327,7 @@ int dpni_set_rx_tc_dist(struct fsl_mc_io *mc_io,
                        u8 tc_id,
                        const struct dpni_rx_tc_dist_cfg *cfg)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_set_rx_tc_dist *cmd_params;
 
        /* prepare command */
@@ -1371,7 +1371,7 @@ int dpni_set_queue(struct fsl_mc_io *mc_io,
                   u8 options,
                   const struct dpni_queue *queue)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_set_queue *cmd_params;
 
        /* prepare command */
@@ -1419,7 +1419,7 @@ int dpni_get_queue(struct fsl_mc_io *mc_io,
                   struct dpni_queue *queue,
                   struct dpni_queue_id *qid)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_get_queue *cmd_params;
        struct dpni_rsp_get_queue *rsp_params;
        int err;
@@ -1473,7 +1473,7 @@ int dpni_get_statistics(struct fsl_mc_io *mc_io,
                        u8 page,
                        union dpni_statistics *stat)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_get_statistics *cmd_params;
        struct dpni_rsp_get_statistics *rsp_params;
        int i, err;
@@ -1522,7 +1522,7 @@ int dpni_set_taildrop(struct fsl_mc_io *mc_io,
                      u8 index,
                      struct dpni_taildrop *taildrop)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_set_taildrop *cmd_params;
 
        /* prepare command */
@@ -1566,7 +1566,7 @@ int dpni_get_taildrop(struct fsl_mc_io *mc_io,
                      u8 index,
                      struct dpni_taildrop *taildrop)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpni_cmd_get_taildrop *cmd_params;
        struct dpni_rsp_get_taildrop *rsp_params;
        int err;
@@ -1610,7 +1610,7 @@ int dpni_get_api_version(struct fsl_mc_io *mc_io,
                         u16 *minor_ver)
 {
        struct dpni_rsp_get_api_version *rsp_params;
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        int err;
 
        cmd.header = mc_encode_cmd_header(DPNI_CMDID_GET_API_VERSION,

diff --git a/drivers/staging/fsl-dpaa2/ethsw/dpsw.c b/drivers/staging/fsl-dpaa2/ethsw/dpsw.c
index aefa52f..9b9bc60 100644 (file)
--- a/drivers/staging/fsl-dpaa2/ethsw/dpsw.c
+++ b/drivers/staging/fsl-dpaa2/ethsw/dpsw.c
@@ -43,7 +43,7 @@ int dpsw_open(struct fsl_mc_io *mc_io,
              int dpsw_id,
              u16 *token)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_cmd_open *cmd_params;
        int err;
 
@@ -80,7 +80,7 @@ int dpsw_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(DPSW_CMDID_CLOSE,
@@ -103,7 +103,7 @@ int dpsw_enable(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(DPSW_CMDID_ENABLE,
@@ -126,7 +126,7 @@ int dpsw_disable(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(DPSW_CMDID_DISABLE,
@@ -149,7 +149,7 @@ int dpsw_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(DPSW_CMDID_RESET,
@@ -181,7 +181,7 @@ int dpsw_set_irq_enable(struct fsl_mc_io *mc_io,
                        u8 irq_index,
                        u8 en)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_cmd_set_irq_enable *cmd_params;
 
        /* prepare command */
@@ -218,7 +218,7 @@ int dpsw_set_irq_mask(struct fsl_mc_io *mc_io,
                      u8 irq_index,
                      u32 mask)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_cmd_set_irq_mask *cmd_params;
 
        /* prepare command */
@@ -251,7 +251,7 @@ int dpsw_get_irq_status(struct fsl_mc_io *mc_io,
                        u8 irq_index,
                        u32 *status)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_cmd_get_irq_status *cmd_params;
        struct dpsw_rsp_get_irq_status *rsp_params;
        int err;
@@ -294,7 +294,7 @@ int dpsw_clear_irq_status(struct fsl_mc_io *mc_io,
                          u8 irq_index,
                          u32 status)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_cmd_clear_irq_status *cmd_params;
 
        /* prepare command */
@@ -323,7 +323,7 @@ int dpsw_get_attributes(struct fsl_mc_io *mc_io,
                        u16 token,
                        struct dpsw_attr *attr)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_rsp_get_attr *rsp_params;
        int err;
 
@@ -373,7 +373,7 @@ int dpsw_if_set_link_cfg(struct fsl_mc_io *mc_io,
                         u16 if_id,
                         struct dpsw_link_cfg *cfg)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_cmd_if_set_link_cfg *cmd_params;
 
        /* prepare command */
@@ -405,7 +405,7 @@ int dpsw_if_get_link_state(struct fsl_mc_io *mc_io,
                           u16 if_id,
                           struct dpsw_link_state *state)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_cmd_if_get_link_state *cmd_params;
        struct dpsw_rsp_if_get_link_state *rsp_params;
        int err;
@@ -447,7 +447,7 @@ int dpsw_if_set_flooding(struct fsl_mc_io *mc_io,
                         u16 if_id,
                         u8 en)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_cmd_if_set_flooding *cmd_params;
 
        /* prepare command */
@@ -478,7 +478,7 @@ int dpsw_if_set_broadcast(struct fsl_mc_io *mc_io,
                          u16 if_id,
                          u8 en)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_cmd_if_set_broadcast *cmd_params;
 
        /* prepare command */
@@ -509,7 +509,7 @@ int dpsw_if_set_tci(struct fsl_mc_io *mc_io,
                    u16 if_id,
                    const struct dpsw_tci_cfg *cfg)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_cmd_if_set_tci *cmd_params;
        u16 tmp_conf = 0;
 
@@ -547,7 +547,7 @@ int dpsw_if_set_stp(struct fsl_mc_io *mc_io,
                    u16 if_id,
                    const struct dpsw_stp_cfg *cfg)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_cmd_if_set_stp *cmd_params;
 
        /* prepare command */
@@ -581,7 +581,7 @@ int dpsw_if_get_counter(struct fsl_mc_io *mc_io,
                        enum dpsw_counter type,
                        u64 *counter)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_cmd_if_get_counter *cmd_params;
        struct dpsw_rsp_if_get_counter *rsp_params;
        int err;
@@ -620,7 +620,7 @@ int dpsw_if_enable(struct fsl_mc_io *mc_io,
                   u16 token,
                   u16 if_id)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_cmd_if *cmd_params;
 
        /* prepare command */
@@ -648,7 +648,7 @@ int dpsw_if_disable(struct fsl_mc_io *mc_io,
                    u16 token,
                    u16 if_id)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_cmd_if *cmd_params;
 
        /* prepare command */
@@ -678,7 +678,7 @@ int dpsw_if_set_max_frame_length(struct fsl_mc_io *mc_io,
                                 u16 if_id,
                                 u16 frame_length)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_cmd_if_set_max_frame_length *cmd_params;
 
        /* prepare command */
@@ -716,7 +716,7 @@ int dpsw_vlan_add(struct fsl_mc_io *mc_io,
                  u16 vlan_id,
                  const struct dpsw_vlan_cfg *cfg)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_vlan_add *cmd_params;
 
        /* prepare command */
@@ -752,7 +752,7 @@ int dpsw_vlan_add_if(struct fsl_mc_io *mc_io,
                     u16 vlan_id,
                     const struct dpsw_vlan_if_cfg *cfg)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_cmd_vlan_manage_if *cmd_params;
 
        /* prepare command */
@@ -790,7 +790,7 @@ int dpsw_vlan_add_if_untagged(struct fsl_mc_io *mc_io,
                              u16 vlan_id,
                              const struct dpsw_vlan_if_cfg *cfg)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_cmd_vlan_manage_if *cmd_params;
 
        /* prepare command */
@@ -824,7 +824,7 @@ int dpsw_vlan_remove_if(struct fsl_mc_io *mc_io,
                        u16 vlan_id,
                        const struct dpsw_vlan_if_cfg *cfg)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_cmd_vlan_manage_if *cmd_params;
 
        /* prepare command */
@@ -860,7 +860,7 @@ int dpsw_vlan_remove_if_untagged(struct fsl_mc_io *mc_io,
                                 u16 vlan_id,
                                 const struct dpsw_vlan_if_cfg *cfg)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_cmd_vlan_manage_if *cmd_params;
 
        /* prepare command */
@@ -889,7 +889,7 @@ int dpsw_vlan_remove(struct fsl_mc_io *mc_io,
                     u16 token,
                     u16 vlan_id)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_cmd_vlan_remove *cmd_params;
 
        /* prepare command */
@@ -919,7 +919,7 @@ int dpsw_fdb_add_unicast(struct fsl_mc_io *mc_io,
                         u16 fdb_id,
                         const struct dpsw_fdb_unicast_cfg *cfg)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_cmd_fdb_unicast_op *cmd_params;
        int i;
 
@@ -954,7 +954,7 @@ int dpsw_fdb_remove_unicast(struct fsl_mc_io *mc_io,
                            u16 fdb_id,
                            const struct dpsw_fdb_unicast_cfg *cfg)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_cmd_fdb_unicast_op *cmd_params;
        int i;
 
@@ -996,7 +996,7 @@ int dpsw_fdb_add_multicast(struct fsl_mc_io *mc_io,
                           u16 fdb_id,
                           const struct dpsw_fdb_multicast_cfg *cfg)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_cmd_fdb_multicast_op *cmd_params;
        int i;
 
@@ -1038,7 +1038,7 @@ int dpsw_fdb_remove_multicast(struct fsl_mc_io *mc_io,
                              u16 fdb_id,
                              const struct dpsw_fdb_multicast_cfg *cfg)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_cmd_fdb_multicast_op *cmd_params;
        int i;
 
@@ -1074,7 +1074,7 @@ int dpsw_fdb_set_learning_mode(struct fsl_mc_io *mc_io,
                               u16 fdb_id,
                               enum dpsw_fdb_learning_mode mode)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_cmd_fdb_set_learning_mode *cmd_params;
 
        /* prepare command */
@@ -1103,7 +1103,7 @@ int dpsw_get_api_version(struct fsl_mc_io *mc_io,
                         u16 *major_ver,
                         u16 *minor_ver)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpsw_rsp_get_api_version *rsp_params;
        int err;
 

diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio.c b/drivers/staging/fsl-mc/bus/dpio/dpio.c
index 3175057..ff37c80 100644 (file)
--- a/drivers/staging/fsl-mc/bus/dpio/dpio.c
+++ b/drivers/staging/fsl-mc/bus/dpio/dpio.c
@@ -37,7 +37,7 @@ int dpio_open(struct fsl_mc_io *mc_io,
              int dpio_id,
              u16 *token)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpio_cmd_open *dpio_cmd;
        int err;
 
@@ -70,7 +70,7 @@ int dpio_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(DPIO_CMDID_CLOSE,
@@ -92,7 +92,7 @@ int dpio_enable(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(DPIO_CMDID_ENABLE,
@@ -114,7 +114,7 @@ int dpio_disable(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(DPIO_CMDID_DISABLE,
@@ -138,7 +138,7 @@ int dpio_get_attributes(struct fsl_mc_io *mc_io,
                        u16 token,
                        struct dpio_attr *attr)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        struct dpio_rsp_get_attr *dpio_rsp;
        int err;
 
@@ -180,7 +180,7 @@ int dpio_get_api_version(struct fsl_mc_io *mc_io,
                         u16 *major_ver,
                         u16 *minor_ver)
 {
-       struct mc_command cmd = { 0 };
+       struct fsl_mc_command cmd = { 0 };
        int err;
 
        /* prepare command */

diff --git a/include/linux/fsl/mc.h b/include/linux/fsl/mc.h
index cfb1fbf..f27cb14 100644 (file)
--- a/include/linux/fsl/mc.h
+++ b/include/linux/fsl/mc.h
@@ -209,7 +209,7 @@ struct mc_cmd_header {
        __le16 cmd_id;
 };
 
-struct mc_command {
+struct fsl_mc_command {
        u64 header;
        u64 params[MC_CMD_NUM_OF_PARAMS];
 };
@@ -256,7 +256,7 @@ static inline u64 mc_encode_cmd_header(u16 cmd_id,
        return header;
 }
 
-static inline u16 mc_cmd_hdr_read_token(struct mc_command *cmd)
+static inline u16 mc_cmd_hdr_read_token(struct fsl_mc_command *cmd)
 {
        struct mc_cmd_header *hdr = (struct mc_cmd_header *)&cmd->header;
        u16 token = le16_to_cpu(hdr->token);
@@ -273,7 +273,7 @@ struct mc_rsp_api_ver {
        __le16 minor_ver;
 };
 
-static inline u32 mc_cmd_read_object_id(struct mc_command *cmd)
+static inline u32 mc_cmd_read_object_id(struct fsl_mc_command *cmd)
 {
        struct mc_rsp_create *rsp_params;
 
@@ -281,7 +281,7 @@ static inline u32 mc_cmd_read_object_id(struct mc_command *cmd)
        return le32_to_cpu(rsp_params->object_id);
 }
 
-static inline void mc_cmd_read_api_version(struct mc_command *cmd,
+static inline void mc_cmd_read_api_version(struct fsl_mc_command *cmd,
                                           u16 *major_ver,
                                           u16 *minor_ver)
 {
@@ -342,7 +342,7 @@ struct fsl_mc_io {
        };
 };
 
-int mc_send_command(struct fsl_mc_io *mc_io, struct mc_command *cmd);
+int mc_send_command(struct fsl_mc_io *mc_io, struct fsl_mc_command *cmd);
 
 #ifdef CONFIG_FSL_MC_BUS
 #define dev_is_fsl_mc(_dev) ((_dev)->bus == &fsl_mc_bus_type)