diff options
author | Ivo van Doorn <IvDoorn@gmail.com> | 2008-01-24 03:48:03 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:03:03 -0500 |
commit | 4bd7c452a468af30bb3c4d9c3adcdaf3f3c6048c (patch) | |
tree | 87df588e208a8118c6aba89c85bddef2d0ed79c9 /drivers/net/wireless/rt2x00/rt61pci.c | |
parent | 2676c94d4e5994f92e57fa3ea680f1d652049d03 (diff) |
rt2x00: Remove data_desc structure
Coverty indicated that data_desc with a single
element array is bad coding style. This removes
the structure and forces everybody to use __le32.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt61pci.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt61pci.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c index a38a96230eca..f3c4cbe734ec 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.c +++ b/drivers/net/wireless/rt2x00/rt61pci.c | |||
@@ -996,7 +996,7 @@ static int rt61pci_load_firmware(struct rt2x00_dev *rt2x00dev, void *data, | |||
996 | static void rt61pci_init_rxring(struct rt2x00_dev *rt2x00dev) | 996 | static void rt61pci_init_rxring(struct rt2x00_dev *rt2x00dev) |
997 | { | 997 | { |
998 | struct data_ring *ring = rt2x00dev->rx; | 998 | struct data_ring *ring = rt2x00dev->rx; |
999 | struct data_desc *rxd; | 999 | __le32 *rxd; |
1000 | unsigned int i; | 1000 | unsigned int i; |
1001 | u32 word; | 1001 | u32 word; |
1002 | 1002 | ||
@@ -1021,7 +1021,7 @@ static void rt61pci_init_rxring(struct rt2x00_dev *rt2x00dev) | |||
1021 | static void rt61pci_init_txring(struct rt2x00_dev *rt2x00dev, const int queue) | 1021 | static void rt61pci_init_txring(struct rt2x00_dev *rt2x00dev, const int queue) |
1022 | { | 1022 | { |
1023 | struct data_ring *ring = rt2x00lib_get_ring(rt2x00dev, queue); | 1023 | struct data_ring *ring = rt2x00lib_get_ring(rt2x00dev, queue); |
1024 | struct data_desc *txd; | 1024 | __le32 *txd; |
1025 | unsigned int i; | 1025 | unsigned int i; |
1026 | u32 word; | 1026 | u32 word; |
1027 | 1027 | ||
@@ -1535,7 +1535,7 @@ static int rt61pci_set_device_state(struct rt2x00_dev *rt2x00dev, | |||
1535 | * TX descriptor initialization | 1535 | * TX descriptor initialization |
1536 | */ | 1536 | */ |
1537 | static void rt61pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, | 1537 | static void rt61pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, |
1538 | struct data_desc *txd, | 1538 | __le32 *txd, |
1539 | struct txdata_entry_desc *desc, | 1539 | struct txdata_entry_desc *desc, |
1540 | struct ieee80211_hdr *ieee80211hdr, | 1540 | struct ieee80211_hdr *ieee80211hdr, |
1541 | unsigned int length, | 1541 | unsigned int length, |
@@ -1679,7 +1679,7 @@ static int rt61pci_agc_to_rssi(struct rt2x00_dev *rt2x00dev, int rxd_w1) | |||
1679 | static void rt61pci_fill_rxdone(struct data_entry *entry, | 1679 | static void rt61pci_fill_rxdone(struct data_entry *entry, |
1680 | struct rxdata_entry_desc *desc) | 1680 | struct rxdata_entry_desc *desc) |
1681 | { | 1681 | { |
1682 | struct data_desc *rxd = entry->priv; | 1682 | __le32 *rxd = entry->priv; |
1683 | u32 word0; | 1683 | u32 word0; |
1684 | u32 word1; | 1684 | u32 word1; |
1685 | 1685 | ||
@@ -1709,7 +1709,7 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev) | |||
1709 | struct data_ring *ring; | 1709 | struct data_ring *ring; |
1710 | struct data_entry *entry; | 1710 | struct data_entry *entry; |
1711 | struct data_entry *entry_done; | 1711 | struct data_entry *entry_done; |
1712 | struct data_desc *txd; | 1712 | __le32 *txd; |
1713 | u32 word; | 1713 | u32 word; |
1714 | u32 reg; | 1714 | u32 reg; |
1715 | u32 old_reg; | 1715 | u32 old_reg; |
@@ -2455,7 +2455,7 @@ static int rt61pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb, | |||
2455 | skb_push(skb, TXD_DESC_SIZE); | 2455 | skb_push(skb, TXD_DESC_SIZE); |
2456 | memset(skb->data, 0, TXD_DESC_SIZE); | 2456 | memset(skb->data, 0, TXD_DESC_SIZE); |
2457 | 2457 | ||
2458 | rt2x00lib_write_tx_desc(rt2x00dev, (struct data_desc *)skb->data, | 2458 | rt2x00lib_write_tx_desc(rt2x00dev, (__le32 *)skb->data, |
2459 | (struct ieee80211_hdr *)(skb->data + | 2459 | (struct ieee80211_hdr *)(skb->data + |
2460 | TXD_DESC_SIZE), | 2460 | TXD_DESC_SIZE), |
2461 | skb->len - TXD_DESC_SIZE, control); | 2461 | skb->len - TXD_DESC_SIZE, control); |