macb_main: pass struct device to DMA API functions
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>
This commit is contained in:
Родитель
3c69aec48f
Коммит
564923e4c0
|
@ -3673,9 +3673,9 @@ static netdev_tx_t at91ether_start_xmit(struct sk_buff *skb,
|
||||||
/* Store packet information (to free when Tx completed) */
|
/* Store packet information (to free when Tx completed) */
|
||||||
lp->skb = skb;
|
lp->skb = skb;
|
||||||
lp->skb_length = skb->len;
|
lp->skb_length = skb->len;
|
||||||
lp->skb_physaddr = dma_map_single(NULL, skb->data, skb->len,
|
lp->skb_physaddr = dma_map_single(&lp->pdev->dev, skb->data,
|
||||||
DMA_TO_DEVICE);
|
skb->len, DMA_TO_DEVICE);
|
||||||
if (dma_mapping_error(NULL, lp->skb_physaddr)) {
|
if (dma_mapping_error(&lp->pdev->dev, lp->skb_physaddr)) {
|
||||||
dev_kfree_skb_any(skb);
|
dev_kfree_skb_any(skb);
|
||||||
dev->stats.tx_dropped++;
|
dev->stats.tx_dropped++;
|
||||||
netdev_err(dev, "%s: DMA mapping error\n", __func__);
|
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) {
|
if (lp->skb) {
|
||||||
dev_kfree_skb_irq(lp->skb);
|
dev_kfree_skb_irq(lp->skb);
|
||||||
lp->skb = NULL;
|
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);
|
lp->skb_length, DMA_TO_DEVICE);
|
||||||
dev->stats.tx_packets++;
|
dev->stats.tx_packets++;
|
||||||
dev->stats.tx_bytes += lp->skb_length;
|
dev->stats.tx_bytes += lp->skb_length;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче