diff options
| author |   Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> | 2011-06-30 22:52:13 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-07-03 20:10:47 -0700 |
| commit | 31fcb99d9958bdf04e84224e202f69e6cdac893b (patch) | |
| tree | e4575e4e75003aebae8fca41b8fd215d725a7dba /drivers/net/sh_eth.c | |
| parent | af_econet: Use current logging styles and neatening (diff) | |
| download | linux-dev-31fcb99d9958bdf04e84224e202f69e6cdac893b.tar.xz linux-dev-31fcb99d9958bdf04e84224e202f69e6cdac893b.zip | |
net: sh_eth: remove __flush_purge_region
It is a function of SuperH architecture. There is no good to use
the function on a driver generally. So, the driver uses
dma_map_single() instead of __flush_purge_region.
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sh_eth.c')
| -rw-r--r-- | drivers/net/sh_eth.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 96a629f1678e..3da168a859ca 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -33,7 +33,6 @@ #include <linux/pm_runtime.h> #include <linux/slab.h> #include <linux/ethtool.h> -#include <asm/cacheflush.h> #include "sh_eth.h" @@ -864,6 +863,8 @@ static int sh_eth_txfree(struct net_device *ndev) break; /* Free the original skb. */ if (mdp->tx_skbuff[entry]) { + dma_unmap_single(&ndev->dev, txdesc->addr, + txdesc->buffer_length, DMA_TO_DEVICE); dev_kfree_skb_irq(mdp->tx_skbuff[entry]); mdp->tx_skbuff[entry] = NULL; freeNum++; @@ -1487,13 +1488,12 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev) entry = mdp->cur_tx % TX_RING_SIZE; mdp->tx_skbuff[entry] = skb; txdesc = &mdp->tx_ring[entry]; - txdesc->addr = virt_to_phys(skb->data); /* soft swap. */ if (!mdp->cd->hw_swap) sh_eth_soft_swap(phys_to_virt(ALIGN(txdesc->addr, 4)), skb->len + 2); - /* write back */ - __flush_purge_region(skb->data, skb->len); + txdesc->addr = dma_map_single(&ndev->dev, skb->data, skb->len, + DMA_TO_DEVICE); if (skb->len < ETHERSMALL) txdesc->buffer_length = ETHERSMALL; else |