> -----Original Message----- > From: Shiva Kerdel [mailto:sh...@exdev.nl] > Sent: Monday, November 07, 2016 6:01 AM > To: german.riv...@freescale.com > Cc: Stuart Yoder <stuart.yo...@nxp.com>; gre...@linuxfoundation.org; German > Rivera > <german.riv...@nxp.com>; itai.k...@nxp.com; tred...@nvidia.com; Bharat > Bhushan <bharat.bhus...@nxp.com>; > Nipun Gupta <nipun.gu...@nxp.com>; linux-kernel@vger.kernel.org; > de...@driverdev.osuosl.org; Shiva > Kerdel <sh...@exdev.nl> > 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 <sh...@exdev.nl> > --- > 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
