5 files changed, 31 insertions, 31 deletions

diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c
index 1d8271f34c38..ecd0cfaefdcc 100644
--- a/drivers/net/wimax/i2400m/fw.c
+++ b/drivers/net/wimax/i2400m/fw.c
@@ -140,10 +140,10 @@
 
 
 static const __le32 i2400m_ACK_BARKER[4] = {
-        __constant_cpu_to_le32(I2400M_ACK_BARKER),
-        __constant_cpu_to_le32(I2400M_ACK_BARKER),
-        __constant_cpu_to_le32(I2400M_ACK_BARKER),
-        __constant_cpu_to_le32(I2400M_ACK_BARKER)
+        cpu_to_le32(I2400M_ACK_BARKER),
+        cpu_to_le32(I2400M_ACK_BARKER),
+        cpu_to_le32(I2400M_ACK_BARKER),
+        cpu_to_le32(I2400M_ACK_BARKER)
 };
 
 
@@ -771,8 +771,8 @@ static
 int i2400m_dnload_init_nonsigned(struct i2400m *i2400m)
 {
 #define POKE(a, d) {                                    \
-        .address = __constant_cpu_to_le32(a),           \
-        .data = __constant_cpu_to_le32(d)               \
+        .address = cpu_to_le32(a),              \
+        .data = cpu_to_le32(d)          \
 }
         static const struct {
                 __le32 address;
diff --git a/drivers/net/wimax/i2400m/i2400m.h b/drivers/net/wimax/i2400m/i2400m.h
index 067c871cc226..236f19ea4c85 100644
--- a/drivers/net/wimax/i2400m/i2400m.h
+++ b/drivers/net/wimax/i2400m/i2400m.h
@@ -664,17 +664,17 @@ extern struct i2400m_msg_hdr *i2400m_tx_msg_get(struct i2400m *, size_t *);
 extern void i2400m_tx_msg_sent(struct i2400m *);
 
 static const __le32 i2400m_NBOOT_BARKER[4] = {
-        __constant_cpu_to_le32(I2400M_NBOOT_BARKER),
-        __constant_cpu_to_le32(I2400M_NBOOT_BARKER),
-        __constant_cpu_to_le32(I2400M_NBOOT_BARKER),
-        __constant_cpu_to_le32(I2400M_NBOOT_BARKER)
+        cpu_to_le32(I2400M_NBOOT_BARKER),
+        cpu_to_le32(I2400M_NBOOT_BARKER),
+        cpu_to_le32(I2400M_NBOOT_BARKER),
+        cpu_to_le32(I2400M_NBOOT_BARKER)
 };
 
 static const __le32 i2400m_SBOOT_BARKER[4] = {
-        __constant_cpu_to_le32(I2400M_SBOOT_BARKER),
-        __constant_cpu_to_le32(I2400M_SBOOT_BARKER),
-        __constant_cpu_to_le32(I2400M_SBOOT_BARKER),
-        __constant_cpu_to_le32(I2400M_SBOOT_BARKER)
+        cpu_to_le32(I2400M_SBOOT_BARKER),
+        cpu_to_le32(I2400M_SBOOT_BARKER),
+        cpu_to_le32(I2400M_SBOOT_BARKER),
+        cpu_to_le32(I2400M_SBOOT_BARKER)
 };
 
 
diff --git a/drivers/net/wimax/i2400m/netdev.c b/drivers/net/wimax/i2400m/netdev.c
index 57159e4bbfe1..be8be4d0709c 100644
--- a/drivers/net/wimax/i2400m/netdev.c
+++ b/drivers/net/wimax/i2400m/netdev.c
@@ -419,7 +419,7 @@ void i2400m_rx_fake_eth_header(struct net_device *net_dev,
 
         memcpy(eth_hdr->h_dest, net_dev->dev_addr, sizeof(eth_hdr->h_dest));
         memset(eth_hdr->h_source, 0, sizeof(eth_hdr->h_dest));
-        eth_hdr->h_proto = __constant_cpu_to_be16(ETH_P_IP);
+        eth_hdr->h_proto = cpu_to_be16(ETH_P_IP);
 }
 
 
diff --git a/drivers/net/wimax/i2400m/sdio.c b/drivers/net/wimax/i2400m/sdio.c
index 1bfa283bbd8a..123a5f8db6ad 100644
--- a/drivers/net/wimax/i2400m/sdio.c
+++ b/drivers/net/wimax/i2400m/sdio.c
@@ -255,16 +255,16 @@ int i2400ms_bus_reset(struct i2400m *i2400m, enum i2400m_reset_type rt)
                 container_of(i2400m, struct i2400ms, i2400m);
         struct device *dev = i2400m_dev(i2400m);
         static const __le32 i2400m_WARM_BOOT_BARKER[4] = {
-                __constant_cpu_to_le32(I2400M_WARM_RESET_BARKER),
-                __constant_cpu_to_le32(I2400M_WARM_RESET_BARKER),
-                __constant_cpu_to_le32(I2400M_WARM_RESET_BARKER),
-                __constant_cpu_to_le32(I2400M_WARM_RESET_BARKER),
+                cpu_to_le32(I2400M_WARM_RESET_BARKER),
+                cpu_to_le32(I2400M_WARM_RESET_BARKER),
+                cpu_to_le32(I2400M_WARM_RESET_BARKER),
+                cpu_to_le32(I2400M_WARM_RESET_BARKER),
         };
         static const __le32 i2400m_COLD_BOOT_BARKER[4] = {
-                __constant_cpu_to_le32(I2400M_COLD_RESET_BARKER),
-                __constant_cpu_to_le32(I2400M_COLD_RESET_BARKER),
-                __constant_cpu_to_le32(I2400M_COLD_RESET_BARKER),
-                __constant_cpu_to_le32(I2400M_COLD_RESET_BARKER),
+                cpu_to_le32(I2400M_COLD_RESET_BARKER),
+                cpu_to_le32(I2400M_COLD_RESET_BARKER),
+                cpu_to_le32(I2400M_COLD_RESET_BARKER),
+                cpu_to_le32(I2400M_COLD_RESET_BARKER),
         };
 
         if (rt == I2400M_RT_WARM)
diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c
index c6d93465c7e2..7c28610da6f3 100644
--- a/drivers/net/wimax/i2400m/usb.c
+++ b/drivers/net/wimax/i2400m/usb.c
@@ -211,16 +211,16 @@ int i2400mu_bus_reset(struct i2400m *i2400m, enum i2400m_reset_type rt)
                 container_of(i2400m, struct i2400mu, i2400m);
         struct device *dev = i2400m_dev(i2400m);
         static const __le32 i2400m_WARM_BOOT_BARKER[4] = {
-                __constant_cpu_to_le32(I2400M_WARM_RESET_BARKER),
-                __constant_cpu_to_le32(I2400M_WARM_RESET_BARKER),
-                __constant_cpu_to_le32(I2400M_WARM_RESET_BARKER),
-                __constant_cpu_to_le32(I2400M_WARM_RESET_BARKER),
+                cpu_to_le32(I2400M_WARM_RESET_BARKER),
+                cpu_to_le32(I2400M_WARM_RESET_BARKER),
+                cpu_to_le32(I2400M_WARM_RESET_BARKER),
+                cpu_to_le32(I2400M_WARM_RESET_BARKER),
         };
         static const __le32 i2400m_COLD_BOOT_BARKER[4] = {
-                __constant_cpu_to_le32(I2400M_COLD_RESET_BARKER),
-                __constant_cpu_to_le32(I2400M_COLD_RESET_BARKER),
-                __constant_cpu_to_le32(I2400M_COLD_RESET_BARKER),
-                __constant_cpu_to_le32(I2400M_COLD_RESET_BARKER),
+                cpu_to_le32(I2400M_COLD_RESET_BARKER),
+                cpu_to_le32(I2400M_COLD_RESET_BARKER),
+                cpu_to_le32(I2400M_COLD_RESET_BARKER),
+                cpu_to_le32(I2400M_COLD_RESET_BARKER),
         };
 
         d_fnstart(3, dev, "(i2400m %p rt %u)\n", i2400m, rt);