All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] rt2x00: Simplify rt2x00_check_rev
@ 2009-05-05  7:25 Ivo van Doorn
  2009-05-05 17:41 ` Ivo van Doorn
  2009-05-05 17:46 ` [PATCH v2] " Ivo van Doorn
  0 siblings, 2 replies; 3+ messages in thread
From: Ivo van Doorn @ 2009-05-05  7:25 UTC (permalink / raw)
  To: John W. Linville; +Cc: linux-wireless, users

rt2x00_check_rev() was too specific for rt2500usb and rt73usb,
by adding the mask argument (instead of hardcoding it into the
function itself) we can use the function in rt2800usb as well.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
---
 drivers/net/wireless/rt2x00/rt2500usb.c |    2 +-
 drivers/net/wireless/rt2x00/rt2800usb.c |    7 ++++---
 drivers/net/wireless/rt2x00/rt2x00.h    |    7 +++----
 drivers/net/wireless/rt2x00/rt73usb.c   |    3 ++-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 9e630e7..8efb2d7 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -1559,7 +1559,7 @@ static int rt2500usb_init_eeprom(struct rt2x00_dev *rt2x00dev)
 	rt2500usb_register_read(rt2x00dev, MAC_CSR0, &reg);
 	rt2x00_set_chip(rt2x00dev, RT2570, value, reg);
 
-	if (!rt2x00_check_rev(&rt2x00dev->chip, 0)) {
+	if (!rt2x00_check_rev(&rt2x00dev->chip, 0x000ffff0, 0)) {
 		ERROR(rt2x00dev, "Invalid RT chipset detected.\n");
 		return -ENODEV;
 	}
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index 7cb3653..8dd1489 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -2348,9 +2348,10 @@ static int rt2800usb_init_eeprom(struct rt2x00_dev *rt2x00dev)
 	 * The check for rt2860 is not a typo, some rt2870 hardware
 	 * identifies itself as rt2860 in the CSR register.
 	 */
-	if ((rt2x00_get_field32(reg, MAC_CSR0_ASIC_VER) != 0x2860) &&
-	    (rt2x00_get_field32(reg, MAC_CSR0_ASIC_VER) != 0x2870) &&
-	    (rt2x00_get_field32(reg, MAC_CSR0_ASIC_VER) != 0x3070)) {
+	if (!rt2x00_check_rev(&rt2x00dev->chip, 0xfff00000, 0x286) &&
+	    !rt2x00_check_rev(&rt2x00dev->chip, 0xfff00000, 0x287) &&
+	    !rt2x00_check_rev(&rt2x00dev->chip, 0xfff00000, 0x288) &&
+	    !rt2x00_check_rev(&rt2x00dev->chip, 0xffff0000, 0x3070)) {
 		ERROR(rt2x00dev, "Invalid RT chipset detected.\n");
 		return -ENODEV;
 	}
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 998dc93..6999ebd 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -921,11 +921,10 @@ static inline u32 rt2x00_rev(const struct rt2x00_chip *chipset)
 	return chipset->rev;
 }
 
-static inline u16 rt2x00_check_rev(const struct rt2x00_chip *chipset,
-				   const u32 rev)
+static inline bool rt2x00_check_rev(const struct rt2x00_chip *chipset,
+				    const u32 mask, const u32 rev)
 {
-	return (((chipset->rev & 0xffff0) == rev) &&
-		!!(chipset->rev & 0x0000f));
+	return ((chipset->rev & mask) == rev);
 }
 
 /**
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 853b2b2..4f94a61 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -1846,7 +1846,8 @@ static int rt73usb_init_eeprom(struct rt2x00_dev *rt2x00dev)
 	rt2x00usb_register_read(rt2x00dev, MAC_CSR0, &reg);
 	rt2x00_set_chip(rt2x00dev, RT2571, value, reg);
 
-	if (!rt2x00_check_rev(&rt2x00dev->chip, 0x25730)) {
+	if (!rt2x00_check_rev(&rt2x00dev->chip, 0x000ffff0, 0x25730) ||
+	    !rt2x00_check_rev(&rt2x00dev->chip, 0x0000000f, 0)) {
 		ERROR(rt2x00dev, "Invalid RT chipset detected.\n");
 		return -ENODEV;
 	}
-- 
1.6.2.3


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] rt2x00: Simplify rt2x00_check_rev
  2009-05-05  7:25 [PATCH] rt2x00: Simplify rt2x00_check_rev Ivo van Doorn
@ 2009-05-05 17:41 ` Ivo van Doorn
  2009-05-05 17:46 ` [PATCH v2] " Ivo van Doorn
  1 sibling, 0 replies; 3+ messages in thread
From: Ivo van Doorn @ 2009-05-05 17:41 UTC (permalink / raw)
  To: John W. Linville; +Cc: linux-wireless, users

On Tuesday 05 May 2009, Ivo van Doorn wrote:
> rt2x00_check_rev() was too specific for rt2500usb and rt73usb,
> by adding the mask argument (instead of hardcoding it into the
> function itself) we can use the function in rt2800usb as well.
> 
> Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
> ---

Please drop this patch. I'll send the correct version in a few minutes.

>  drivers/net/wireless/rt2x00/rt2500usb.c |    2 +-
>  drivers/net/wireless/rt2x00/rt2800usb.c |    7 ++++---
>  drivers/net/wireless/rt2x00/rt2x00.h    |    7 +++----
>  drivers/net/wireless/rt2x00/rt73usb.c   |    3 ++-
>  4 files changed, 10 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
> index 9e630e7..8efb2d7 100644
> --- a/drivers/net/wireless/rt2x00/rt2500usb.c
> +++ b/drivers/net/wireless/rt2x00/rt2500usb.c
> @@ -1559,7 +1559,7 @@ static int rt2500usb_init_eeprom(struct rt2x00_dev *rt2x00dev)
>  	rt2500usb_register_read(rt2x00dev, MAC_CSR0, &reg);
>  	rt2x00_set_chip(rt2x00dev, RT2570, value, reg);
>  
> -	if (!rt2x00_check_rev(&rt2x00dev->chip, 0)) {
> +	if (!rt2x00_check_rev(&rt2x00dev->chip, 0x000ffff0, 0)) {
>  		ERROR(rt2x00dev, "Invalid RT chipset detected.\n");
>  		return -ENODEV;
>  	}
> diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
> index 7cb3653..8dd1489 100644
> --- a/drivers/net/wireless/rt2x00/rt2800usb.c
> +++ b/drivers/net/wireless/rt2x00/rt2800usb.c
> @@ -2348,9 +2348,10 @@ static int rt2800usb_init_eeprom(struct rt2x00_dev *rt2x00dev)
>  	 * The check for rt2860 is not a typo, some rt2870 hardware
>  	 * identifies itself as rt2860 in the CSR register.
>  	 */
> -	if ((rt2x00_get_field32(reg, MAC_CSR0_ASIC_VER) != 0x2860) &&
> -	    (rt2x00_get_field32(reg, MAC_CSR0_ASIC_VER) != 0x2870) &&
> -	    (rt2x00_get_field32(reg, MAC_CSR0_ASIC_VER) != 0x3070)) {
> +	if (!rt2x00_check_rev(&rt2x00dev->chip, 0xfff00000, 0x286) &&
> +	    !rt2x00_check_rev(&rt2x00dev->chip, 0xfff00000, 0x287) &&
> +	    !rt2x00_check_rev(&rt2x00dev->chip, 0xfff00000, 0x288) &&
> +	    !rt2x00_check_rev(&rt2x00dev->chip, 0xffff0000, 0x3070)) {
>  		ERROR(rt2x00dev, "Invalid RT chipset detected.\n");
>  		return -ENODEV;
>  	}
> diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
> index 998dc93..6999ebd 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00.h
> +++ b/drivers/net/wireless/rt2x00/rt2x00.h
> @@ -921,11 +921,10 @@ static inline u32 rt2x00_rev(const struct rt2x00_chip *chipset)
>  	return chipset->rev;
>  }
>  
> -static inline u16 rt2x00_check_rev(const struct rt2x00_chip *chipset,
> -				   const u32 rev)
> +static inline bool rt2x00_check_rev(const struct rt2x00_chip *chipset,
> +				    const u32 mask, const u32 rev)
>  {
> -	return (((chipset->rev & 0xffff0) == rev) &&
> -		!!(chipset->rev & 0x0000f));
> +	return ((chipset->rev & mask) == rev);
>  }
>  
>  /**
> diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
> index 853b2b2..4f94a61 100644
> --- a/drivers/net/wireless/rt2x00/rt73usb.c
> +++ b/drivers/net/wireless/rt2x00/rt73usb.c
> @@ -1846,7 +1846,8 @@ static int rt73usb_init_eeprom(struct rt2x00_dev *rt2x00dev)
>  	rt2x00usb_register_read(rt2x00dev, MAC_CSR0, &reg);
>  	rt2x00_set_chip(rt2x00dev, RT2571, value, reg);
>  
> -	if (!rt2x00_check_rev(&rt2x00dev->chip, 0x25730)) {
> +	if (!rt2x00_check_rev(&rt2x00dev->chip, 0x000ffff0, 0x25730) ||
> +	    !rt2x00_check_rev(&rt2x00dev->chip, 0x0000000f, 0)) {
>  		ERROR(rt2x00dev, "Invalid RT chipset detected.\n");
>  		return -ENODEV;
>  	}



^ permalink raw reply	[flat|nested] 3+ messages in thread
* [PATCH v2] rt2x00: Simplify rt2x00_check_rev
  2009-05-05  7:25 [PATCH] rt2x00: Simplify rt2x00_check_rev Ivo van Doorn
  2009-05-05 17:41 ` Ivo van Doorn
@ 2009-05-05 17:46 ` Ivo van Doorn
  1 sibling, 0 replies; 3+ messages in thread
From: Ivo van Doorn @ 2009-05-05 17:46 UTC (permalink / raw)
  To: John W. Linville; +Cc: linux-wireless, users

rt2x00_check_rev() was too specific for rt2500usb and rt73usb,
by adding the mask argument (instead of hardcoding it into
the function itself) we can use the function in rt2800usb as
well.

v2: Fix revision mask for rt2800usb

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
---
 drivers/net/wireless/rt2x00/rt2500usb.c |    2 +-
 drivers/net/wireless/rt2x00/rt2800usb.c |    7 ++++---
 drivers/net/wireless/rt2x00/rt2x00.h    |    7 +++----
 drivers/net/wireless/rt2x00/rt73usb.c   |    3 ++-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 9e630e7..8efb2d7 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -1559,7 +1559,7 @@ static int rt2500usb_init_eeprom(struct rt2x00_dev *rt2x00dev)
 	rt2500usb_register_read(rt2x00dev, MAC_CSR0, &reg);
 	rt2x00_set_chip(rt2x00dev, RT2570, value, reg);
 
-	if (!rt2x00_check_rev(&rt2x00dev->chip, 0)) {
+	if (!rt2x00_check_rev(&rt2x00dev->chip, 0x000ffff0, 0)) {
 		ERROR(rt2x00dev, "Invalid RT chipset detected.\n");
 		return -ENODEV;
 	}
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index 7cb3653..df82f2b 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -2348,9 +2348,10 @@ static int rt2800usb_init_eeprom(struct rt2x00_dev *rt2x00dev)
 	 * The check for rt2860 is not a typo, some rt2870 hardware
 	 * identifies itself as rt2860 in the CSR register.
 	 */
-	if ((rt2x00_get_field32(reg, MAC_CSR0_ASIC_VER) != 0x2860) &&
-	    (rt2x00_get_field32(reg, MAC_CSR0_ASIC_VER) != 0x2870) &&
-	    (rt2x00_get_field32(reg, MAC_CSR0_ASIC_VER) != 0x3070)) {
+	if (!rt2x00_check_rev(&rt2x00dev->chip, 0xfff00000, 0x28600000) &&
+	    !rt2x00_check_rev(&rt2x00dev->chip, 0xfff00000, 0x28700000) &&
+	    !rt2x00_check_rev(&rt2x00dev->chip, 0xfff00000, 0x28800000) &&
+	    !rt2x00_check_rev(&rt2x00dev->chip, 0xffff0000, 0x30700000)) {
 		ERROR(rt2x00dev, "Invalid RT chipset detected.\n");
 		return -ENODEV;
 	}
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 998dc93..6999ebd 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -921,11 +921,10 @@ static inline u32 rt2x00_rev(const struct rt2x00_chip *chipset)
 	return chipset->rev;
 }
 
-static inline u16 rt2x00_check_rev(const struct rt2x00_chip *chipset,
-				   const u32 rev)
+static inline bool rt2x00_check_rev(const struct rt2x00_chip *chipset,
+				    const u32 mask, const u32 rev)
 {
-	return (((chipset->rev & 0xffff0) == rev) &&
-		!!(chipset->rev & 0x0000f));
+	return ((chipset->rev & mask) == rev);
 }
 
 /**
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 853b2b2..4f94a61 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -1846,7 +1846,8 @@ static int rt73usb_init_eeprom(struct rt2x00_dev *rt2x00dev)
 	rt2x00usb_register_read(rt2x00dev, MAC_CSR0, &reg);
 	rt2x00_set_chip(rt2x00dev, RT2571, value, reg);
 
-	if (!rt2x00_check_rev(&rt2x00dev->chip, 0x25730)) {
+	if (!rt2x00_check_rev(&rt2x00dev->chip, 0x000ffff0, 0x25730) ||
+	    !rt2x00_check_rev(&rt2x00dev->chip, 0x0000000f, 0)) {
 		ERROR(rt2x00dev, "Invalid RT chipset detected.\n");
 		return -ENODEV;
 	}
-- 
1.6.2.3


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-05-05 17:46 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-05-05  7:25 [PATCH] rt2x00: Simplify rt2x00_check_rev Ivo van Doorn
2009-05-05 17:41 ` Ivo van Doorn
2009-05-05 17:46 ` [PATCH v2] " Ivo van Doorn

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.