|
@@ -1172,6 +1172,7 @@ static unsigned int __bcmgenet_tx_reclaim(struct net_device *dev,
|
|
|
struct bcmgenet_tx_ring *ring)
|
|
|
{
|
|
|
struct bcmgenet_priv *priv = netdev_priv(dev);
|
|
|
+ struct device *kdev = &priv->pdev->dev;
|
|
|
struct enet_cb *tx_cb_ptr;
|
|
|
struct netdev_queue *txq;
|
|
|
unsigned int pkts_compl = 0;
|
|
@@ -1199,13 +1200,13 @@ static unsigned int __bcmgenet_tx_reclaim(struct net_device *dev,
|
|
|
if (tx_cb_ptr->skb) {
|
|
|
pkts_compl++;
|
|
|
bytes_compl += GENET_CB(tx_cb_ptr->skb)->bytes_sent;
|
|
|
- dma_unmap_single(&dev->dev,
|
|
|
+ dma_unmap_single(kdev,
|
|
|
dma_unmap_addr(tx_cb_ptr, dma_addr),
|
|
|
dma_unmap_len(tx_cb_ptr, dma_len),
|
|
|
DMA_TO_DEVICE);
|
|
|
bcmgenet_free_cb(tx_cb_ptr);
|
|
|
} else if (dma_unmap_addr(tx_cb_ptr, dma_addr)) {
|
|
|
- dma_unmap_page(&dev->dev,
|
|
|
+ dma_unmap_page(kdev,
|
|
|
dma_unmap_addr(tx_cb_ptr, dma_addr),
|
|
|
dma_unmap_len(tx_cb_ptr, dma_len),
|
|
|
DMA_TO_DEVICE);
|
|
@@ -1775,6 +1776,7 @@ static int bcmgenet_alloc_rx_buffers(struct bcmgenet_priv *priv,
|
|
|
|
|
|
static void bcmgenet_free_rx_buffers(struct bcmgenet_priv *priv)
|
|
|
{
|
|
|
+ struct device *kdev = &priv->pdev->dev;
|
|
|
struct enet_cb *cb;
|
|
|
int i;
|
|
|
|
|
@@ -1782,7 +1784,7 @@ static void bcmgenet_free_rx_buffers(struct bcmgenet_priv *priv)
|
|
|
cb = &priv->rx_cbs[i];
|
|
|
|
|
|
if (dma_unmap_addr(cb, dma_addr)) {
|
|
|
- dma_unmap_single(&priv->dev->dev,
|
|
|
+ dma_unmap_single(kdev,
|
|
|
dma_unmap_addr(cb, dma_addr),
|
|
|
priv->rx_buf_len, DMA_FROM_DEVICE);
|
|
|
dma_unmap_addr_set(cb, dma_addr, 0);
|