Skip to contentSkip to conversation

rt2x00: Fix big endian problems for the pci drivers

PATCH In review Ivo van Doorn 1 participant 1 message Feb 28, 2007 Networking drivers (wireless)

lore
Share & tools
lore

Ivo van Doorn

author
#0 lore raw

PATCH 22/28 rt2x00: Fix big endian problems for the pci drivers

Fix big endian problems for the pci drivers. Register access does not need to be byteordered.

Signed-off-by Ivo van Doorn <[email protected]>

---

drivers/net/wireless/mac80211/rt2x00/rt2400pci.c +2 -4
index 3b6f503..3226d76 100644
@@ -69,8 +69,7 @@ static inline void rt2x00_register_read(
 	const struct rt2x00_dev *rt2x00dev,
 	const unsigned long offset, u32 *value)
 {
-	__le32 reg = (__force __le32)readl(rt2x00dev->csr_addr + offset);
-	*value = le32_to_cpu(reg);
+	*value = readl(rt2x00dev->csr_addr + offset);
 }
 
 static inline void rt2x00_register_multiread(

@@ -84,8 +83,7 @@ static inline void rt2x00_register_write(
 	const struct rt2x00_dev *rt2x00dev,
 	const unsigned long offset, u32 value)
 {
-	__le32 reg = cpu_to_le32(value);
-	writel((__force u32)reg, rt2x00dev->csr_addr + offset);
+	writel(value, rt2x00dev->csr_addr + offset);
 }
 
 static inline void rt2x00_register_multiwrite(
drivers/net/wireless/mac80211/rt2x00/rt2500pci.c +2 -4
index 59faa33..5554b3e 100644
@@ -69,8 +69,7 @@ static inline void rt2x00_register_read(
 	const struct rt2x00_dev *rt2x00dev,
 	const unsigned long offset, u32 *value)
 {
-	__le32 reg = (__force __le32)readl(rt2x00dev->csr_addr + offset);
-	*value = le32_to_cpu(reg);
+	*value = readl(rt2x00dev->csr_addr + offset);
 }
 
 static inline void rt2x00_register_multiread(

@@ -84,8 +83,7 @@ static inline void rt2x00_register_write(
 	const struct rt2x00_dev *rt2x00dev,
 	const unsigned long offset, u32 value)
 {
-	__le32 reg = cpu_to_le32(value);
-	writel((__force u32)reg, rt2x00dev->csr_addr + offset);
+	writel(value, rt2x00dev->csr_addr + offset);
 }
 
 static inline void rt2x00_register_multiwrite(
drivers/net/wireless/mac80211/rt2x00/rt2500usb.c +4 -2
index f451ae6..abbe032 100644
@@ -105,7 +105,8 @@ static inline void rt2x00_register_multiread(
 {
 	rt2x00_vendor_request(
 		rt2x00dev, USB_MULTI_READ, USB_VENDOR_REQUEST_IN,
-		offset, 0x00, value, length, REGISTER_TIMEOUT);
+		offset, 0x00, value, length,
+		REGISTER_TIMEOUT * (length / sizeof(u16)));
 }
 
 static inline void rt2x00_register_write(

@@ -124,7 +125,8 @@ static inline void rt2x00_register_multiwrite(
 {
 	rt2x00_vendor_request(
 		rt2x00dev, USB_MULTI_WRITE, USB_VENDOR_REQUEST_OUT,
-		offset, 0x00, value, length, REGISTER_TIMEOUT);
+		offset, 0x00, value, length,
+		REGISTER_TIMEOUT * (length / sizeof(u16)));
 }
 
 static u16 rt2x00_bbp_check(const struct rt2x00_dev *rt2x00dev)
drivers/net/wireless/mac80211/rt2x00/rt61pci.c +2 -5
index 5718005..267f39e 100644
@@ -71,10 +71,8 @@ static inline void rt2x00_register_read(
 	const struct rt2x00_dev *rt2x00dev,
 	const unsigned long offset, u32 *value)
 {
-	__le32 reg;
 	readl(rt2x00dev->csr_addr + MAC_CSR0);
-	reg = (__force __le32)readl(rt2x00dev->csr_addr + offset);
-	*value = le32_to_cpu(reg);
+	*value = readl(rt2x00dev->csr_addr + offset);
 }
 
 static inline void rt2x00_register_multiread(

@@ -89,9 +87,8 @@ static inline void rt2x00_register_write(
 	const struct rt2x00_dev *rt2x00dev,
 	const unsigned long offset, u32 value)
 {
-	__le32 reg = cpu_to_le32(value);
 	readl(rt2x00dev->csr_addr + MAC_CSR0);
-	writel((__force u32)reg, rt2x00dev->csr_addr + offset);
+	writel(value, rt2x00dev->csr_addr + offset);
 }
 
 static inline void rt2x00_register_multiwrite(
drivers/net/wireless/mac80211/rt2x00/rt73usb.c +4 -2
index a991be4..b24ecea 100644
@@ -107,7 +107,8 @@ static inline void rt2x00_register_multiread(
 {
 	rt2x00_vendor_request(
 		rt2x00dev, USB_MULTI_READ, USB_VENDOR_REQUEST_IN,
-		offset, 0x00, value, length, REGISTER_TIMEOUT);
+		offset, 0x00, value, length,
+		REGISTER_TIMEOUT * (length / sizeof(u32)));
 }
 
 static inline void rt2x00_register_write(

@@ -126,7 +127,8 @@ static inline void rt2x00_register_multiwrite(
 {
 	rt2x00_vendor_request(
 		rt2x00dev, USB_MULTI_WRITE, USB_VENDOR_REQUEST_OUT,
-		offset, 0x00, value, length, REGISTER_TIMEOUT);
+		offset, 0x00, value, length,
+		REGISTER_TIMEOUT * (length / sizeof(u32)));
 }
 
 static u32 rt2x00_bbp_check(const struct rt2x00_dev *rt2x00dev)