]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
macb_main: pass struct device to DMA API functions
authorChristoph Hellwig <hch@lst.de>
Mon, 11 Feb 2019 13:19:59 +0000 (14:19 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 12 Feb 2019 17:09:23 +0000 (12:09 -0500)
The DMA API generally relies on a struct device to work properly, and
only barely works without one for legacy reasons.  Pass the easily
available struct device from the platform_device to remedy this.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/cadence/macb_main.c

index eaabe8c278ecfa1931cc613f9a12e0cbd15a7eba..4d1509f431d77df550a863308531a6424b67be44 100644 (file)
@@ -3673,9 +3673,9 @@ static netdev_tx_t at91ether_start_xmit(struct sk_buff *skb,
                /* Store packet information (to free when Tx completed) */
                lp->skb = skb;
                lp->skb_length = skb->len;
-               lp->skb_physaddr = dma_map_single(NULL, skb->data, skb->len,
-                                                       DMA_TO_DEVICE);
-               if (dma_mapping_error(NULL, lp->skb_physaddr)) {
+               lp->skb_physaddr = dma_map_single(&lp->pdev->dev, skb->data,
+                                                 skb->len, DMA_TO_DEVICE);
+               if (dma_mapping_error(&lp->pdev->dev, lp->skb_physaddr)) {
                        dev_kfree_skb_any(skb);
                        dev->stats.tx_dropped++;
                        netdev_err(dev, "%s: DMA mapping error\n", __func__);
@@ -3765,7 +3765,7 @@ static irqreturn_t at91ether_interrupt(int irq, void *dev_id)
                if (lp->skb) {
                        dev_kfree_skb_irq(lp->skb);
                        lp->skb = NULL;
-                       dma_unmap_single(NULL, lp->skb_physaddr,
+                       dma_unmap_single(&lp->pdev->dev, lp->skb_physaddr,
                                         lp->skb_length, DMA_TO_DEVICE);
                        dev->stats.tx_packets++;
                        dev->stats.tx_bytes += lp->skb_length;