staging: fsl-mc: Fixed uintX_t CHECK checkpatch warnings
authorJ. German Rivera <German.Rivera@freescale.com>
Fri, 25 Sep 2015 16:21:01 +0000 (11:21 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 29 Sep 2015 02:24:20 +0000 (04:24 +0200)
Replaced all uses of uintX_t types to uX types, to be
checkpatch clean.

Signed-off-by: J. German Rivera <German.Rivera@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
15 files changed:
drivers/staging/fsl-mc/bus/dpbp.c
drivers/staging/fsl-mc/bus/dpmcp.c
drivers/staging/fsl-mc/bus/dpmng.c
drivers/staging/fsl-mc/bus/dprc-driver.c
drivers/staging/fsl-mc/bus/dprc.c
drivers/staging/fsl-mc/bus/mc-allocator.c
drivers/staging/fsl-mc/bus/mc-bus.c
drivers/staging/fsl-mc/bus/mc-sys.c
drivers/staging/fsl-mc/include/dpbp.h
drivers/staging/fsl-mc/include/dpmng.h
drivers/staging/fsl-mc/include/dprc.h
drivers/staging/fsl-mc/include/mc-cmd.h
drivers/staging/fsl-mc/include/mc-private.h
drivers/staging/fsl-mc/include/mc-sys.h
drivers/staging/fsl-mc/include/mc.h

index f5a2028..2d97173 100644 (file)
@@ -52,9 +52,9 @@
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpbp_open(struct fsl_mc_io *mc_io,
-             uint32_t cmd_flags,
+             u32 cmd_flags,
              int dpbp_id,
-             uint16_t *token)
+             u16 *token)
 {
        struct mc_command cmd = { 0 };
        int err;
@@ -88,8 +88,8 @@ EXPORT_SYMBOL(dpbp_open);
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpbp_close(struct fsl_mc_io *mc_io,
-              uint32_t cmd_flags,
-              uint16_t token)
+              u32 cmd_flags,
+              u16 token)
 {
        struct mc_command cmd = { 0 };
 
@@ -124,9 +124,9 @@ EXPORT_SYMBOL(dpbp_close);
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpbp_create(struct fsl_mc_io *mc_io,
-               uint32_t cmd_flags,
+               u32 cmd_flags,
                const struct dpbp_cfg *cfg,
-               uint16_t *token)
+               u16 *token)
 {
        struct mc_command cmd = { 0 };
        int err;
@@ -157,8 +157,8 @@ int dpbp_create(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; error code otherwise.
  */
 int dpbp_destroy(struct fsl_mc_io *mc_io,
-                uint32_t cmd_flags,
-                uint16_t token)
+                u32 cmd_flags,
+                u16 token)
 {
        struct mc_command cmd = { 0 };
 
@@ -179,8 +179,8 @@ int dpbp_destroy(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpbp_enable(struct fsl_mc_io *mc_io,
-               uint32_t cmd_flags,
-               uint16_t token)
+               u32 cmd_flags,
+               u16 token)
 {
        struct mc_command cmd = { 0 };
 
@@ -202,8 +202,8 @@ EXPORT_SYMBOL(dpbp_enable);
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpbp_disable(struct fsl_mc_io *mc_io,
-                uint32_t cmd_flags,
-                uint16_t token)
+                u32 cmd_flags,
+                u16 token)
 {
        struct mc_command cmd = { 0 };
 
@@ -226,8 +226,8 @@ EXPORT_SYMBOL(dpbp_disable);
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpbp_is_enabled(struct fsl_mc_io *mc_io,
-                   uint32_t cmd_flags,
-                   uint16_t token,
+                   u32 cmd_flags,
+                   u16 token,
                    int *en)
 {
        struct mc_command cmd = { 0 };
@@ -256,8 +256,8 @@ int dpbp_is_enabled(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpbp_reset(struct fsl_mc_io *mc_io,
-              uint32_t cmd_flags,
-              uint16_t token)
+              u32 cmd_flags,
+              u16 token)
 {
        struct mc_command cmd = { 0 };
 
@@ -280,9 +280,9 @@ int dpbp_reset(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpbp_set_irq(struct fsl_mc_io *mc_io,
-                uint32_t cmd_flags,
-                uint16_t token,
-                uint8_t irq_index,
+                u32 cmd_flags,
+                u16 token,
+                u8 irq_index,
                 struct dpbp_irq_cfg *irq_cfg)
 {
        struct mc_command cmd = { 0 };
@@ -312,9 +312,9 @@ int dpbp_set_irq(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpbp_get_irq(struct fsl_mc_io *mc_io,
-                uint32_t cmd_flags,
-                uint16_t token,
-                uint8_t irq_index,
+                u32 cmd_flags,
+                u16 token,
+                u8 irq_index,
                 int *type,
                 struct dpbp_irq_cfg *irq_cfg)
 {
@@ -332,8 +332,8 @@ int dpbp_get_irq(struct fsl_mc_io *mc_io,
                return err;
 
        /* retrieve response parameters */
-       irq_cfg->val = (uint32_t)mc_dec(cmd.params[0], 0, 32);
-       irq_cfg->addr = (uint64_t)mc_dec(cmd.params[1], 0, 64);
+       irq_cfg->val = (u32)mc_dec(cmd.params[0], 0, 32);
+       irq_cfg->addr = (u64)mc_dec(cmd.params[1], 0, 64);
        irq_cfg->user_irq_id = (int)mc_dec(cmd.params[2], 0, 32);
        *type = (int)mc_dec(cmd.params[2], 32, 32);
        return 0;
@@ -355,10 +355,10 @@ int dpbp_get_irq(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpbp_set_irq_enable(struct fsl_mc_io *mc_io,
-                       uint32_t cmd_flags,
-                       uint16_t token,
-                       uint8_t irq_index,
-                       uint8_t en)
+                       u32 cmd_flags,
+                       u16 token,
+                       u8 irq_index,
+                       u8 en)
 {
        struct mc_command cmd = { 0 };
 
@@ -383,10 +383,10 @@ int dpbp_set_irq_enable(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpbp_get_irq_enable(struct fsl_mc_io *mc_io,
-                       uint32_t cmd_flags,
-                       uint16_t token,
-                       uint8_t irq_index,
-                       uint8_t *en)
+                       u32 cmd_flags,
+                       u16 token,
+                       u8 irq_index,
+                       u8 *en)
 {
        struct mc_command cmd = { 0 };
        int err;
@@ -402,7 +402,7 @@ int dpbp_get_irq_enable(struct fsl_mc_io *mc_io,
                return err;
 
        /* retrieve response parameters */
-       *en = (uint8_t)mc_dec(cmd.params[0], 0, 8);
+       *en = (u8)mc_dec(cmd.params[0], 0, 8);
        return 0;
 }
 
@@ -423,10 +423,10 @@ int dpbp_get_irq_enable(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpbp_set_irq_mask(struct fsl_mc_io *mc_io,
-                     uint32_t cmd_flags,
-                     uint16_t token,
-                     uint8_t irq_index,
-                     uint32_t mask)
+                     u32 cmd_flags,
+                     u16 token,
+                     u8 irq_index,
+                     u32 mask)
 {
        struct mc_command cmd = { 0 };
 
@@ -454,10 +454,10 @@ int dpbp_set_irq_mask(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpbp_get_irq_mask(struct fsl_mc_io *mc_io,
-                     uint32_t cmd_flags,
-                     uint16_t token,
-                     uint8_t irq_index,
-                     uint32_t *mask)
+                     u32 cmd_flags,
+                     u16 token,
+                     u8 irq_index,
+                     u32 *mask)
 {
        struct mc_command cmd = { 0 };
        int err;
@@ -473,7 +473,7 @@ int dpbp_get_irq_mask(struct fsl_mc_io *mc_io,
                return err;
 
        /* retrieve response parameters */
-       *mask = (uint32_t)mc_dec(cmd.params[0], 0, 32);
+       *mask = (u32)mc_dec(cmd.params[0], 0, 32);
        return 0;
 }
 
@@ -491,10 +491,10 @@ int dpbp_get_irq_mask(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpbp_get_irq_status(struct fsl_mc_io *mc_io,
-                       uint32_t cmd_flags,
-                       uint16_t token,
-                       uint8_t irq_index,
-                       uint32_t *status)
+                       u32 cmd_flags,
+                       u16 token,
+                       u8 irq_index,
+                       u32 *status)
 {
        struct mc_command cmd = { 0 };
        int err;
@@ -510,7 +510,7 @@ int dpbp_get_irq_status(struct fsl_mc_io *mc_io,
                return err;
 
        /* retrieve response parameters */
-       *status = (uint32_t)mc_dec(cmd.params[0], 0, 32);
+       *status = (u32)mc_dec(cmd.params[0], 0, 32);
        return 0;
 }
 
@@ -528,10 +528,10 @@ int dpbp_get_irq_status(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpbp_clear_irq_status(struct fsl_mc_io *mc_io,
-                         uint32_t cmd_flags,
-                         uint16_t token,
-                         uint8_t irq_index,
-                         uint32_t status)
+                         u32 cmd_flags,
+                         u16 token,
+                         u8 irq_index,
+                         u32 status)
 {
        struct mc_command cmd = { 0 };
 
@@ -556,8 +556,8 @@ int dpbp_clear_irq_status(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpbp_get_attributes(struct fsl_mc_io *mc_io,
-                       uint32_t cmd_flags,
-                       uint16_t token,
+                       u32 cmd_flags,
+                       u16 token,
                        struct dpbp_attr *attr)
 {
        struct mc_command cmd = { 0 };
@@ -573,10 +573,10 @@ int dpbp_get_attributes(struct fsl_mc_io *mc_io,
                return err;
 
        /* retrieve response parameters */
-       attr->bpid = (uint16_t)mc_dec(cmd.params[0], 16, 16);
+       attr->bpid = (u16)mc_dec(cmd.params[0], 16, 16);
        attr->id = (int)mc_dec(cmd.params[0], 32, 32);
-       attr->version.major = (uint16_t)mc_dec(cmd.params[1], 0, 16);
-       attr->version.minor = (uint16_t)mc_dec(cmd.params[1], 16, 16);
+       attr->version.major = (u16)mc_dec(cmd.params[1], 0, 16);
+       attr->version.minor = (u16)mc_dec(cmd.params[1], 16, 16);
        return 0;
 }
 EXPORT_SYMBOL(dpbp_get_attributes);
index 4da1648..b0248f5 100644 (file)
@@ -52,9 +52,9 @@
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpmcp_open(struct fsl_mc_io *mc_io,
-              uint32_t cmd_flags,
+              u32 cmd_flags,
               int dpmcp_id,
-              uint16_t *token)
+              u16 *token)
 {
        struct mc_command cmd = { 0 };
        int err;
@@ -87,8 +87,8 @@ int dpmcp_open(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpmcp_close(struct fsl_mc_io *mc_io,
-               uint32_t cmd_flags,
-               uint16_t token)
+               u32 cmd_flags,
+               u16 token)
 {
        struct mc_command cmd = { 0 };
 
@@ -122,9 +122,9 @@ int dpmcp_close(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpmcp_create(struct fsl_mc_io *mc_io,
-                uint32_t cmd_flags,
+                u32 cmd_flags,
                 const struct dpmcp_cfg *cfg,
-                uint16_t *token)
+                u16 *token)
 {
        struct mc_command cmd = { 0 };
        int err;
@@ -154,8 +154,8 @@ int dpmcp_create(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; error code otherwise.
  */
 int dpmcp_destroy(struct fsl_mc_io *mc_io,
-                 uint32_t cmd_flags,
-                 uint16_t token)
+                 u32 cmd_flags,
+                 u16 token)
 {
        struct mc_command cmd = { 0 };
 
@@ -176,8 +176,8 @@ int dpmcp_destroy(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpmcp_reset(struct fsl_mc_io *mc_io,
-               uint32_t cmd_flags,
-               uint16_t token)
+               u32 cmd_flags,
+               u16 token)
 {
        struct mc_command cmd = { 0 };
 
@@ -200,9 +200,9 @@ int dpmcp_reset(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpmcp_set_irq(struct fsl_mc_io *mc_io,
-                 uint32_t cmd_flags,
-                 uint16_t token,
-                 uint8_t irq_index,
+                 u32 cmd_flags,
+                 u16 token,
+                 u8 irq_index,
                  struct dpmcp_irq_cfg  *irq_cfg)
 {
        struct mc_command cmd = { 0 };
@@ -232,9 +232,9 @@ int dpmcp_set_irq(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpmcp_get_irq(struct fsl_mc_io *mc_io,
-                 uint32_t cmd_flags,
-                 uint16_t token,
-                 uint8_t irq_index,
+                 u32 cmd_flags,
+                 u16 token,
+                 u8 irq_index,
                  int *type,
                  struct dpmcp_irq_cfg  *irq_cfg)
 {
@@ -252,8 +252,8 @@ int dpmcp_get_irq(struct fsl_mc_io *mc_io,
                return err;
 
        /* retrieve response parameters */
-       irq_cfg->val = (uint32_t)mc_dec(cmd.params[0], 0, 32);
-       irq_cfg->paddr = (uint64_t)mc_dec(cmd.params[1], 0, 64);
+       irq_cfg->val = (u32)mc_dec(cmd.params[0], 0, 32);
+       irq_cfg->paddr = (u64)mc_dec(cmd.params[1], 0, 64);
        irq_cfg->user_irq_id = (int)mc_dec(cmd.params[2], 0, 32);
        *type = (int)mc_dec(cmd.params[2], 32, 32);
        return 0;
@@ -275,10 +275,10 @@ int dpmcp_get_irq(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpmcp_set_irq_enable(struct fsl_mc_io *mc_io,
-                        uint32_t cmd_flags,
-                        uint16_t token,
-                        uint8_t irq_index,
-                        uint8_t en)
+                        u32 cmd_flags,
+                        u16 token,
+                        u8 irq_index,
+                        u8 en)
 {
        struct mc_command cmd = { 0 };
 
@@ -303,10 +303,10 @@ int dpmcp_set_irq_enable(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpmcp_get_irq_enable(struct fsl_mc_io *mc_io,
-                        uint32_t cmd_flags,
-                        uint16_t token,
-                        uint8_t irq_index,
-                        uint8_t *en)
+                        u32 cmd_flags,
+                        u16 token,
+                        u8 irq_index,
+                        u8 *en)
 {
        struct mc_command cmd = { 0 };
        int err;
@@ -322,7 +322,7 @@ int dpmcp_get_irq_enable(struct fsl_mc_io *mc_io,
                return err;
 
        /* retrieve response parameters */
-       *en = (uint8_t)mc_dec(cmd.params[0], 0, 8);
+       *en = (u8)mc_dec(cmd.params[0], 0, 8);
        return 0;
 }
 
@@ -343,10 +343,10 @@ int dpmcp_get_irq_enable(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpmcp_set_irq_mask(struct fsl_mc_io *mc_io,
-                      uint32_t cmd_flags,
-                      uint16_t token,
-                      uint8_t irq_index,
-                      uint32_t mask)
+                      u32 cmd_flags,
+                      u16 token,
+                      u8 irq_index,
+                      u32 mask)
 {
        struct mc_command cmd = { 0 };
 
@@ -374,10 +374,10 @@ int dpmcp_set_irq_mask(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpmcp_get_irq_mask(struct fsl_mc_io *mc_io,
-                      uint32_t cmd_flags,
-                      uint16_t token,
-                      uint8_t irq_index,
-                      uint32_t *mask)
+                      u32 cmd_flags,
+                      u16 token,
+                      u8 irq_index,
+                      u32 *mask)
 {
        struct mc_command cmd = { 0 };
        int err;
@@ -393,7 +393,7 @@ int dpmcp_get_irq_mask(struct fsl_mc_io *mc_io,
                return err;
 
        /* retrieve response parameters */
-       *mask = (uint32_t)mc_dec(cmd.params[0], 0, 32);
+       *mask = (u32)mc_dec(cmd.params[0], 0, 32);
        return 0;
 }
 
@@ -411,10 +411,10 @@ int dpmcp_get_irq_mask(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpmcp_get_irq_status(struct fsl_mc_io *mc_io,
-                        uint32_t cmd_flags,
-                        uint16_t token,
-                        uint8_t irq_index,
-                        uint32_t *status)
+                        u32 cmd_flags,
+                        u16 token,
+                        u8 irq_index,
+                        u32 *status)
 {
        struct mc_command cmd = { 0 };
        int err;
@@ -430,7 +430,7 @@ int dpmcp_get_irq_status(struct fsl_mc_io *mc_io,
                return err;
 
        /* retrieve response parameters */
-       *status = (uint32_t)mc_dec(cmd.params[0], 0, 32);
+       *status = (u32)mc_dec(cmd.params[0], 0, 32);
        return 0;
 }
 
@@ -448,10 +448,10 @@ int dpmcp_get_irq_status(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpmcp_clear_irq_status(struct fsl_mc_io *mc_io,
-                          uint32_t cmd_flags,
-                          uint16_t token,
-                          uint8_t irq_index,
-                          uint32_t status)
+                          u32 cmd_flags,
+                          u16 token,
+                          u8 irq_index,
+                          u32 status)
 {
        struct mc_command cmd = { 0 };
 
@@ -476,8 +476,8 @@ int dpmcp_clear_irq_status(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpmcp_get_attributes(struct fsl_mc_io *mc_io,
-                        uint32_t cmd_flags,
-                        uint16_t token,
+                        u32 cmd_flags,
+                        u16 token,
                         struct dpmcp_attr *attr)
 {
        struct mc_command cmd = { 0 };
@@ -494,7 +494,7 @@ int dpmcp_get_attributes(struct fsl_mc_io *mc_io,
 
        /* retrieve response parameters */
        attr->id = (int)mc_dec(cmd.params[0], 32, 32);
-       attr->version.major = (uint16_t)mc_dec(cmd.params[1], 0, 16);
-       attr->version.minor = (uint16_t)mc_dec(cmd.params[1], 16, 16);
+       attr->version.major = (u16)mc_dec(cmd.params[1], 0, 16);
+       attr->version.minor = (u16)mc_dec(cmd.params[1], 16, 16);
        return 0;
 }
index 4a939b4..f633fcd 100644 (file)
@@ -44,7 +44,7 @@
  * Return:     '0' on Success; Error code otherwise.
  */
 int mc_get_version(struct fsl_mc_io *mc_io,
-                  uint32_t cmd_flags,
+                  u32 cmd_flags,
                   struct mc_version *mc_ver_info)
 {
        struct mc_command cmd = { 0 };
@@ -77,7 +77,7 @@ int mc_get_version(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dpmng_get_container_id(struct fsl_mc_io *mc_io,
-                          uint32_t cmd_flags,
+                          u32 cmd_flags,
                           int *container_id)
 {
        struct mc_command cmd = { 0 };
index 7faf23b..a9ead0d 100644 (file)
@@ -126,7 +126,7 @@ static void check_plugged_state_change(struct fsl_mc_device *mc_dev,
                                       struct dprc_obj_desc *obj_desc)
 {
        int error;
-       uint32_t plugged_flag_at_mc =
+       u32 plugged_flag_at_mc =
                        (obj_desc->state & DPRC_OBJ_STATE_PLUGGED);
 
        if (plugged_flag_at_mc !=
index 94181b3..381b9a9 100644 (file)
@@ -46,9 +46,9 @@
  * @warning    Required before any operation on the object.
  */
 int dprc_open(struct fsl_mc_io *mc_io,
-             uint32_t cmd_flags,
+             u32 cmd_flags,
              int container_id,
-             uint16_t *token)
+             u16 *token)
 {
        struct mc_command cmd = { 0 };
        int err;
@@ -82,8 +82,8 @@ EXPORT_SYMBOL(dprc_open);
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_close(struct fsl_mc_io *mc_io,
-              uint32_t cmd_flags,
-              uint16_t token)
+              u32 cmd_flags,
+              u16 token)
 {
        struct mc_command cmd = { 0 };
 
@@ -108,11 +108,11 @@ EXPORT_SYMBOL(dprc_close);
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_create_container(struct fsl_mc_io *mc_io,
-                         uint32_t cmd_flags,
-                         uint16_t token,
+                         u32 cmd_flags,
+                         u16 token,
                          struct dprc_cfg *cfg,
                          int *child_container_id,
-                         uint64_t *child_portal_offset)
+                         u64 *child_portal_offset)
 {
        struct mc_command cmd = { 0 };
        int err;
@@ -176,8 +176,8 @@ int dprc_create_container(struct fsl_mc_io *mc_io,
  *
  */
 int dprc_destroy_container(struct fsl_mc_io *mc_io,
-                          uint32_t cmd_flags,
-                          uint16_t token,
+                          u32 cmd_flags,
+                          u16 token,
                           int child_container_id)
 {
        struct mc_command cmd = { 0 };
@@ -214,8 +214,8 @@ int dprc_destroy_container(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_reset_container(struct fsl_mc_io *mc_io,
-                        uint32_t cmd_flags,
-                        uint16_t token,
+                        u32 cmd_flags,
+                        u16 token,
                         int child_container_id)
 {
        struct mc_command cmd = { 0 };
@@ -242,9 +242,9 @@ int dprc_reset_container(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_get_irq(struct fsl_mc_io *mc_io,
-                uint32_t cmd_flags,
-                uint16_t token,
-                uint8_t irq_index,
+                u32 cmd_flags,
+                u16 token,
+                u8 irq_index,
                 int *type,
                 struct dprc_irq_cfg *irq_cfg)
 {
@@ -282,9 +282,9 @@ int dprc_get_irq(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_set_irq(struct fsl_mc_io *mc_io,
-                uint32_t cmd_flags,
-                uint16_t token,
-                uint8_t irq_index,
+                u32 cmd_flags,
+                u16 token,
+                u8 irq_index,
                 struct dprc_irq_cfg *irq_cfg)
 {
        struct mc_command cmd = { 0 };
@@ -313,10 +313,10 @@ int dprc_set_irq(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_get_irq_enable(struct fsl_mc_io *mc_io,
-                       uint32_t cmd_flags,
-                       uint16_t token,
-                       uint8_t irq_index,
-                       uint8_t *en)
+                       u32 cmd_flags,
+                       u16 token,
+                       u8 irq_index,
+                       u8 *en)
 {
        struct mc_command cmd = { 0 };
        int err;
@@ -353,10 +353,10 @@ int dprc_get_irq_enable(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_set_irq_enable(struct fsl_mc_io *mc_io,
-                       uint32_t cmd_flags,
-                       uint16_t token,
-                       uint8_t irq_index,
-                       uint8_t en)
+                       u32 cmd_flags,
+                       u16 token,
+                       u8 irq_index,
+                       u8 en)
 {
        struct mc_command cmd = { 0 };
 
@@ -384,10 +384,10 @@ int dprc_set_irq_enable(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_get_irq_mask(struct fsl_mc_io *mc_io,
-                     uint32_t cmd_flags,
-                     uint16_t token,
-                     uint8_t irq_index,
-                     uint32_t *mask)
+                     u32 cmd_flags,
+                     u16 token,
+                     u8 irq_index,
+                     u32 *mask)
 {
        struct mc_command cmd = { 0 };
        int err;
@@ -425,10 +425,10 @@ int dprc_get_irq_mask(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_set_irq_mask(struct fsl_mc_io *mc_io,
-                     uint32_t cmd_flags,
-                     uint16_t token,
-                     uint8_t irq_index,
-                     uint32_t mask)
+                     u32 cmd_flags,
+                     u16 token,
+                     u8 irq_index,
+                     u32 mask)
 {
        struct mc_command cmd = { 0 };
 
@@ -455,10 +455,10 @@ int dprc_set_irq_mask(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_get_irq_status(struct fsl_mc_io *mc_io,
-                       uint32_t cmd_flags,
-                       uint16_t token,
-                       uint8_t irq_index,
-                       uint32_t *status)
+                       u32 cmd_flags,
+                       u16 token,
+                       u8 irq_index,
+                       u32 *status)
 {
        struct mc_command cmd = { 0 };
        int err;
@@ -492,10 +492,10 @@ int dprc_get_irq_status(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_clear_irq_status(struct fsl_mc_io *mc_io,
-                         uint32_t cmd_flags,
-                         uint16_t token,
-                         uint8_t irq_index,
-                         uint32_t status)
+                         u32 cmd_flags,
+                         u16 token,
+                         u8 irq_index,
+                         u32 status)
 {
        struct mc_command cmd = { 0 };
 
@@ -519,8 +519,8 @@ int dprc_clear_irq_status(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_get_attributes(struct fsl_mc_io *mc_io,
-                       uint32_t cmd_flags,
-                       uint16_t token,
+                       u32 cmd_flags,
+                       u16 token,
                        struct dprc_attributes *attr)
 {
        struct mc_command cmd = { 0 };
@@ -573,11 +573,11 @@ int dprc_get_attributes(struct fsl_mc_io *mc_io,
  * @warning    Only the parent container is allowed to change a child policy.
  */
 int dprc_set_res_quota(struct fsl_mc_io *mc_io,
-                      uint32_t cmd_flags,
-                      uint16_t token,
+                      u32 cmd_flags,
+                      u16 token,
                       int child_container_id,
                       char *type,
-                      uint16_t quota)
+                      u16 quota)
 {
        struct mc_command cmd = { 0 };
 
@@ -623,11 +623,11 @@ int dprc_set_res_quota(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_get_res_quota(struct fsl_mc_io *mc_io,
-                      uint32_t cmd_flags,
-                      uint16_t token,
+                      u32 cmd_flags,
+                      u16 token,
                       int child_container_id,
                       char *type,
-                      uint16_t *quota)
+                      u16 *quota)
 {
        struct mc_command cmd = { 0 };
        int err;
@@ -697,8 +697,8 @@ int dprc_get_res_quota(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_assign(struct fsl_mc_io *mc_io,
-               uint32_t cmd_flags,
-               uint16_t token,
+               u32 cmd_flags,
+               u16 token,
                int container_id,
                struct dprc_res_req *res_req)
 {
@@ -748,8 +748,8 @@ int dprc_assign(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_unassign(struct fsl_mc_io *mc_io,
-                 uint32_t cmd_flags,
-                 uint16_t token,
+                 u32 cmd_flags,
+                 u16 token,
                  int child_container_id,
                  struct dprc_res_req *res_req)
 {
@@ -794,8 +794,8 @@ int dprc_unassign(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_get_pool_count(struct fsl_mc_io *mc_io,
-                       uint32_t cmd_flags,
-                       uint16_t token,
+                       u32 cmd_flags,
+                       u16 token,
                        int *pool_count)
 {
        struct mc_command cmd = { 0 };
@@ -832,8 +832,8 @@ int dprc_get_pool_count(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_get_pool(struct fsl_mc_io *mc_io,
-                 uint32_t cmd_flags,
-                 uint16_t token,
+                 u32 cmd_flags,
+                 u16 token,
                  int pool_index,
                  char *type)
 {
@@ -882,8 +882,8 @@ int dprc_get_pool(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_get_obj_count(struct fsl_mc_io *mc_io,
-                      uint32_t cmd_flags,
-                      uint16_t token,
+                      u32 cmd_flags,
+                      u16 token,
                       int *obj_count)
 {
        struct mc_command cmd = { 0 };
@@ -921,8 +921,8 @@ EXPORT_SYMBOL(dprc_get_obj_count);
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_get_obj(struct fsl_mc_io *mc_io,
-                uint32_t cmd_flags,
-                uint16_t token,
+                u32 cmd_flags,
+                u16 token,
                 int obj_index,
                 struct dprc_obj_desc *obj_desc)
 {
@@ -998,8 +998,8 @@ EXPORT_SYMBOL(dprc_get_obj);
  *
  */
 int dprc_get_obj_desc(struct fsl_mc_io *mc_io,
-                     uint32_t cmd_flags,
-                     uint16_t token,
+                     u32 cmd_flags,
+                     u16 token,
                      char *obj_type,
                      int obj_id,
                      struct dprc_obj_desc *obj_desc)
@@ -1036,12 +1036,12 @@ int dprc_get_obj_desc(struct fsl_mc_io *mc_io,
 
        /* retrieve response parameters */
        obj_desc->id = (int)mc_dec(cmd.params[0], 32, 32);
-       obj_desc->vendor = (uint16_t)mc_dec(cmd.params[1], 0, 16);
-       obj_desc->vendor = (uint8_t)mc_dec(cmd.params[1], 16, 8);
-       obj_desc->region_count = (uint8_t)mc_dec(cmd.params[1], 24, 8);
-       obj_desc->state = (uint32_t)mc_dec(cmd.params[1], 32, 32);
-       obj_desc->ver_major = (uint16_t)mc_dec(cmd.params[2], 0, 16);
-       obj_desc->ver_minor = (uint16_t)mc_dec(cmd.params[2], 16, 16);
+       obj_desc->vendor = (u16)mc_dec(cmd.params[1], 0, 16);
+       obj_desc->vendor = (u8)mc_dec(cmd.params[1], 16, 8);
+       obj_desc->region_count = (u8)mc_dec(cmd.params[1], 24, 8);
+       obj_desc->state = (u32)mc_dec(cmd.params[1], 32, 32);
+       obj_desc->ver_major = (u16)mc_dec(cmd.params[2], 0, 16);
+       obj_desc->ver_minor = (u16)mc_dec(cmd.params[2], 16, 16);
        obj_desc->type[0] = (char)mc_dec(cmd.params[3], 0, 8);
        obj_desc->type[1] = (char)mc_dec(cmd.params[3], 8, 8);
        obj_desc->type[2] = (char)mc_dec(cmd.params[3], 16, 8);
@@ -1092,11 +1092,11 @@ EXPORT_SYMBOL(dprc_get_obj_desc);
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_set_obj_irq(struct fsl_mc_io *mc_io,
-                    uint32_t cmd_flags,
-                    uint16_t token,
+                    u32 cmd_flags,
+                    u16 token,
                     char *obj_type,
                     int obj_id,
-                    uint8_t irq_index,
+                    u8 irq_index,
                     struct dprc_irq_cfg *irq_cfg)
 {
        struct mc_command cmd = { 0 };
@@ -1147,11 +1147,11 @@ EXPORT_SYMBOL(dprc_set_obj_irq);
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_get_obj_irq(struct fsl_mc_io *mc_io,
-                    uint32_t cmd_flags,
-                    uint16_t token,
+                    u32 cmd_flags,
+                    u16 token,
                     char *obj_type,
                     int obj_id,
-                    uint8_t irq_index,
+                    u8 irq_index,
                     int *type,
                     struct dprc_irq_cfg *irq_cfg)
 {
@@ -1187,8 +1187,8 @@ int dprc_get_obj_irq(struct fsl_mc_io *mc_io,
                return err;
 
        /* retrieve response parameters */
-       irq_cfg->val = (uint32_t)mc_dec(cmd.params[0], 0, 32);
-       irq_cfg->paddr = (uint64_t)mc_dec(cmd.params[1], 0, 64);
+       irq_cfg->val = (u32)mc_dec(cmd.params[0], 0, 32);
+       irq_cfg->paddr = (u64)mc_dec(cmd.params[1], 0, 64);
        irq_cfg->user_irq_id = (int)mc_dec(cmd.params[2], 0, 32);
        *type = (int)mc_dec(cmd.params[2], 32, 32);
 
@@ -1209,8 +1209,8 @@ EXPORT_SYMBOL(dprc_get_obj_irq);
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_get_res_count(struct fsl_mc_io *mc_io,
-                      uint32_t cmd_flags,
-                      uint16_t token,
+                      u32 cmd_flags,
+                      u16 token,
                       char *type,
                       int *res_count)
 {
@@ -1262,8 +1262,8 @@ EXPORT_SYMBOL(dprc_get_res_count);
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_get_res_ids(struct fsl_mc_io *mc_io,
-                    uint32_t cmd_flags,
-                    uint16_t token,
+                    u32 cmd_flags,
+                    u16 token,
                     char *type,
                     struct dprc_res_ids_range_desc *range_desc)
 {
@@ -1320,11 +1320,11 @@ EXPORT_SYMBOL(dprc_get_res_ids);
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_get_obj_region(struct fsl_mc_io *mc_io,
-                       uint32_t cmd_flags,
-                       uint16_t token,
+                       u32 cmd_flags,
+                       u16 token,
                        char *obj_type,
                        int obj_id,
-                       uint8_t region_index,
+                       u8 region_index,
                        struct dprc_region_desc *region_desc)
 {
        struct mc_command cmd = { 0 };
@@ -1377,8 +1377,8 @@ EXPORT_SYMBOL(dprc_get_obj_region);
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_set_obj_label(struct fsl_mc_io *mc_io,
-                      uint32_t cmd_flags,
-                      uint16_t  token,
+                      u32 cmd_flags,
+                      u16  token,
                       char *obj_type,
                       int  obj_id,
                       char *label)
@@ -1449,8 +1449,8 @@ EXPORT_SYMBOL(dprc_set_obj_label);
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_connect(struct fsl_mc_io *mc_io,
-                uint32_t cmd_flags,
-                uint16_t token,
+                u32 cmd_flags,
+                u16 token,
                 const struct dprc_endpoint *endpoint1,
                 const struct dprc_endpoint *endpoint2,
                 const struct dprc_connection_cfg *cfg)
@@ -1514,8 +1514,8 @@ int dprc_connect(struct fsl_mc_io *mc_io,
  * Return:     '0' on Success; Error code otherwise.
  */
 int dprc_disconnect(struct fsl_mc_io *mc_io,
-                   uint32_t cmd_flags,
-                   uint16_t token,
+                   u32 cmd_flags,
+                   u16 token,
                    const struct dprc_endpoint *endpoint)
 {
        struct mc_command cmd = { 0 };
@@ -1560,8 +1560,8 @@ int dprc_disconnect(struct fsl_mc_io *mc_io,
 * Return:     '0' on Success; -ENAVAIL if connection does not exist.
 */
 int dprc_get_connection(struct fsl_mc_io *mc_io,
-                       uint32_t cmd_flags,
-                       uint16_t token,
+                       u32 cmd_flags,
+                       u16 token,
                        const struct dprc_endpoint *endpoint1,
                        struct dprc_endpoint *endpoint2,
                        int *state)
index 376ce80..d087b4c 100644 (file)
@@ -277,7 +277,7 @@ EXPORT_SYMBOL_GPL(fsl_mc_resource_free);
  * portal is allocated from its own MC bus.
  */
 int __must_check fsl_mc_portal_allocate(struct fsl_mc_device *mc_dev,
-                                       uint16_t mc_io_flags,
+                                       u16 mc_io_flags,
                                        struct fsl_mc_io **new_mc_io)
 {
        struct fsl_mc_device *mc_bus_dev;
@@ -363,7 +363,7 @@ EXPORT_SYMBOL_GPL(fsl_mc_portal_free);
 int fsl_mc_portal_reset(struct fsl_mc_io *mc_io)
 {
        int error;
-       uint16_t token;
+       u16 token;
        struct fsl_mc_resource *resource = mc_io->resource;
        struct fsl_mc_device *mc_dev = resource->data;
 
index 9812af4..92e0702 100644 (file)
@@ -207,7 +207,7 @@ void fsl_mc_driver_unregister(struct fsl_mc_driver *mc_driver)
 EXPORT_SYMBOL_GPL(fsl_mc_driver_unregister);
 
 static int get_dprc_icid(struct fsl_mc_io *mc_io,
-                        int container_id, uint16_t *icid)
+                        int container_id, u16 *icid)
 {
        u16 dprc_handle;
        struct dprc_attributes attr;
@@ -507,7 +507,7 @@ static int parse_mc_ranges(struct device *dev,
                           int *mc_addr_cells,
                           int *mc_size_cells,
                           const __be32 **ranges_start,
-                          uint8_t *num_ranges)
+                          u8 *num_ranges)
 {
        const __be32 *prop;
        int range_tuple_cell_count;
@@ -555,7 +555,7 @@ static int parse_mc_ranges(struct device *dev,
 static int get_mc_addr_translation_ranges(struct device *dev,
                                          struct fsl_mc_addr_translation_range
                                                **ranges,
-                                         uint8_t *num_ranges)
+                                         u8 *num_ranges)
 {
        int error;
        int paddr_cells;
index 5737f59..b58b53f 100644 (file)
@@ -52,7 +52,7 @@
 #define MC_CMD_COMPLETION_POLLING_MAX_SLEEP_USECS    500
 
 #define MC_CMD_HDR_READ_CMDID(_hdr) \
-       ((uint16_t)mc_dec((_hdr), MC_CMD_HDR_CMDID_O, MC_CMD_HDR_CMDID_S))
+       ((u16)mc_dec((_hdr), MC_CMD_HDR_CMDID_O, MC_CMD_HDR_CMDID_S))
 
 /**
  * Creates an MC I/O object
@@ -69,9 +69,9 @@
  */
 int __must_check fsl_create_mc_io(struct device *dev,
                                  phys_addr_t mc_portal_phys_addr,
-                                 uint32_t mc_portal_size,
+                                 u32 mc_portal_size,
                                  struct fsl_mc_resource *resource,
-                                 uint32_t flags, struct fsl_mc_io **new_mc_io)
+                                 u32 flags, struct fsl_mc_io **new_mc_io)
 {
        struct fsl_mc_io *mc_io;
        void __iomem *mc_portal_virt_addr;
index 507720e..37ed951 100644 (file)
 struct fsl_mc_io;
 
 int dpbp_open(struct fsl_mc_io *mc_io,
-             uint32_t cmd_flags,
+             u32 cmd_flags,
              int dpbp_id,
-             uint16_t *token);
+             u16 *token);
 
 int dpbp_close(struct fsl_mc_io *mc_io,
-              uint32_t         cmd_flags,
-              uint16_t token);
+              u32              cmd_flags,
+              u16      token);
 
 /**
  * struct dpbp_cfg - Structure representing DPBP configuration
  * @options:   place holder
  */
 struct dpbp_cfg {
-       uint32_t options;
+       u32 options;
 };
 
 int dpbp_create(struct fsl_mc_io       *mc_io,
-               uint32_t                cmd_flags,
+               u32             cmd_flags,
                const struct dpbp_cfg   *cfg,
-               uint16_t                *token);
+               u16             *token);
 
 int dpbp_destroy(struct fsl_mc_io *mc_io,
-                uint32_t cmd_flags,
-                uint16_t token);
+                u32 cmd_flags,
+                u16 token);
 
 int dpbp_enable(struct fsl_mc_io *mc_io,
-               uint32_t cmd_flags,
-               uint16_t token);
+               u32 cmd_flags,
+               u16 token);
 
 int dpbp_disable(struct fsl_mc_io *mc_io,
-                uint32_t cmd_flags,
-                uint16_t token);
+                u32 cmd_flags,
+                u16 token);
 
 int dpbp_is_enabled(struct fsl_mc_io *mc_io,
-                   uint32_t cmd_flags,
-                   uint16_t token,
+                   u32 cmd_flags,
+                   u16 token,
                    int *en);
 
 int dpbp_reset(struct fsl_mc_io *mc_io,
-              uint32_t cmd_flags,
-              uint16_t token);
+              u32 cmd_flags,
+              u16 token);
 
 /**
  * struct dpbp_irq_cfg - IRQ configuration
@@ -88,59 +88,59 @@ int dpbp_reset(struct fsl_mc_io *mc_io,
  * @user_irq_id: A user defined number associated with this IRQ
  */
 struct dpbp_irq_cfg {
-            uint64_t           addr;
-            uint32_t           val;
+            u64                addr;
+            u32                val;
             int                user_irq_id;
 };
 
 int dpbp_set_irq(struct fsl_mc_io      *mc_io,
-                uint32_t               cmd_flags,
-                uint16_t               token,
-                uint8_t                irq_index,
+                u32            cmd_flags,
+                u16            token,
+                u8             irq_index,
                 struct dpbp_irq_cfg    *irq_cfg);
 
 int dpbp_get_irq(struct fsl_mc_io      *mc_io,
-                uint32_t               cmd_flags,
-                uint16_t               token,
-                uint8_t                irq_index,
+                u32            cmd_flags,
+                u16            token,
+                u8             irq_index,
                 int                    *type,
                 struct dpbp_irq_cfg    *irq_cfg);
 
 int dpbp_set_irq_enable(struct fsl_mc_io       *mc_io,
-                       uint32_t                cmd_flags,
-                       uint16_t                token,
-                       uint8_t                 irq_index,
-                       uint8_t                 en);
+                       u32             cmd_flags,
+                       u16             token,
+                       u8                      irq_index,
+                       u8                      en);
 
 int dpbp_get_irq_enable(struct fsl_mc_io       *mc_io,
-                       uint32_t                cmd_flags,
-                       uint16_t                token,
-                       uint8_t                 irq_index,
-                       uint8_t                 *en);
+                       u32             cmd_flags,
+                       u16             token,
+                       u8                      irq_index,
+                       u8                      *en);
 
 int dpbp_set_irq_mask(struct fsl_mc_io *mc_io,
-                     uint32_t          cmd_flags,
-                     uint16_t          token,
-                     uint8_t           irq_index,
-                     uint32_t          mask);
+                     u32               cmd_flags,
+                     u16               token,
+                     u8                irq_index,
+                     u32               mask);
 
 int dpbp_get_irq_mask(struct fsl_mc_io *mc_io,
-                     uint32_t          cmd_flags,
-                     uint16_t          token,
-                     uint8_t           irq_index,
-                     uint32_t          *mask);
+                     u32               cmd_flags,
+                     u16               token,
+                     u8                irq_index,
+                     u32               *mask);
 
 int dpbp_get_irq_status(struct fsl_mc_io       *mc_io,
-                       uint32_t                cmd_flags,
-                       uint16_t                token,
-                       uint8_t                 irq_index,
-                       uint32_t                *status);
+                       u32             cmd_flags,
+                       u16             token,
+                       u8                      irq_index,
+                       u32             *status);
 
 int dpbp_clear_irq_status(struct fsl_mc_io     *mc_io,
-                         uint32_t              cmd_flags,
-                         uint16_t              token,
-                         uint8_t               irq_index,
-                         uint32_t              status);
+                         u32           cmd_flags,
+                         u16           token,
+                         u8            irq_index,
+                         u32           status);
 
 /**
  * struct dpbp_attr - Structure representing DPBP attributes
@@ -157,15 +157,15 @@ struct dpbp_attr {
         * @minor:      DPBP minor version
         */
        struct {
-               uint16_t major;
-               uint16_t minor;
+               u16 major;
+               u16 minor;
        } version;
-       uint16_t bpid;
+       u16 bpid;
 };
 
 int dpbp_get_attributes(struct fsl_mc_io       *mc_io,
-                       uint32_t        cmd_flags,
-                       uint16_t                token,
+                       u32     cmd_flags,
+                       u16             token,
                        struct dpbp_attr        *attr);
 
 /** @} */
index 81e0f9f..e5cfd01 100644 (file)
@@ -53,17 +53,17 @@ struct fsl_mc_io;
  *             and/or bug fixes that have no impact on API
  */
 struct mc_version {
-       uint32_t major;
-       uint32_t minor;
-       uint32_t revision;
+       u32 major;
+       u32 minor;
+       u32 revision;
 };
 
 int mc_get_version(struct fsl_mc_io    *mc_io,
-                  uint32_t             cmd_flags,
+                  u32          cmd_flags,
                   struct mc_version    *mc_ver_info);
 
 int dpmng_get_container_id(struct fsl_mc_io    *mc_io,
-                          uint32_t             cmd_flags,
+                          u32          cmd_flags,
                           int                  *container_id);
 
 #endif /* __FSL_DPMNG_H */
index adeb8b4..c3152f6 100644 (file)
@@ -45,7 +45,7 @@ struct fsl_mc_io;
  * container, in case the ICID is not selected by the user and should be
  * allocated by the DPRC from the pool of ICIDs.
  */
-#define DPRC_GET_ICID_FROM_POOL                        (uint16_t)(~(0))
+#define DPRC_GET_ICID_FROM_POOL                        (u16)(~(0))
 
 /**
  * Set this value as the portal_id value in dprc_cfg structure when creating a
@@ -55,13 +55,13 @@ struct fsl_mc_io;
 #define DPRC_GET_PORTAL_ID_FROM_POOL   (int)(~(0))
 
 int dprc_open(struct fsl_mc_io *mc_io,
-             uint32_t cmd_flags,
+             u32 cmd_flags,
              int container_id,
-             uint16_t *token);
+             u16 *token);
 
 int dprc_close(struct fsl_mc_io *mc_io,
-              uint32_t cmd_flags,
-              uint16_t token);
+              u32 cmd_flags,
+              u16 token);
 
 /**
  * Container general options
@@ -115,27 +115,27 @@ int dprc_close(struct fsl_mc_io *mc_io,
  * @label: Object's label
  */
 struct dprc_cfg {
-       uint16_t icid;
+       u16 icid;
        int portal_id;
-       uint64_t options;
+       u64 options;
        char label[16];
 };
 
 int dprc_create_container(struct fsl_mc_io     *mc_io,
-                         uint32_t              cmd_flags,
-                         uint16_t              token,
+                         u32           cmd_flags,
+                         u16           token,
                          struct dprc_cfg       *cfg,
                          int                   *child_container_id,
-                         uint64_t              *child_portal_offset);
+                         u64           *child_portal_offset);
 
 int dprc_destroy_container(struct fsl_mc_io    *mc_io,
-                          uint32_t             cmd_flags,
-                          uint16_t             token,
+                          u32          cmd_flags,
+                          u16          token,
                           int                  child_container_id);
 
 int dprc_reset_container(struct fsl_mc_io *mc_io,
-                        uint32_t cmd_flags,
-                        uint16_t token,
+                        u32 cmd_flags,
+                        u16 token,
                         int child_container_id);
 
 /* IRQ */
@@ -176,59 +176,59 @@ int dprc_reset_container(struct fsl_mc_io *mc_io,
  * @user_irq_id: A user defined number associated with this IRQ
  */
 struct dprc_irq_cfg {
-            uint64_t           paddr;
-            uint32_t           val;
+            u64                paddr;
+            u32                val;
             int                user_irq_id;
 };
 
 int dprc_set_irq(struct fsl_mc_io      *mc_io,
-                uint32_t               cmd_flags,
-                uint16_t               token,
-                uint8_t                irq_index,
+                u32            cmd_flags,
+                u16            token,
+                u8             irq_index,
                 struct dprc_irq_cfg    *irq_cfg);
 
 int dprc_get_irq(struct fsl_mc_io      *mc_io,
-                uint32_t               cmd_flags,
-                uint16_t               token,
-                uint8_t                irq_index,
+                u32            cmd_flags,
+                u16            token,
+                u8             irq_index,
                 int                    *type,
                 struct dprc_irq_cfg    *irq_cfg);
 
 int dprc_set_irq_enable(struct fsl_mc_io       *mc_io,
-                       uint32_t                cmd_flags,
-                       uint16_t                token,
-                       uint8_t                 irq_index,
-                       uint8_t                 en);
+                       u32             cmd_flags,
+                       u16             token,
+                       u8                      irq_index,
+                       u8                      en);
 
 int dprc_get_irq_enable(struct fsl_mc_io       *mc_io,
-                       uint32_t                cmd_flags,
-                       uint16_t                token,
-                       uint8_t                 irq_index,
-                       uint8_t                 *en);
+                       u32             cmd_flags,
+                       u16             token,
+                       u8                      irq_index,
+                       u8                      *en);
 
 int dprc_set_irq_mask(struct fsl_mc_io *mc_io,
-                     uint32_t          cmd_flags,
-                     uint16_t          token,
-                     uint8_t           irq_index,
-                     uint32_t          mask);
+                     u32               cmd_flags,
+                     u16               token,
+                     u8                irq_index,
+                     u32               mask);
 
 int dprc_get_irq_mask(struct fsl_mc_io *mc_io,
-                     uint32_t          cmd_flags,
-                     uint16_t          token,
-                     uint8_t           irq_index,
-                     uint32_t          *mask);
+                     u32               cmd_flags,
+                     u16               token,
+                     u8                irq_index,
+                     u32               *mask);
 
 int dprc_get_irq_status(struct fsl_mc_io       *mc_io,
-                       uint32_t                cmd_flags,
-                       uint16_t                token,
-                       uint8_t                 irq_index,
-                       uint32_t                *status);
+                       u32             cmd_flags,
+                       u16             token,
+                       u8                      irq_index,
+                       u32             *status);
 
 int dprc_clear_irq_status(struct fsl_mc_io     *mc_io,
-                         uint32_t              cmd_flags,
-                         uint16_t              token,
-                         uint8_t               irq_index,
-                         uint32_t              status);
+                         u32           cmd_flags,
+                         u16           token,
+                         u8            irq_index,
+                         u32           status);
 
 /**
  * struct dprc_attributes - Container attributes
@@ -240,38 +240,38 @@ int dprc_clear_irq_status(struct fsl_mc_io        *mc_io,
  */
 struct dprc_attributes {
        int container_id;
-       uint16_t icid;
+       u16 icid;
        int portal_id;
-       uint64_t options;
+       u64 options;
        /**
         * struct version - DPRC version
         * @major: DPRC major version
         * @minor: DPRC minor version
         */
        struct {
-               uint16_t major;
-               uint16_t minor;
+               u16 major;
+               u16 minor;
        } version;
 };
 
 int dprc_get_attributes(struct fsl_mc_io       *mc_io,
-                       uint32_t                cmd_flags,
-                       uint16_t                token,
+                       u32             cmd_flags,
+                       u16             token,
                        struct dprc_attributes  *attributes);
 
 int dprc_set_res_quota(struct fsl_mc_io        *mc_io,
-                      uint32_t         cmd_flags,
-                      uint16_t         token,
+                      u32              cmd_flags,
+                      u16              token,
                       int              child_container_id,
                       char             *type,
-                      uint16_t         quota);
+                      u16              quota);
 
 int dprc_get_res_quota(struct fsl_mc_io        *mc_io,
-                      uint32_t         cmd_flags,
-                      uint16_t         token,
+                      u32              cmd_flags,
+                      u16              token,
                       int              child_container_id,
                       char             *type,
-                      uint16_t         *quota);
+                      u16              *quota);
 
 /* Resource request options */
 
@@ -312,37 +312,37 @@ int dprc_get_res_quota(struct fsl_mc_io   *mc_io,
  */
 struct dprc_res_req {
        char type[16];
-       uint32_t num;
-       uint32_t options;
+       u32 num;
+       u32 options;
        int id_base_align;
 };
 
 int dprc_assign(struct fsl_mc_io       *mc_io,
-               uint32_t                cmd_flags,
-               uint16_t                token,
+               u32             cmd_flags,
+               u16             token,
                int                     container_id,
                struct dprc_res_req     *res_req);
 
 int dprc_unassign(struct fsl_mc_io     *mc_io,
-                 uint32_t              cmd_flags,
-                 uint16_t              token,
+                 u32           cmd_flags,
+                 u16           token,
                  int                   child_container_id,
                  struct dprc_res_req   *res_req);
 
 int dprc_get_pool_count(struct fsl_mc_io       *mc_io,
-                       uint32_t                cmd_flags,
-                       uint16_t                token,
+                       u32             cmd_flags,
+                       u16             token,
                        int                     *pool_count);
 
 int dprc_get_pool(struct fsl_mc_io     *mc_io,
-                 uint32_t              cmd_flags,
-                 uint16_t              token,
+                 u32           cmd_flags,
+                 u16           token,
                  int                   pool_index,
                  char                  *type);
 
 int dprc_get_obj_count(struct fsl_mc_io *mc_io,
-                      uint32_t         cmd_flags,
-                      uint16_t         token,
+                      u32              cmd_flags,
+                      u16              token,
                       int              *obj_count);
 
 /* Objects Attributes Flags */
@@ -367,48 +367,48 @@ int dprc_get_obj_count(struct fsl_mc_io *mc_io,
 struct dprc_obj_desc {
        char type[16];
        int id;
-       uint16_t vendor;
-       uint16_t ver_major;
-       uint16_t ver_minor;
-       uint8_t irq_count;
-       uint8_t region_count;
-       uint32_t state;
+       u16 vendor;
+       u16 ver_major;
+       u16 ver_minor;
+       u8 irq_count;
+       u8 region_count;
+       u32 state;
        char label[16];
 };
 
 int dprc_get_obj(struct fsl_mc_io      *mc_io,
-                uint32_t               cmd_flags,
-                uint16_t               token,
+                u32            cmd_flags,
+                u16            token,
                 int                    obj_index,
                 struct dprc_obj_desc   *obj_desc);
 
 int dprc_get_obj_desc(struct fsl_mc_io         *mc_io,
-                     uint32_t          cmd_flags,
-                       uint16_t                token,
+                     u32               cmd_flags,
+                       u16             token,
                        char                    *obj_type,
                        int                     obj_id,
                        struct dprc_obj_desc    *obj_desc);
 
 int dprc_set_obj_irq(struct fsl_mc_io          *mc_io,
-                    uint32_t                   cmd_flags,
-                    uint16_t                   token,
+                    u32                        cmd_flags,
+                    u16                        token,
                     char                       *obj_type,
                     int                        obj_id,
-                    uint8_t                    irq_index,
+                    u8                 irq_index,
                     struct dprc_irq_cfg        *irq_cfg);
 
 int dprc_get_obj_irq(struct fsl_mc_io          *mc_io,
-                    uint32_t                   cmd_flags,
-                    uint16_t                   token,
+                    u32                        cmd_flags,
+                    u16                        token,
                     char                       *obj_type,
                     int                        obj_id,
-                    uint8_t                    irq_index,
+                    u8                 irq_index,
                     int                        *type,
                     struct dprc_irq_cfg        *irq_cfg);
 
 int dprc_get_res_count(struct fsl_mc_io        *mc_io,
-                      uint32_t         cmd_flags,
-                      uint16_t         token,
+                      u32              cmd_flags,
+                      u16              token,
                       char             *type,
                       int              *res_count);
 
@@ -440,8 +440,8 @@ struct dprc_res_ids_range_desc {
 };
 
 int dprc_get_res_ids(struct fsl_mc_io                  *mc_io,
-                    uint32_t                           cmd_flags,
-                    uint16_t                           token,
+                    u32                                cmd_flags,
+                    u16                                token,
                     char                               *type,
                     struct dprc_res_ids_range_desc     *range_desc);
 
@@ -470,23 +470,23 @@ enum dprc_region_type {
  * @type: Portal region type
  */
 struct dprc_region_desc {
-       uint32_t base_offset;
-       uint32_t size;
-       uint32_t flags;
+       u32 base_offset;
+       u32 size;
+       u32 flags;
        enum dprc_region_type type;
 };
 
 int dprc_get_obj_region(struct fsl_mc_io       *mc_io,
-                       uint32_t                cmd_flags,
-                       uint16_t                token,
+                       u32             cmd_flags,
+                       u16             token,
                        char                    *obj_type,
                        int                     obj_id,
-                       uint8_t                 region_index,
+                       u8                      region_index,
                        struct dprc_region_desc *region_desc);
 
 int dprc_set_obj_label(struct fsl_mc_io        *mc_io,
-                      uint32_t         cmd_flags,
-                      uint16_t         token,
+                      u32              cmd_flags,
+                      u16              token,
                       char             *obj_type,
                       int              obj_id,
                       char             *label);
@@ -512,25 +512,25 @@ struct dprc_endpoint {
  * @max_rate: Maximum rate (Mbits/s)
  */
 struct dprc_connection_cfg {
-       uint32_t committed_rate;
-       uint32_t max_rate;
+       u32 committed_rate;
+       u32 max_rate;
 };
 
 int dprc_connect(struct fsl_mc_io              *mc_io,
-                uint32_t                       cmd_flags,
-                uint16_t                       token,
+                u32                    cmd_flags,
+                u16                    token,
                 const struct dprc_endpoint     *endpoint1,
                 const struct dprc_endpoint     *endpoint2,
                 const struct dprc_connection_cfg *cfg);
 
 int dprc_disconnect(struct fsl_mc_io           *mc_io,
-                   uint32_t                    cmd_flags,
-                   uint16_t                    token,
+                   u32                 cmd_flags,
+                   u16                 token,
                    const struct dprc_endpoint  *endpoint);
 
 int dprc_get_connection(struct fsl_mc_io               *mc_io,
-                       uint32_t                        cmd_flags,
-                       uint16_t                        token,
+                       u32                     cmd_flags,
+                       u16                     token,
                        const struct dprc_endpoint      *endpoint1,
                        struct dprc_endpoint            *endpoint2,
                        int                             *state);
index af7de6e..65277e3 100644 (file)
 #define MC_CMD_NUM_OF_PARAMS   7
 
 #define MAKE_UMASK64(_width) \
-       ((uint64_t)((_width) < 64 ? ((uint64_t)1 << (_width)) - 1 : -1))
+       ((u64)((_width) < 64 ? ((u64)1 << (_width)) - 1 : -1))
 
-static inline uint64_t mc_enc(int lsoffset, int width, uint64_t val)
+static inline u64 mc_enc(int lsoffset, int width, u64 val)
 {
-       return (uint64_t)(((uint64_t)val & MAKE_UMASK64(width)) << lsoffset);
+       return (u64)(((u64)val & MAKE_UMASK64(width)) << lsoffset);
 }
 
-static inline uint64_t mc_dec(uint64_t val, int lsoffset, int width)
+static inline u64 mc_dec(u64 val, int lsoffset, int width)
 {
-       return (uint64_t)((val >> lsoffset) & MAKE_UMASK64(width));
+       return (u64)((val >> lsoffset) & MAKE_UMASK64(width));
 }
 
 struct mc_command {
-       uint64_t header;
-       uint64_t params[MC_CMD_NUM_OF_PARAMS];
+       u64 header;
+       u64 params[MC_CMD_NUM_OF_PARAMS];
 };
 
 enum mc_cmd_status {
@@ -98,10 +98,10 @@ enum mc_cmd_status {
                MC_CMD_HDR_STATUS_O, MC_CMD_HDR_STATUS_S))
 
 #define MC_CMD_HDR_READ_TOKEN(_hdr) \
-       ((uint16_t)mc_dec((_hdr), MC_CMD_HDR_TOKEN_O, MC_CMD_HDR_TOKEN_S))
+       ((u16)mc_dec((_hdr), MC_CMD_HDR_TOKEN_O, MC_CMD_HDR_TOKEN_S))
 
 #define MC_CMD_HDR_READ_FLAGS(_hdr) \
-       ((uint32_t)mc_dec((_hdr), MC_CMD_HDR_FLAGS_O, MC_CMD_HDR_FLAGS_S))
+       ((u32)mc_dec((_hdr), MC_CMD_HDR_FLAGS_O, MC_CMD_HDR_FLAGS_S))
 
 #define MC_EXT_OP(_ext, _param, _offset, _width, _type, _arg) \
        ((_ext)[_param] |= mc_enc((_offset), (_width), _arg))
@@ -112,11 +112,11 @@ enum mc_cmd_status {
 #define MC_RSP_OP(_cmd, _param, _offset, _width, _type, _arg) \
        (_arg = (_type)mc_dec(_cmd.params[_param], (_offset), (_width)))
 
-static inline uint64_t mc_encode_cmd_header(uint16_t cmd_id,
-                                           uint32_t cmd_flags,
-                                           uint16_t token)
+static inline u64 mc_encode_cmd_header(u16 cmd_id,
+                                      u32 cmd_flags,
+                                      u16 token)
 {
-       uint64_t hdr;
+       u64 hdr;
 
        hdr = mc_enc(MC_CMD_HDR_CMDID_O, MC_CMD_HDR_CMDID_S, cmd_id);
        hdr |= mc_enc(MC_CMD_HDR_FLAGS_O, MC_CMD_HDR_FLAGS_S,
index 8aef55c..2c4cc79 100644 (file)
@@ -34,7 +34,7 @@
  */
 struct fsl_mc {
        struct fsl_mc_device *root_mc_bus_dev;
-       uint8_t num_translation_ranges;
+       u8 num_translation_ranges;
        struct fsl_mc_addr_translation_range *translation_ranges;
 };
 
@@ -49,8 +49,8 @@ struct fsl_mc {
  */
 struct fsl_mc_addr_translation_range {
        enum dprc_region_type mc_region_type;
-       uint64_t start_mc_offset;
-       uint64_t end_mc_offset;
+       u64 start_mc_offset;
+       u64 end_mc_offset;
        phys_addr_t start_phys_addr;
 };
 
index cb3b5a2..939b7d3 100644 (file)
@@ -56,8 +56,8 @@ struct mc_command;
  */
 struct fsl_mc_io {
        struct device *dev;
-       uint32_t flags;
-       uint32_t portal_size;
+       u32 flags;
+       u32 portal_size;
        phys_addr_t portal_phys_addr;
        void __iomem *portal_virt_addr;
        struct fsl_mc_resource *resource;
@@ -65,9 +65,9 @@ struct fsl_mc_io {
 
 int __must_check fsl_create_mc_io(struct device *dev,
                                  phys_addr_t mc_portal_phys_addr,
-                                 uint32_t mc_portal_size,
+                                 u32 mc_portal_size,
                                  struct fsl_mc_resource *resource,
-                                 uint32_t flags, struct fsl_mc_io **new_mc_io);
+                                 u32 flags, struct fsl_mc_io **new_mc_io);
 
 void fsl_destroy_mc_io(struct fsl_mc_io *mc_io);
 
index fa02ef0..860bf26 100644 (file)
@@ -59,10 +59,10 @@ struct fsl_mc_driver {
  * a MC object device driver. The last entry of the table has vendor set to 0x0
  */
 struct fsl_mc_device_match_id {
-       uint16_t vendor;
+       u16 vendor;
        const char obj_type[16];
-       uint32_t ver_major;
-       uint32_t ver_minor;
+       u32 ver_major;
+       u32 ver_minor;
 };
 
 /**
@@ -148,10 +148,10 @@ struct fsl_mc_resource {
  */
 struct fsl_mc_device {
        struct device dev;
-       uint64_t dma_mask;
-       uint16_t flags;
-       uint16_t icid;
-       uint16_t mc_handle;
+       u64 dma_mask;
+       u16 flags;
+       u16 icid;
+       u16 mc_handle;
        struct fsl_mc_io *mc_io;
        struct dprc_obj_desc obj_desc;
        struct resource *regions;
@@ -183,7 +183,7 @@ int __must_check __fsl_mc_driver_register(struct fsl_mc_driver *fsl_mc_driver,
 void fsl_mc_driver_unregister(struct fsl_mc_driver *driver);
 
 int __must_check fsl_mc_portal_allocate(struct fsl_mc_device *mc_dev,
-                                       uint16_t mc_io_flags,
+                                       u16 mc_io_flags,
                                        struct fsl_mc_io **new_mc_io);
 
 void fsl_mc_portal_free(struct fsl_mc_io *mc_io);