cantyonion/opi-openwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ar71xx: ag71xx: pass correct device pointer to dma

Browse Source 
Backport of 4eaa3626a821 ("ath79: ag71xx: pass correct device pointer to dma functions")

While 4.14 does not contain the warnings,
it still makes sense to use the proper pointers here.

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
Koen Vandeputte 2019-08-12 12:00:55 +02:00
parent 662922068d
commit e18724b907
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
View File

@ -159,7 +159,7 @@ static void ag71xx_ring_rx_clean(struct ag71xx *ag)
for (i = 0; i < ring_size; i++) for (i = 0; i < ring_size; i++)
if (ring->buf[i].rx_buf) { if (ring->buf[i].rx_buf) {
dma_unmap_single(&ag->dev->dev, ring->buf[i].dma_addr, dma_unmap_single(&ag->pdev->dev, ring->buf[i].dma_addr,
ag->rx_buf_size, DMA_FROM_DEVICE); ag->rx_buf_size, DMA_FROM_DEVICE);
skb_free_frag(ring->buf[i].rx_buf); skb_free_frag(ring->buf[i].rx_buf);
} }
@ -200,7 +200,7 @@ static bool ag71xx_fill_rx_buf(struct ag71xx *ag, struct ag71xx_buf *buf,
return false; return false;
buf->rx_buf = data; buf->rx_buf = data;
buf->dma_addr = dma_map_single(&ag->dev->dev, data, ag->rx_buf_size, buf->dma_addr = dma_map_single(&ag->pdev->dev, data, ag->rx_buf_size,
DMA_FROM_DEVICE); DMA_FROM_DEVICE);
desc->data = (u32) buf->dma_addr + offset; desc->data = (u32) buf->dma_addr + offset;
return true; return true;
@ -290,7 +290,7 @@ static int ag71xx_rings_init(struct ag71xx *ag)
if (!tx->buf) if (!tx->buf)
return -ENOMEM; return -ENOMEM;
tx->descs_cpu = dma_alloc_coherent(NULL, ring_size * AG71XX_DESC_SIZE, tx->descs_cpu = dma_alloc_coherent(&ag->pdev->dev, ring_size * AG71XX_DESC_SIZE,
&tx->descs_dma, GFP_KERNEL); &tx->descs_dma, GFP_KERNEL);
if (!tx->descs_cpu) { if (!tx->descs_cpu) {
kfree(tx->buf); kfree(tx->buf);
@ -313,7 +313,7 @@ static void ag71xx_rings_free(struct ag71xx *ag)
int ring_size = BIT(tx->order) + BIT(rx->order); int ring_size = BIT(tx->order) + BIT(rx->order);
if (tx->descs_cpu) if (tx->descs_cpu)
dma_free_coherent(NULL, ring_size * AG71XX_DESC_SIZE, dma_free_coherent(&ag->pdev->dev, ring_size * AG71XX_DESC_SIZE,
tx->descs_cpu, tx->descs_dma); tx->descs_cpu, tx->descs_dma);
kfree(tx->buf); kfree(tx->buf);
@ -785,7 +785,7 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
goto err_drop; goto err_drop;
} }
dma_addr = dma_map_single(&dev->dev, skb->data, skb->len, dma_addr = dma_map_single(&ag->pdev->dev, skb->data, skb->len,
DMA_TO_DEVICE); DMA_TO_DEVICE);
i = ring->curr & ring_mask; i = ring->curr & ring_mask;
@ -827,7 +827,7 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
return NETDEV_TX_OK; return NETDEV_TX_OK;
err_drop_unmap: err_drop_unmap:
dma_unmap_single(&dev->dev, dma_addr, skb->len, DMA_TO_DEVICE); dma_unmap_single(&ag->pdev->dev, dma_addr, skb->len, DMA_TO_DEVICE);
err_drop: err_drop:
dev->stats.tx_dropped++; dev->stats.tx_dropped++;
@ -1100,7 +1100,7 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
pktlen = desc->ctrl & pktlen_mask; pktlen = desc->ctrl & pktlen_mask;
pktlen -= ETH_FCS_LEN; pktlen -= ETH_FCS_LEN;
dma_unmap_single(&dev->dev, ring->buf[i].dma_addr, dma_unmap_single(&ag->pdev->dev, ring->buf[i].dma_addr,
ag->rx_buf_size, DMA_FROM_DEVICE); ag->rx_buf_size, DMA_FROM_DEVICE);
dev->stats.rx_packets++; dev->stats.rx_packets++;