Skip to contentSkip to conversation

mxs: Convert timeout parameter to 'unsigned int'

PATCH New Fabio Estevam 3 participants 4 messages Aug 22, 2012 – Aug 27, 2012

Subsystems (2)
Arm (32-bit) Arm i.MX and Layerscape
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/1 mxs: Convert timeout parameter to 'unsigned int'

From: Fabio Estevam <[email protected]>>

For representing a timeout value, it makes more sense to pass it as 'unsigned int'.

Signed-off-by Fabio Estevam <[email protected]>
---
 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(-)
arch/arm/cpu/arm926ejs/mxs/mxs.c +4 -2
index c028e5e..19c79f2 100644
@@ -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->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->reg) & mask) == 0)
arch/arm/include/asm/arch-mxs/sys_proto.h +2 -2
index 4610363..983b888 100644
@@ -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));
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 mxs: Convert timeout parameter to 'unsigned int'

Dear Fabio Estevam,

Quoted 6 lines

From: Fabio Estevam <[email protected]>>

For representing a timeout value, it makes more sense to pass it as 'unsigned int'.

Signed-off-by Fabio Estevam <[email protected]>
Acked-by Marek Vasut <[email protected]>
Quoted 14 lines
---
 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(-)
(quoted diff) +0 -0

b/arch/arm/cpu/arm926ejs/mxs/mxs.c index c028e5e..19c79f2 100644

arch/arm/cpu/arm926ejs/mxs/mxs.c +0 -1
@@ -81,7 +81,8 @@ void enable_caches(void)
 #endif
 }
 
-int mxs_wait_mask_set(struct mxs_register_32 *reg, uint32_t mask, int
Quoted 2 lines

timeout) +int mxs_wait_mask_set(struct mxs_register_32 *reg, uint32_t mask, unsigned +

int timeout)

Quoted 10 lines

{

arch/arm/cpu/arm926ejs/mxs/mxs.c +0 -1
 	while (--timeout) {
 		if ((readl(&reg->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)

Quoted 9 lines

{

arch/arm/cpu/arm926ejs/mxs/mxs.c +0 -0
 	while (--timeout) {
 		if ((readl(&reg->reg) & mask) == 0)
(quoted diff) +0 -0

b/arch/arm/include/asm/arch-mxs/sys_proto.h index 4610363..983b888 100644

arch/arm/include/asm/arch-mxs/sys_proto.h +0 -0
@@ -26,10 +26,10 @@
 int mxs_reset_block(struct mxs_register_32 *reg);

arch/arm/include/asm/arch-mxs/sys_proto.h line 34

Quoted 10 lines
arch/arm/include/asm/arch-mxs/sys_proto.h +2 -2
 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

#2 lore raw

PATCH 1/1 mxs: Convert timeout parameter to 'unsigned int'

In reply to Fabio Estevam
Quoted 43 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>>

For representing a timeout value, it makes more sense to pass it as 'unsigned int'.

Signed-off-by Fabio Estevam <[email protected]>
---
 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(-)
arch/arm/cpu/arm926ejs/mxs/mxs.c +4 -2
index c028e5e..19c79f2 100644
@@ -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->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->reg) & mask) == 0)
arch/arm/include/asm/arch-mxs/sys_proto.h +0 -0
index 4610363..983b888 100644
@@ -26,10 +26,10 @@
 int mxs_reset_block(struct mxs_register_32 *reg);
 int mxs_wait_mask_set(struct mxs_register_32 *reg,

arch/arm/include/asm/arch-mxs/sys_proto.h line 35

Quoted 10 lines
arch/arm/include/asm/arch-mxs/sys_proto.h +2 -2
 		       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 <[email protected]>

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#3 lore raw

PATCH 1/1 mxs: Convert timeout parameter to 'unsigned int'

In reply to Fabio Estevam
Quoted 43 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>>

For representing a timeout value, it makes more sense to pass it as 'unsigned int'.

Signed-off-by Fabio Estevam <[email protected]>
---
 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(-)
arch/arm/cpu/arm926ejs/mxs/mxs.c +4 -2
index c028e5e..19c79f2 100644
@@ -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->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->reg) & mask) == 0)
arch/arm/include/asm/arch-mxs/sys_proto.h +0 -0
index 4610363..983b888 100644
@@ -26,10 +26,10 @@
 int mxs_reset_block(struct mxs_register_32 *reg);
 int mxs_wait_mask_set(struct mxs_register_32 *reg,

arch/arm/include/asm/arch-mxs/sys_proto.h line 35

Quoted 10 lines
arch/arm/include/asm/arch-mxs/sys_proto.h +2 -2
 		       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

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================