typhoon: trivial endianness annotations

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=71f1bb1a8f17db3caba1237dfd478c2a13faf63e
Commit: 71f1bb1a8f17db3caba1237dfd478c2a13faf63e
Parent: 8cc085c7aceb78d26d0a5355e111b2330f089161
Author: Al Viro [EMAIL PROTECTED]
AuthorDate: Fri Dec 21 06:21:14 2007 +
Committer:  Jeff Garzik [EMAIL PROTECTED]
CommitDate: Sat Dec 22 22:53:06 2007 -0500

typhoon: trivial endianness annotations

Signed-off-by: Al Viro [EMAIL PROTECTED]
Signed-off-by: Jeff Garzik [EMAIL PROTECTED]
---
 drivers/net/typhoon.c |   31 +++
 drivers/net/typhoon.h |   13 +
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index 2550d4c..f50cb52 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -813,8 +813,7 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device 
*dev)
first_txd-flags = TYPHOON_TX_DESC | TYPHOON_DESC_VALID;
first_txd-numDesc = 0;
first_txd-len = 0;
-   first_txd-addr = (u64)((unsigned long) skb)  0x;
-   first_txd-addrHi = (u64)((unsigned long) skb)  32;
+   first_txd-tx_addr = (u64)((unsigned long) skb);
first_txd-processFlags = 0;
 
if(skb-ip_summed == CHECKSUM_PARTIAL) {
@@ -850,8 +849,8 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device 
*dev)
   PCI_DMA_TODEVICE);
txd-flags = TYPHOON_FRAG_DESC | TYPHOON_DESC_VALID;
txd-len = cpu_to_le16(skb-len);
-   txd-addr = cpu_to_le32(skb_dma);
-   txd-addrHi = 0;
+   txd-frag.addr = cpu_to_le32(skb_dma);
+   txd-frag.addrHi = 0;
first_txd-numDesc++;
} else {
int i, len;
@@ -861,8 +860,8 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device 
*dev)
 PCI_DMA_TODEVICE);
txd-flags = TYPHOON_FRAG_DESC | TYPHOON_DESC_VALID;
txd-len = cpu_to_le16(len);
-   txd-addr = cpu_to_le32(skb_dma);
-   txd-addrHi = 0;
+   txd-frag.addr = cpu_to_le32(skb_dma);
+   txd-frag.addrHi = 0;
first_txd-numDesc++;
 
for(i = 0; i  skb_shinfo(skb)-nr_frags; i++) {
@@ -880,8 +879,8 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device 
*dev)
 PCI_DMA_TODEVICE);
txd-flags = TYPHOON_FRAG_DESC | TYPHOON_DESC_VALID;
txd-len = cpu_to_le16(len);
-   txd-addr = cpu_to_le32(skb_dma);
-   txd-addrHi = 0;
+   txd-frag.addr = cpu_to_le32(skb_dma);
+   txd-frag.addrHi = 0;
first_txd-numDesc++;
}
}
@@ -1358,7 +1357,7 @@ typhoon_download_firmware(struct typhoon *tp)
u8 *image_data;
void *dpage;
dma_addr_t dpage_dma;
-   unsigned int csum;
+   __sum16 csum;
u32 irqEnabled;
u32 irqMasked;
u32 numSections;
@@ -1450,13 +1449,13 @@ typhoon_download_firmware(struct typhoon *tp)
 * summing. Fortunately, due to the properties of
 * the checksum, we can do this once, at the end.
 */
-   csum = csum_partial_copy_nocheck(image_data, dpage,
-len, 0);
-   csum = csum_fold(csum);
-   csum = le16_to_cpu(csum);
+   csum = csum_fold(csum_partial_copy_nocheck(image_data,
+ dpage, len,
+ 0));
 
iowrite32(len, ioaddr + TYPHOON_REG_BOOT_LENGTH);
-   iowrite32(csum, ioaddr + TYPHOON_REG_BOOT_CHECKSUM);
+   iowrite32(le16_to_cpu((__force __le16)csum),
+   ioaddr + TYPHOON_REG_BOOT_CHECKSUM);
iowrite32(load_addr,
ioaddr + TYPHOON_REG_BOOT_DEST_ADDR);
iowrite32(0, ioaddr + TYPHOON_REG_BOOT_DATA_HI);
@@ -1551,13 +1550,13 @@ typhoon_clean_tx(struct typhoon *tp, struct 
transmit_ring *txRing,
if(type == TYPHOON_TX_DESC) {
/* This tx_desc describes a packet.
 */
-   unsigned long ptr = tx-addr | ((u64)tx-addrHi  32);
+   unsigned long ptr = tx-tx_addr;
struct sk_buff *skb = (struct sk_buff *) ptr;
dev_kfree_skb_irq(skb);
} else if(type == TYPHOON_FRAG_DESC) {
/* This tx_desc describes a memory mapping. Free

typhoon: trivial endianness annotations

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=03a710ffcb0c4e682087f4cf4f0236d10ed09253
Commit: 03a710ffcb0c4e682087f4cf4f0236d10ed09253
Parent: c559a5bc9417c00ba2df59397a27eaf8d8e52aec
Author: Al Viro [EMAIL PROTECTED]
AuthorDate: Thu Aug 23 00:44:39 2007 -0400
Committer:  David S. Miller [EMAIL PROTECTED]
CommitDate: Wed Oct 10 16:52:00 2007 -0700

typhoon: trivial endianness annotations

Signed-off-by: Al Viro [EMAIL PROTECTED]
Signed-off-by: Jeff Garzik [EMAIL PROTECTED]
---
 drivers/net/typhoon.c |   36 +-
 drivers/net/typhoon.h |  190 
 2 files changed, 113 insertions(+), 113 deletions(-)

diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index 43894e9..72e5e9b 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -300,9 +300,9 @@ struct typhoon {
const char *name;
struct typhoon_shared * shared;
dma_addr_t  shared_dma;
-   u16 xcvr_select;
-   u16 wol_events;
-   u32 offload;
+   __le16  xcvr_select;
+   __le16  wol_events;
+   __le32  offload;
 
/* unused stuff (future use) */
int capabilities;
@@ -828,7 +828,7 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device 
*dev)
first_txd-processFlags |=
TYPHOON_TX_PF_INSERT_VLAN | TYPHOON_TX_PF_VLAN_PRIORITY;
first_txd-processFlags |=
-   cpu_to_le32(htons(vlan_tx_tag_get(skb)) 
+   cpu_to_le32(ntohs(vlan_tx_tag_get(skb)) 
TYPHOON_TX_PF_VLAN_TAG_SHIFT);
}
 
@@ -920,7 +920,7 @@ typhoon_set_rx_mode(struct net_device *dev)
struct typhoon *tp = netdev_priv(dev);
struct cmd_desc xp_cmd;
u32 mc_filter[2];
-   u16 filter;
+   __le16 filter;
 
filter = TYPHOON_RX_FILTER_DIRECTED | TYPHOON_RX_FILTER_BROADCAST;
if(dev-flags  IFF_PROMISC) {
@@ -1131,7 +1131,7 @@ typhoon_set_settings(struct net_device *dev, struct 
ethtool_cmd *cmd)
 {
struct typhoon *tp = netdev_priv(dev);
struct cmd_desc xp_cmd;
-   int xcvr;
+   __le16 xcvr;
int err;
 
err = -EINVAL;
@@ -1536,7 +1536,7 @@ out_timeout:
 
 static u32
 typhoon_clean_tx(struct typhoon *tp, struct transmit_ring *txRing,
-   volatile u32 * index)
+   volatile __le32 * index)
 {
u32 lastRead = txRing-lastRead;
struct tx_desc *tx;
@@ -1572,7 +1572,7 @@ typhoon_clean_tx(struct typhoon *tp, struct transmit_ring 
*txRing,
 
 static void
 typhoon_tx_complete(struct typhoon *tp, struct transmit_ring *txRing,
-   volatile u32 * index)
+   volatile __le32 * index)
 {
u32 lastRead;
int numDesc = MAX_SKB_FRAGS + 1;
@@ -1662,8 +1662,8 @@ typhoon_alloc_rx_skb(struct typhoon *tp, u32 idx)
 }
 
 static int
-typhoon_rx(struct typhoon *tp, struct basic_ring *rxRing, volatile u32 * ready,
-  volatile u32 * cleared, int budget)
+typhoon_rx(struct typhoon *tp, struct basic_ring *rxRing, volatile __le32 * 
ready,
+  volatile __le32 * cleared, int budget)
 {
struct rx_desc *rx;
struct sk_buff *skb, *new_skb;
@@ -1673,7 +1673,7 @@ typhoon_rx(struct typhoon *tp, struct basic_ring *rxRing, 
volatile u32 * ready,
u32 rxaddr;
int pkt_len;
u32 idx;
-   u32 csum_bits;
+   __le32 csum_bits;
int received;
 
received = 0;
@@ -1840,7 +1840,7 @@ typhoon_free_rx_rings(struct typhoon *tp)
 }
 
 static int
-typhoon_sleep(struct typhoon *tp, pci_power_t state, u16 events)
+typhoon_sleep(struct typhoon *tp, pci_power_t state, __le16 events)
 {
struct pci_dev *pdev = tp-pdev;
void __iomem *ioaddr = tp-ioaddr;
@@ -1928,8 +1928,8 @@ typhoon_start_runtime(struct typhoon *tp)
goto error_out;
 
INIT_COMMAND_NO_RESPONSE(xp_cmd, TYPHOON_CMD_SET_MAC_ADDRESS);
-   xp_cmd.parm1 = cpu_to_le16(ntohs(*(u16 *)dev-dev_addr[0]));
-   xp_cmd.parm2 = cpu_to_le32(ntohl(*(u32 *)dev-dev_addr[2]));
+   xp_cmd.parm1 = cpu_to_le16(ntohs(*(__be16 *)dev-dev_addr[0]));
+   xp_cmd.parm2 = cpu_to_le32(ntohl(*(__be32 *)dev-dev_addr[2]));
err = typhoon_issue_command(tp, 1, xp_cmd, 0, NULL);
if(err  0)
goto error_out;
@@ -2229,8 +2229,8 @@ typhoon_suspend(struct pci_dev *pdev, pm_message_t state)
}
 
INIT_COMMAND_NO_RESPONSE(xp_cmd, TYPHOON_CMD_SET_MAC_ADDRESS);
-   xp_cmd.parm1 = cpu_to_le16(ntohs(*(u16 *)dev-dev_addr[0]));
-   xp_cmd.parm2 = cpu_to_le32(ntohl(*(u32 *)dev-dev_addr[2]));
+   xp_cmd.parm1 = cpu_to_le16(ntohs(*(__be16 *)dev-dev_addr[0]));
+   xp_cmd.parm2 = cpu_to_le32(ntohl(*(__be32 *)dev