Message ID | 1345666211-25992-1-git-send-email-festevam@gmail.com |
---|---|
State | Accepted |
Commit | a123312f4de2d6d29a04f454db9b760ccfe602ea |
Delegated to: | Stefano Babic |
Headers | show |
Dear Fabio Estevam, > From: Fabio Estevam <fabio.estevam@freescale.com>> > > For representing a timeout value, it makes more sense to pass it as > 'unsigned int'. > > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Marek Vasut <marex@denx.de> > --- > arch/arm/cpu/arm926ejs/mxs/mxs.c | 6 ++++-- > arch/arm/include/asm/arch-mxs/sys_proto.h | 4 ++-- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c > b/arch/arm/cpu/arm926ejs/mxs/mxs.c index c028e5e..19c79f2 100644 > --- a/arch/arm/cpu/arm926ejs/mxs/mxs.c > +++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c > @@ -81,7 +81,8 @@ void enable_caches(void) > #endif > } > > -int mxs_wait_mask_set(struct mxs_register_32 *reg, uint32_t mask, int > timeout) +int mxs_wait_mask_set(struct mxs_register_32 *reg, uint32_t > mask, unsigned + int timeout) > { > while (--timeout) { > if ((readl(®->reg) & mask) == mask) > @@ -92,7 +93,8 @@ int mxs_wait_mask_set(struct mxs_register_32 *reg, > uint32_t mask, int timeout) return !timeout; > } > > -int mxs_wait_mask_clr(struct mxs_register_32 *reg, uint32_t mask, int > timeout) +int mxs_wait_mask_clr(struct mxs_register_32 *reg, uint32_t > mask, unsigned + int timeout) > { > while (--timeout) { > if ((readl(®->reg) & mask) == 0) > diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h > b/arch/arm/include/asm/arch-mxs/sys_proto.h index 4610363..983b888 100644 > --- a/arch/arm/include/asm/arch-mxs/sys_proto.h > +++ b/arch/arm/include/asm/arch-mxs/sys_proto.h > @@ -26,10 +26,10 @@ > int mxs_reset_block(struct mxs_register_32 *reg); > int mxs_wait_mask_set(struct mxs_register_32 *reg, > uint32_t mask, > - int timeout); > + unsigned int timeout); > int mxs_wait_mask_clr(struct mxs_register_32 *reg, > uint32_t mask, > - int timeout); > + unsigned int timeout); > > int mxsmmc_initialize(bd_t *bis, int id, int (*wp)(int)); Best regards, Marek Vasut
On 22/08/2012 22:10, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@freescale.com>> > > For representing a timeout value, it makes more sense to pass it as > 'unsigned int'. > > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> > --- > arch/arm/cpu/arm926ejs/mxs/mxs.c | 6 ++++-- > arch/arm/include/asm/arch-mxs/sys_proto.h | 4 ++-- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c > index c028e5e..19c79f2 100644 > --- a/arch/arm/cpu/arm926ejs/mxs/mxs.c > +++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c > @@ -81,7 +81,8 @@ void enable_caches(void) > #endif > } > > -int mxs_wait_mask_set(struct mxs_register_32 *reg, uint32_t mask, int timeout) > +int mxs_wait_mask_set(struct mxs_register_32 *reg, uint32_t mask, unsigned > + int timeout) > { > while (--timeout) { > if ((readl(®->reg) & mask) == mask) > @@ -92,7 +93,8 @@ int mxs_wait_mask_set(struct mxs_register_32 *reg, uint32_t mask, int timeout) > return !timeout; > } > > -int mxs_wait_mask_clr(struct mxs_register_32 *reg, uint32_t mask, int timeout) > +int mxs_wait_mask_clr(struct mxs_register_32 *reg, uint32_t mask, unsigned > + int timeout) > { > while (--timeout) { > if ((readl(®->reg) & mask) == 0) > diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h > index 4610363..983b888 100644 > --- a/arch/arm/include/asm/arch-mxs/sys_proto.h > +++ b/arch/arm/include/asm/arch-mxs/sys_proto.h > @@ -26,10 +26,10 @@ > int mxs_reset_block(struct mxs_register_32 *reg); > int mxs_wait_mask_set(struct mxs_register_32 *reg, > uint32_t mask, > - int timeout); > + unsigned int timeout); > int mxs_wait_mask_clr(struct mxs_register_32 *reg, > uint32_t mask, > - int timeout); > + unsigned int timeout); > > int mxsmmc_initialize(bd_t *bis, int id, int (*wp)(int)); > > Acked-by: Stefano Babic <sbabic@denx.de> Best regards, Stefano Babic
On 22/08/2012 22:10, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@freescale.com>> > > For representing a timeout value, it makes more sense to pass it as > 'unsigned int'. > > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> > --- > arch/arm/cpu/arm926ejs/mxs/mxs.c | 6 ++++-- > arch/arm/include/asm/arch-mxs/sys_proto.h | 4 ++-- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c > index c028e5e..19c79f2 100644 > --- a/arch/arm/cpu/arm926ejs/mxs/mxs.c > +++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c > @@ -81,7 +81,8 @@ void enable_caches(void) > #endif > } > > -int mxs_wait_mask_set(struct mxs_register_32 *reg, uint32_t mask, int timeout) > +int mxs_wait_mask_set(struct mxs_register_32 *reg, uint32_t mask, unsigned > + int timeout) > { > while (--timeout) { > if ((readl(®->reg) & mask) == mask) > @@ -92,7 +93,8 @@ int mxs_wait_mask_set(struct mxs_register_32 *reg, uint32_t mask, int timeout) > return !timeout; > } > > -int mxs_wait_mask_clr(struct mxs_register_32 *reg, uint32_t mask, int timeout) > +int mxs_wait_mask_clr(struct mxs_register_32 *reg, uint32_t mask, unsigned > + int timeout) > { > while (--timeout) { > if ((readl(®->reg) & mask) == 0) > diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h > index 4610363..983b888 100644 > --- a/arch/arm/include/asm/arch-mxs/sys_proto.h > +++ b/arch/arm/include/asm/arch-mxs/sys_proto.h > @@ -26,10 +26,10 @@ > int mxs_reset_block(struct mxs_register_32 *reg); > int mxs_wait_mask_set(struct mxs_register_32 *reg, > uint32_t mask, > - int timeout); > + unsigned int timeout); > int mxs_wait_mask_clr(struct mxs_register_32 *reg, > uint32_t mask, > - int timeout); > + unsigned int timeout); > > int mxsmmc_initialize(bd_t *bis, int id, int (*wp)(int)); > > Applied to u-boot-imx, thanks. Best regards, Stefano Babic
diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c index c028e5e..19c79f2 100644 --- a/arch/arm/cpu/arm926ejs/mxs/mxs.c +++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c @@ -81,7 +81,8 @@ void enable_caches(void) #endif } -int mxs_wait_mask_set(struct mxs_register_32 *reg, uint32_t mask, int timeout) +int mxs_wait_mask_set(struct mxs_register_32 *reg, uint32_t mask, unsigned + int timeout) { while (--timeout) { if ((readl(®->reg) & mask) == mask) @@ -92,7 +93,8 @@ int mxs_wait_mask_set(struct mxs_register_32 *reg, uint32_t mask, int timeout) return !timeout; } -int mxs_wait_mask_clr(struct mxs_register_32 *reg, uint32_t mask, int timeout) +int mxs_wait_mask_clr(struct mxs_register_32 *reg, uint32_t mask, unsigned + int timeout) { while (--timeout) { if ((readl(®->reg) & mask) == 0) diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h index 4610363..983b888 100644 --- a/arch/arm/include/asm/arch-mxs/sys_proto.h +++ b/arch/arm/include/asm/arch-mxs/sys_proto.h @@ -26,10 +26,10 @@ int mxs_reset_block(struct mxs_register_32 *reg); int mxs_wait_mask_set(struct mxs_register_32 *reg, uint32_t mask, - int timeout); + unsigned int timeout); int mxs_wait_mask_clr(struct mxs_register_32 *reg, uint32_t mask, - int timeout); + unsigned int timeout); int mxsmmc_initialize(bd_t *bis, int id, int (*wp)(int));