7 files changed, 22 insertions, 30 deletions

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index d263eee2652a..45f47c1c0a35 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -3657,7 +3657,7 @@ void mpi_receive_802_11 (struct airo_info *ai)
         ptr += hdrlen;
         if (hdrlen == 24)
                 ptr += 6;
-        gap = le16_to_cpu(get_unaligned((__le16 *)ptr));
+        gap = get_unaligned_le16(ptr);
         ptr += sizeof(__le16);
         if (gap) {
                 if (gap <= 8)
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c
index e18305b781c9..4e5c8fc35200 100644
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
@@ -58,10 +58,6 @@
 #include "reg.h"
 #include "debug.h"
 
-/* unaligned little endian access */
-#define LE_READ_2(_p) (le16_to_cpu(get_unaligned((__le16 *)(_p))))
-#define LE_READ_4(_p) (le32_to_cpu(get_unaligned((__le32 *)(_p))))
-
 enum {
         ATH_LED_TX,
         ATH_LED_RX,
@@ -2909,9 +2905,9 @@ static void ath5k_configure_filter(struct ieee80211_hw *hw,
                         if (!mclist)
                                 break;
                         /* calculate XOR of eight 6-bit values */
-                        val = LE_READ_4(mclist->dmi_addr + 0);
+                        val = get_unaligned_le32(mclist->dmi_addr + 0);
                         pos = (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val;
-                        val = LE_READ_4(mclist->dmi_addr + 3);
+                        val = get_unaligned_le32(mclist->dmi_addr + 3);
                         pos ^= (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val;
                         pos &= 0x3f;
                         mfilt[pos / 32] |= (1 << (pos % 32));
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 4bf8a99099fe..8c24cd72aaca 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -2171,7 +2171,7 @@ static int b43_write_initvals(struct b43_wldev *dev,
                                 goto err_format;
                         array_size -= sizeof(iv->data.d32);
 
-                        value = be32_to_cpu(get_unaligned(&iv->data.d32));
+                        value = get_unaligned_be32(&iv->data.d32);
                         b43_write32(dev, offset, value);
 
                         iv = (const struct b43_iv *)((const uint8_t *)iv +
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index ef829ee8ffd4..14a5eea2573e 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -1720,7 +1720,7 @@ static int b43legacy_write_initvals(struct b43legacy_wldev *dev,
                                 goto err_format;
                         array_size -= sizeof(iv->data.d32);
 
-                        value = be32_to_cpu(get_unaligned(&iv->data.d32));
+                        value = get_unaligned_be32(&iv->data.d32);
                         b43legacy_write32(dev, offset, value);
 
                         iv = (const struct b43legacy_iv *)((const uint8_t *)iv +
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index 598e4eef4f40..d3406830c8e3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -554,40 +554,36 @@ static void iwl3945_add_radiotap(struct iwl3945_priv *priv,
         iwl3945_rt->rt_hdr.it_pad = 0;
 
         /* total header + data */
-        put_unaligned(cpu_to_le16(sizeof(*iwl3945_rt)),
-                      &iwl3945_rt->rt_hdr.it_len);
+        put_unaligned_le16(sizeof(*iwl3945_rt), &iwl3945_rt->rt_hdr.it_len);
 
         /* Indicate all the fields we add to the radiotap header */
-        put_unaligned(cpu_to_le32((1 << IEEE80211_RADIOTAP_TSFT) |
-                                  (1 << IEEE80211_RADIOTAP_FLAGS) |
-                                  (1 << IEEE80211_RADIOTAP_RATE) |
-                                  (1 << IEEE80211_RADIOTAP_CHANNEL) |
-                                  (1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL) |
-                                  (1 << IEEE80211_RADIOTAP_DBM_ANTNOISE) |
-                                  (1 << IEEE80211_RADIOTAP_ANTENNA)),
-                      &iwl3945_rt->rt_hdr.it_present);
+        put_unaligned_le32((1 << IEEE80211_RADIOTAP_TSFT) |
+                           (1 << IEEE80211_RADIOTAP_FLAGS) |
+                           (1 << IEEE80211_RADIOTAP_RATE) |
+                           (1 << IEEE80211_RADIOTAP_CHANNEL) |
+                           (1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL) |
+                           (1 << IEEE80211_RADIOTAP_DBM_ANTNOISE) |
+                           (1 << IEEE80211_RADIOTAP_ANTENNA),
+                        &iwl3945_rt->rt_hdr.it_present);
 
         /* Zero the flags, we'll add to them as we go */
         iwl3945_rt->rt_flags = 0;
 
-        put_unaligned(cpu_to_le64(tsf), &iwl3945_rt->rt_tsf);
+        put_unaligned_le64(tsf, &iwl3945_rt->rt_tsf);
 
         iwl3945_rt->rt_dbmsignal = signal;
         iwl3945_rt->rt_dbmnoise = noise;
 
         /* Convert the channel frequency and set the flags */
-        put_unaligned(cpu_to_le16(stats->freq), &iwl3945_rt->rt_channelMHz);
+        put_unaligned_le16(stats->freq, &iwl3945_rt->rt_channelMHz);
         if (!(phy_flags_hw & RX_RES_PHY_FLAGS_BAND_24_MSK))
-                put_unaligned(cpu_to_le16(IEEE80211_CHAN_OFDM |
-                                          IEEE80211_CHAN_5GHZ),
+                put_unaligned_le16(IEEE80211_CHAN_OFDM | IEEE80211_CHAN_5GHZ,
                               &iwl3945_rt->rt_chbitmask);
         else if (phy_flags_hw & RX_RES_PHY_FLAGS_MOD_CCK_MSK)
-                put_unaligned(cpu_to_le16(IEEE80211_CHAN_CCK |
-                                          IEEE80211_CHAN_2GHZ),
+                put_unaligned_le16(IEEE80211_CHAN_CCK | IEEE80211_CHAN_2GHZ,
                               &iwl3945_rt->rt_chbitmask);
         else    /* 802.11g */
-                put_unaligned(cpu_to_le16(IEEE80211_CHAN_OFDM |
-                                          IEEE80211_CHAN_2GHZ),
+                put_unaligned_le16(IEEE80211_CHAN_OFDM | IEEE80211_CHAN_2GHZ,
                               &iwl3945_rt->rt_chbitmask);
 
         if (rate == -1)
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index e72c97a0d6c1..1a409fcc80d3 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -522,7 +522,7 @@ static int lbs_process_bss(struct bss_descriptor *bss,
 
         if (*bytesleft >= sizeof(beaconsize)) {
                 /* Extract & convert beacon size from the command buffer */
-                beaconsize = le16_to_cpu(get_unaligned((__le16 *)*pbeaconinfo));
+                beaconsize = get_unaligned_le16(*pbeaconinfo);
                 *bytesleft -= sizeof(beaconsize);
                 *pbeaconinfo += sizeof(beaconsize);
         }
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
index e34675c2f8fc..5316074f39f0 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -545,11 +545,11 @@ static void handle_rx_packet(struct zd_usb *usb, const u8 *buffer,
          * be padded. Unaligned access might also happen if the length_info
          * structure is not present.
          */
-        if (get_unaligned(&length_info->tag) == cpu_to_le16(RX_LENGTH_INFO_TAG))
+        if (get_unaligned_le16(&length_info->tag) == RX_LENGTH_INFO_TAG)
         {
                 unsigned int l, k, n;
                 for (i = 0, l = 0;; i++) {
-                        k = le16_to_cpu(get_unaligned(&length_info->length[i]));
+                        k = get_unaligned_le16(&length_info->length[i]);
                         if (k == 0)
                                 return;
                         n = l+k;