|
|
@@ -157,6 +157,7 @@ struct hip04_priv {
|
|
|
unsigned int reg_inten;
|
|
|
|
|
|
struct napi_struct napi;
|
|
|
+ struct device *dev;
|
|
|
struct net_device *ndev;
|
|
|
|
|
|
struct tx_desc *tx_desc;
|
|
|
@@ -387,7 +388,7 @@ static int hip04_tx_reclaim(struct net_device *ndev, bool force)
|
|
|
}
|
|
|
|
|
|
if (priv->tx_phys[tx_tail]) {
|
|
|
- dma_unmap_single(&ndev->dev, priv->tx_phys[tx_tail],
|
|
|
+ dma_unmap_single(priv->dev, priv->tx_phys[tx_tail],
|
|
|
priv->tx_skb[tx_tail]->len,
|
|
|
DMA_TO_DEVICE);
|
|
|
priv->tx_phys[tx_tail] = 0;
|
|
|
@@ -437,8 +438,8 @@ static int hip04_mac_start_xmit(struct sk_buff *skb, struct net_device *ndev)
|
|
|
return NETDEV_TX_BUSY;
|
|
|
}
|
|
|
|
|
|
- phys = dma_map_single(&ndev->dev, skb->data, skb->len, DMA_TO_DEVICE);
|
|
|
- if (dma_mapping_error(&ndev->dev, phys)) {
|
|
|
+ phys = dma_map_single(priv->dev, skb->data, skb->len, DMA_TO_DEVICE);
|
|
|
+ if (dma_mapping_error(priv->dev, phys)) {
|
|
|
dev_kfree_skb(skb);
|
|
|
return NETDEV_TX_OK;
|
|
|
}
|
|
|
@@ -508,7 +509,7 @@ static int hip04_rx_poll(struct napi_struct *napi, int budget)
|
|
|
goto refill;
|
|
|
}
|
|
|
|
|
|
- dma_unmap_single(&ndev->dev, priv->rx_phys[priv->rx_head],
|
|
|
+ dma_unmap_single(priv->dev, priv->rx_phys[priv->rx_head],
|
|
|
RX_BUF_SIZE, DMA_FROM_DEVICE);
|
|
|
priv->rx_phys[priv->rx_head] = 0;
|
|
|
|
|
|
@@ -537,9 +538,9 @@ refill:
|
|
|
buf = netdev_alloc_frag(priv->rx_buf_size);
|
|
|
if (!buf)
|
|
|
goto done;
|
|
|
- phys = dma_map_single(&ndev->dev, buf,
|
|
|
+ phys = dma_map_single(priv->dev, buf,
|
|
|
RX_BUF_SIZE, DMA_FROM_DEVICE);
|
|
|
- if (dma_mapping_error(&ndev->dev, phys))
|
|
|
+ if (dma_mapping_error(priv->dev, phys))
|
|
|
goto done;
|
|
|
priv->rx_buf[priv->rx_head] = buf;
|
|
|
priv->rx_phys[priv->rx_head] = phys;
|
|
|
@@ -642,9 +643,9 @@ static int hip04_mac_open(struct net_device *ndev)
|
|
|
for (i = 0; i < RX_DESC_NUM; i++) {
|
|
|
dma_addr_t phys;
|
|
|
|
|
|
- phys = dma_map_single(&ndev->dev, priv->rx_buf[i],
|
|
|
+ phys = dma_map_single(priv->dev, priv->rx_buf[i],
|
|
|
RX_BUF_SIZE, DMA_FROM_DEVICE);
|
|
|
- if (dma_mapping_error(&ndev->dev, phys))
|
|
|
+ if (dma_mapping_error(priv->dev, phys))
|
|
|
return -EIO;
|
|
|
|
|
|
priv->rx_phys[i] = phys;
|
|
|
@@ -678,7 +679,7 @@ static int hip04_mac_stop(struct net_device *ndev)
|
|
|
|
|
|
for (i = 0; i < RX_DESC_NUM; i++) {
|
|
|
if (priv->rx_phys[i]) {
|
|
|
- dma_unmap_single(&ndev->dev, priv->rx_phys[i],
|
|
|
+ dma_unmap_single(priv->dev, priv->rx_phys[i],
|
|
|
RX_BUF_SIZE, DMA_FROM_DEVICE);
|
|
|
priv->rx_phys[i] = 0;
|
|
|
}
|
|
|
@@ -822,6 +823,7 @@ static int hip04_mac_probe(struct platform_device *pdev)
|
|
|
return -ENOMEM;
|
|
|
|
|
|
priv = netdev_priv(ndev);
|
|
|
+ priv->dev = d;
|
|
|
priv->ndev = ndev;
|
|
|
platform_set_drvdata(pdev, ndev);
|
|
|
SET_NETDEV_DEV(ndev, &pdev->dev);
|