Follow the kernel type preferrences of using 'u32' over 'uint32_t'.
Signed-off-by: Shiva Kerdel <[email protected]>
---
drivers/staging/fsl-mc/bus/dpmcp.h | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/staging/fsl-mc/bus/dpmcp.h b/drivers/staging/fsl-mc/bus/dpmcp.h
index fe79d4d..ad41428 100644
--- a/drivers/staging/fsl-mc/bus/dpmcp.h
+++ b/drivers/staging/fsl-mc/bus/dpmcp.h
@@ -39,7 +39,7 @@
struct fsl_mc_io;
int dpmcp_open(struct fsl_mc_io *mc_io,
- uint32_t cmd_flags,
+ u32 cmd_flags,
int dpmcp_id,
uint16_t *token);
@@ -47,7 +47,7 @@ int dpmcp_open(struct fsl_mc_io *mc_io,
#define DPMCP_GET_PORTAL_ID_FROM_POOL (-1)
int dpmcp_close(struct fsl_mc_io *mc_io,
- uint32_t cmd_flags,
+ u32 cmd_flags,
uint16_t token);
/**
@@ -60,16 +60,16 @@ struct dpmcp_cfg {
};
int dpmcp_create(struct fsl_mc_io *mc_io,
- uint32_t cmd_flags,
+ u32 cmd_flags,
const struct dpmcp_cfg *cfg,
uint16_t *token);
int dpmcp_destroy(struct fsl_mc_io *mc_io,
- uint32_t cmd_flags,
+ u32 cmd_flags,
uint16_t token);
int dpmcp_reset(struct fsl_mc_io *mc_io,
- uint32_t cmd_flags,
+ u32 cmd_flags,
uint16_t token);
/* IRQ */
@@ -86,52 +86,52 @@ int dpmcp_reset(struct fsl_mc_io *mc_io,
*/
struct dpmcp_irq_cfg {
uint64_t paddr;
- uint32_t val;
+ u32 val;
int irq_num;
};
int dpmcp_set_irq(struct fsl_mc_io *mc_io,
- uint32_t cmd_flags,
+ u32 cmd_flags,
uint16_t token,
uint8_t irq_index,
struct dpmcp_irq_cfg *irq_cfg);
int dpmcp_get_irq(struct fsl_mc_io *mc_io,
- uint32_t cmd_flags,
+ u32 cmd_flags,
uint16_t token,
uint8_t irq_index,
int *type,
struct dpmcp_irq_cfg *irq_cfg);
int dpmcp_set_irq_enable(struct fsl_mc_io *mc_io,
- uint32_t cmd_flags,
+ u32 cmd_flags,
uint16_t token,
uint8_t irq_index,
uint8_t en);
int dpmcp_get_irq_enable(struct fsl_mc_io *mc_io,
- uint32_t cmd_flags,
+ u32 cmd_flags,
uint16_t token,
uint8_t irq_index,
uint8_t *en);
int dpmcp_set_irq_mask(struct fsl_mc_io *mc_io,
- uint32_t cmd_flags,
+ u32 cmd_flags,
uint16_t token,
uint8_t irq_index,
- uint32_t mask);
+ u32 mask);
int dpmcp_get_irq_mask(struct fsl_mc_io *mc_io,
- uint32_t cmd_flags,
+ u32 cmd_flags,
uint16_t token,
uint8_t irq_index,
- uint32_t *mask);
+ u32 *mask);
int dpmcp_get_irq_status(struct fsl_mc_io *mc_io,
- uint32_t cmd_flags,
+ u32 cmd_flags,
uint16_t token,
uint8_t irq_index,
- uint32_t *status);
+ u32 *status);
/**
* struct dpmcp_attr - Structure representing DPMCP attributes
@@ -152,7 +152,7 @@ struct dpmcp_attr {
};
int dpmcp_get_attributes(struct fsl_mc_io *mc_io,
- uint32_t cmd_flags,
+ u32 cmd_flags,
uint16_t token,
struct dpmcp_attr *attr);
--
2.10.2
Follow the kernel type preferrences of using 'u64' over 'uint64_t'.
Signed-off-by: Shiva Kerdel <[email protected]>
---
drivers/staging/fsl-mc/bus/dpmcp.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/fsl-mc/bus/dpmcp.h b/drivers/staging/fsl-mc/bus/dpmcp.h
index 854621a..c4e5d05 100644
--- a/drivers/staging/fsl-mc/bus/dpmcp.h
+++ b/drivers/staging/fsl-mc/bus/dpmcp.h
@@ -85,7 +85,7 @@ int dpmcp_reset(struct fsl_mc_io *mc_io,
* @irq_num: A user defined number associated with this IRQ
*/
struct dpmcp_irq_cfg {
- uint64_t paddr;
+ u64 paddr;
u32 val;
int irq_num;
};
--
2.10.2
Follow the kernel type preferrences of using 's16' over 'int16_t'.
Signed-off-by: Shiva Kerdel <[email protected]>
---
drivers/staging/fsl-mc/include/mc-bus.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/fsl-mc/include/mc-bus.h b/drivers/staging/fsl-mc/include/mc-bus.h
index 170684a..ff1d47e 100644
--- a/drivers/staging/fsl-mc/include/mc-bus.h
+++ b/drivers/staging/fsl-mc/include/mc-bus.h
@@ -42,8 +42,8 @@ struct msi_domain_info;
*/
struct fsl_mc_resource_pool {
enum fsl_mc_pool_type type;
- int16_t max_count;
- int16_t free_count;
+ s16 max_count;
+ s16 free_count;
struct mutex mutex; /* serializes access to free_list */
struct list_head free_list;
struct fsl_mc_bus *mc_bus;
--
2.10.2
Follow the kernel type preferrences of using 's32' over 'int32_t'.
Signed-off-by: Shiva Kerdel <[email protected]>
---
drivers/staging/fsl-mc/include/mc.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/fsl-mc/include/mc.h b/drivers/staging/fsl-mc/include/mc.h
index f6e720e..5c3cc42 100644
--- a/drivers/staging/fsl-mc/include/mc.h
+++ b/drivers/staging/fsl-mc/include/mc.h
@@ -81,7 +81,7 @@ enum fsl_mc_pool_type {
*/
struct fsl_mc_resource {
enum fsl_mc_pool_type type;
- int32_t id;
+ s32 id;
void *data;
struct fsl_mc_resource_pool *parent_pool;
struct list_head node;
--
2.10.2
Follow the kernel type preferrences of using 'u16' over 'uint16_t'.
Signed-off-by: Shiva Kerdel <[email protected]>
---
drivers/staging/fsl-mc/bus/dpmcp.h | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/fsl-mc/bus/dpmcp.h b/drivers/staging/fsl-mc/bus/dpmcp.h
index ad41428..a801061 100644
--- a/drivers/staging/fsl-mc/bus/dpmcp.h
+++ b/drivers/staging/fsl-mc/bus/dpmcp.h
@@ -41,14 +41,14 @@ struct fsl_mc_io;
int dpmcp_open(struct fsl_mc_io *mc_io,
u32 cmd_flags,
int dpmcp_id,
- uint16_t *token);
+ u16 *token);
/* Get portal ID from pool */
#define DPMCP_GET_PORTAL_ID_FROM_POOL (-1)
int dpmcp_close(struct fsl_mc_io *mc_io,
u32 cmd_flags,
- uint16_t token);
+ u16 token);
/**
* struct dpmcp_cfg - Structure representing DPMCP configuration
@@ -62,15 +62,15 @@ struct dpmcp_cfg {
int dpmcp_create(struct fsl_mc_io *mc_io,
u32 cmd_flags,
const struct dpmcp_cfg *cfg,
- uint16_t *token);
+ u16 *token);
int dpmcp_destroy(struct fsl_mc_io *mc_io,
u32 cmd_flags,
- uint16_t token);
+ u16 token);
int dpmcp_reset(struct fsl_mc_io *mc_io,
u32 cmd_flags,
- uint16_t token);
+ u16 token);
/* IRQ */
/* IRQ Index */
@@ -92,44 +92,44 @@ struct dpmcp_irq_cfg {
int dpmcp_set_irq(struct fsl_mc_io *mc_io,
u32 cmd_flags,
- uint16_t token,
+ u16 token,
uint8_t irq_index,
struct dpmcp_irq_cfg *irq_cfg);
int dpmcp_get_irq(struct fsl_mc_io *mc_io,
u32 cmd_flags,
- uint16_t token,
+ u16 token,
uint8_t irq_index,
int *type,
struct dpmcp_irq_cfg *irq_cfg);
int dpmcp_set_irq_enable(struct fsl_mc_io *mc_io,
u32 cmd_flags,
- uint16_t token,
+ u16 token,
uint8_t irq_index,
uint8_t en);
int dpmcp_get_irq_enable(struct fsl_mc_io *mc_io,
u32 cmd_flags,
- uint16_t token,
+ u16 token,
uint8_t irq_index,
uint8_t *en);
int dpmcp_set_irq_mask(struct fsl_mc_io *mc_io,
u32 cmd_flags,
- uint16_t token,
+ u16 token,
uint8_t irq_index,
u32 mask);
int dpmcp_get_irq_mask(struct fsl_mc_io *mc_io,
u32 cmd_flags,
- uint16_t token,
+ u16 token,
uint8_t irq_index,
u32 *mask);
int dpmcp_get_irq_status(struct fsl_mc_io *mc_io,
u32 cmd_flags,
- uint16_t token,
+ u16 token,
uint8_t irq_index,
u32 *status);
@@ -146,14 +146,14 @@ struct dpmcp_attr {
* @minor: DPMCP minor version
*/
struct {
- uint16_t major;
- uint16_t minor;
+ u16 major;
+ u16 minor;
} version;
};
int dpmcp_get_attributes(struct fsl_mc_io *mc_io,
u32 cmd_flags,
- uint16_t token,
+ u16 token,
struct dpmcp_attr *attr);
#endif /* __FSL_DPMCP_H */
--
2.10.2
Follow the kernel type preferrences of using 'u8' over 'uint8_t'.
Signed-off-by: Shiva Kerdel <[email protected]>
---
drivers/staging/fsl-mc/bus/dpmcp.h | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/fsl-mc/bus/dpmcp.h b/drivers/staging/fsl-mc/bus/dpmcp.h
index a801061..854621a 100644
--- a/drivers/staging/fsl-mc/bus/dpmcp.h
+++ b/drivers/staging/fsl-mc/bus/dpmcp.h
@@ -93,44 +93,44 @@ struct dpmcp_irq_cfg {
int dpmcp_set_irq(struct fsl_mc_io *mc_io,
u32 cmd_flags,
u16 token,
- uint8_t irq_index,
+ u8 irq_index,
struct dpmcp_irq_cfg *irq_cfg);
int dpmcp_get_irq(struct fsl_mc_io *mc_io,
u32 cmd_flags,
u16 token,
- uint8_t irq_index,
+ u8 irq_index,
int *type,
struct dpmcp_irq_cfg *irq_cfg);
int dpmcp_set_irq_enable(struct fsl_mc_io *mc_io,
u32 cmd_flags,
u16 token,
- uint8_t irq_index,
- uint8_t en);
+ u8 irq_index,
+ u8 en);
int dpmcp_get_irq_enable(struct fsl_mc_io *mc_io,
u32 cmd_flags,
u16 token,
- uint8_t irq_index,
- uint8_t *en);
+ u8 irq_index,
+ u8 *en);
int dpmcp_set_irq_mask(struct fsl_mc_io *mc_io,
u32 cmd_flags,
u16 token,
- uint8_t irq_index,
+ u8 irq_index,
u32 mask);
int dpmcp_get_irq_mask(struct fsl_mc_io *mc_io,
u32 cmd_flags,
u16 token,
- uint8_t irq_index,
+ u8 irq_index,
u32 *mask);
int dpmcp_get_irq_status(struct fsl_mc_io *mc_io,
u32 cmd_flags,
u16 token,
- uint8_t irq_index,
+ u8 irq_index,
u32 *status);
/**
--
2.10.2
> -----Original Message-----
> From: Shiva Kerdel [mailto:[email protected]]
> Sent: Monday, November 07, 2016 6:01 AM
> To: [email protected]
> Cc: Stuart Yoder <[email protected]>; [email protected]; German Rivera
> <[email protected]>; [email protected]; [email protected]; Bharat Bhushan <[email protected]>;
> Nipun Gupta <[email protected]>; [email protected]; [email protected]; Shiva
> Kerdel <[email protected]>
> Subject: [PATCH 1/6] Staging: fsl-mc: bus: dpmcp: Kernel type 'u32' preferred over 'uint32_t'
>
> Follow the kernel type preferrences of using 'u32' over 'uint32_t'.
>
> Signed-off-by: Shiva Kerdel <[email protected]>
> ---
> drivers/staging/fsl-mc/bus/dpmcp.h | 34 +++++++++++++++++-----------------
> 1 file changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/staging/fsl-mc/bus/dpmcp.h b/drivers/staging/fsl-mc/bus/dpmcp.h
> index fe79d4d..ad41428 100644
> --- a/drivers/staging/fsl-mc/bus/dpmcp.h
> +++ b/drivers/staging/fsl-mc/bus/dpmcp.h
> @@ -39,7 +39,7 @@
> struct fsl_mc_io;
>
> int dpmcp_open(struct fsl_mc_io *mc_io,
> - uint32_t cmd_flags,
> + u32 cmd_flags,
> int dpmcp_id,
> uint16_t *token);
>
> @@ -47,7 +47,7 @@ int dpmcp_open(struct fsl_mc_io *mc_io,
> #define DPMCP_GET_PORTAL_ID_FROM_POOL (-1)
>
> int dpmcp_close(struct fsl_mc_io *mc_io,
> - uint32_t cmd_flags,
> + u32 cmd_flags,
> uint16_t token);
>
> /**
> @@ -60,16 +60,16 @@ struct dpmcp_cfg {
> };
>
> int dpmcp_create(struct fsl_mc_io *mc_io,
> - uint32_t cmd_flags,
> + u32 cmd_flags,
> const struct dpmcp_cfg *cfg,
> uint16_t *token);
>
> int dpmcp_destroy(struct fsl_mc_io *mc_io,
> - uint32_t cmd_flags,
> + u32 cmd_flags,
> uint16_t token);
>
> int dpmcp_reset(struct fsl_mc_io *mc_io,
> - uint32_t cmd_flags,
> + u32 cmd_flags,
> uint16_t token);
>
> /* IRQ */
> @@ -86,52 +86,52 @@ int dpmcp_reset(struct fsl_mc_io *mc_io,
> */
> struct dpmcp_irq_cfg {
> uint64_t paddr;
> - uint32_t val;
> + u32 val;
> int irq_num;
> };
>
> int dpmcp_set_irq(struct fsl_mc_io *mc_io,
> - uint32_t cmd_flags,
> + u32 cmd_flags,
> uint16_t token,
> uint8_t irq_index,
> struct dpmcp_irq_cfg *irq_cfg);
>
> int dpmcp_get_irq(struct fsl_mc_io *mc_io,
> - uint32_t cmd_flags,
> + u32 cmd_flags,
> uint16_t token,
> uint8_t irq_index,
> int *type,
> struct dpmcp_irq_cfg *irq_cfg);
>
> int dpmcp_set_irq_enable(struct fsl_mc_io *mc_io,
> - uint32_t cmd_flags,
> + u32 cmd_flags,
> uint16_t token,
> uint8_t irq_index,
> uint8_t en);
>
> int dpmcp_get_irq_enable(struct fsl_mc_io *mc_io,
> - uint32_t cmd_flags,
> + u32 cmd_flags,
> uint16_t token,
> uint8_t irq_index,
> uint8_t *en);
>
> int dpmcp_set_irq_mask(struct fsl_mc_io *mc_io,
> - uint32_t cmd_flags,
> + u32 cmd_flags,
> uint16_t token,
> uint8_t irq_index,
> - uint32_t mask);
> + u32 mask);
>
> int dpmcp_get_irq_mask(struct fsl_mc_io *mc_io,
> - uint32_t cmd_flags,
> + u32 cmd_flags,
> uint16_t token,
> uint8_t irq_index,
> - uint32_t *mask);
> + u32 *mask);
>
> int dpmcp_get_irq_status(struct fsl_mc_io *mc_io,
> - uint32_t cmd_flags,
> + u32 cmd_flags,
> uint16_t token,
> uint8_t irq_index,
> - uint32_t *status);
> + u32 *status);
>
> /**
> * struct dpmcp_attr - Structure representing DPMCP attributes
> @@ -152,7 +152,7 @@ struct dpmcp_attr {
> };
>
> int dpmcp_get_attributes(struct fsl_mc_io *mc_io,
> - uint32_t cmd_flags,
> + u32 cmd_flags,
> uint16_t token,
> struct dpmcp_attr *attr);
When you respin a patch, please put the new version number in the
subject. i.e.:
[PATCH v2 1/6] Staging: fsl-mc: bus: dpmcp: Kernel type 'u32' preferred over 'uint32_t'
Can you please rebase this patch and the ones that follow on
Greg's latest staging-next branch.
In the first patch I looked at, the changes you are proposing
were already merged in 3e93e354 in staging-next.
"staging: fsl-mc: cleanup: convert uintX_t types to uX"
I think you are working on an out of date codebase.
Thanks,
Stuart