Changeset 30449

Timestamp:

2012-02-11T16:12:08+01:00 (6 years ago)

Author:

juhosg

Message:

ramips: raeth: use device pointer in DMA API calls

File:

• trunk/target/linux/ramips/files/drivers/net/ramips.c (modified) (7 diffs)

trunk/target/linux/ramips/files/drivers/net/ramips.c

@@ -130 +130 @@
         for (i = 0; i < NUM_RX_DESC; i++)
                 if (re->rx_skb[i]) {
-                        dma_unmap_single(NULL, re->rx_dma[i], MAX_RX_LENGTH,
-                                         DMA_FROM_DEVICE);
+                        dma_unmap_single(&re->netdev->dev, re->rx_dma[i],
+                                         MAX_RX_LENGTH, DMA_FROM_DEVICE);
                         dev_kfree_skb_any(re->rx_skb[i]);
                 }
 
         if (re->rx)
-                dma_free_coherent(NULL,
+                dma_free_coherent(&re->netdev->dev,
                                   NUM_RX_DESC * sizeof(struct ramips_rx_dma),
                                   re->rx, re->rx_desc_dma);
 
         if (re->tx)
-                dma_free_coherent(NULL,
+                dma_free_coherent(&re->netdev->dev,
                                   NUM_TX_DESC * sizeof(struct ramips_tx_dma),
                                   re->tx, re->tx_desc_dma);
@@ -155 +155 @@
 
         /* setup tx ring */
-        re->tx = dma_alloc_coherent(NULL,
+        re->tx = dma_alloc_coherent(&re->netdev->dev,
                                     NUM_TX_DESC * sizeof(struct ramips_tx_dma),
                                     &re->tx_desc_dma, GFP_ATOMIC);
@@ -168 +168 @@
 
         /* setup rx ring */
-        re->rx = dma_alloc_coherent(NULL,
+        re->rx = dma_alloc_coherent(&re->netdev->dev,
                                     NUM_RX_DESC * sizeof(struct ramips_rx_dma),
                                     &re->rx_desc_dma, GFP_ATOMIC);
@@ -185 +185 @@
                 skb_reserve(new_skb, NET_IP_ALIGN);
 
-                dma_addr = dma_map_single(NULL, new_skb->data,
+                dma_addr = dma_map_single(&re->netdev->dev, new_skb->data,
                                           MAX_RX_LENGTH, DMA_FROM_DEVICE);
                 re->rx_dma[i] = dma_addr;
@@ -235 +235 @@
 
         dev->trans_start = jiffies;
-        mapped_addr = dma_map_single(NULL, skb->data, skb->len, DMA_TO_DEVICE);
+        mapped_addr = dma_map_single(&priv->netdev->dev, skb->data, skb->len,
+                                     DMA_TO_DEVICE);
 
         spin_lock(&priv->page_lock);
@@ -289 +290 @@
                         dma_addr_t dma_addr;
 
-                        dma_unmap_single(NULL, priv->rx_dma[rx], MAX_RX_LENGTH,
-                                         DMA_FROM_DEVICE);
+                        dma_unmap_single(&priv->netdev->dev, priv->rx_dma[rx],
+                                         MAX_RX_LENGTH, DMA_FROM_DEVICE);
 
                         skb_put(rx_skb, pktlen);
@@ -303 +304 @@
                         skb_reserve(new_skb, NET_IP_ALIGN);
 
-                        dma_addr = dma_map_single(NULL,
+                        dma_addr = dma_map_single(&priv->netdev->dev,
                                                   new_skb->data,
                                                   MAX_RX_LENGTH,