Эх сурвалжийг харах

amd8111e: trivial endianness annotations, NULL noise removal

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Al Viro 17 жил өмнө
parent
commit
ee41a82fa3

+ 3 - 3
drivers/net/amd8111e.c

@@ -1404,7 +1404,7 @@ This function checks if there is any transmit  descriptors available to queue mo
 static int amd8111e_tx_queue_avail(struct amd8111e_priv* lp )
 static int amd8111e_tx_queue_avail(struct amd8111e_priv* lp )
 {
 {
 	int tx_index = lp->tx_idx & TX_BUFF_MOD_MASK;
 	int tx_index = lp->tx_idx & TX_BUFF_MOD_MASK;
-	if(lp->tx_skbuff[tx_index] != 0)
+	if (lp->tx_skbuff[tx_index])
 		return -1;
 		return -1;
 	else
 	else
 		return 0;
 		return 0;
@@ -1441,7 +1441,7 @@ static int amd8111e_start_xmit(struct sk_buff *skb, struct net_device * dev)
 	lp->tx_dma_addr[tx_index] =
 	lp->tx_dma_addr[tx_index] =
 	    pci_map_single(lp->pci_dev, skb->data, skb->len, PCI_DMA_TODEVICE);
 	    pci_map_single(lp->pci_dev, skb->data, skb->len, PCI_DMA_TODEVICE);
 	lp->tx_ring[tx_index].buff_phy_addr =
 	lp->tx_ring[tx_index].buff_phy_addr =
-	    (u32) cpu_to_le32(lp->tx_dma_addr[tx_index]);
+	    cpu_to_le32(lp->tx_dma_addr[tx_index]);
 
 
 	/*  Set FCS and LTINT bits */
 	/*  Set FCS and LTINT bits */
 	wmb();
 	wmb();
@@ -1998,7 +1998,7 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev,
 	spin_lock_init(&lp->lock);
 	spin_lock_init(&lp->lock);
 
 
 	lp->mmio = ioremap(reg_addr, reg_len);
 	lp->mmio = ioremap(reg_addr, reg_len);
-	if (lp->mmio == 0) {
+	if (!lp->mmio) {
 		printk(KERN_ERR "amd8111e: Cannot map device registers, "
 		printk(KERN_ERR "amd8111e: Cannot map device registers, "
 		       "exiting\n");
 		       "exiting\n");
 		err = -ENOMEM;
 		err = -ENOMEM;

+ 12 - 12
drivers/net/amd8111e.h

@@ -655,32 +655,32 @@ typedef enum {
 
 
 struct amd8111e_tx_dr{
 struct amd8111e_tx_dr{
 
 
-	u16 buff_count; /* Size of the buffer pointed by this descriptor */
+	__le16 buff_count; /* Size of the buffer pointed by this descriptor */
 
 
-	u16 tx_flags;
+	__le16 tx_flags;
 
 
-	u16 tag_ctrl_info;
+	__le16 tag_ctrl_info;
 
 
-	u16 tag_ctrl_cmd;
+	__le16 tag_ctrl_cmd;
 
 
-	u32 buff_phy_addr;
+	__le32 buff_phy_addr;
 
 
-	u32 reserved;
+	__le32 reserved;
 };
 };
 
 
 struct amd8111e_rx_dr{
 struct amd8111e_rx_dr{
 
 
-	u32 reserved;
+	__le32 reserved;
 
 
-	u16 msg_count; /* Received message len */
+	__le16 msg_count; /* Received message len */
 
 
-	u16 tag_ctrl_info;
+	__le16 tag_ctrl_info;
 
 
-	u16 buff_count;  /* Len of the buffer pointed by descriptor. */
+	__le16 buff_count;  /* Len of the buffer pointed by descriptor. */
 
 
-	u16 rx_flags;
+	__le16 rx_flags;
 
 
-	u32 buff_phy_addr;
+	__le32 buff_phy_addr;
 
 
 };
 };
 struct amd8111e_link_config{
 struct amd8111e_link_config{