renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-13 08:04:45 +08:00
Code

net: sh_eth: remove __flush_purge_region

Browse Source 
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>
This commit is contained in:
Yoshihiro Shimoda 2011-06-30 22:52:13 +00:00 committed by David S. Miller
parent ee9c88f228
commit 31fcb99d99
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/sh_eth.c
View File

@ -33,7 +33,6 @@
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <asm/cacheflush.h>
#include "sh_eth.h" #include "sh_eth.h"
@ -864,6 +863,8 @@ static int sh_eth_txfree(struct net_device *ndev)
break; break;
/* Free the original skb. */ /* Free the original skb. */
if (mdp->tx_skbuff[entry]) { 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]); dev_kfree_skb_irq(mdp->tx_skbuff[entry]);
mdp->tx_skbuff[entry] = NULL; mdp->tx_skbuff[entry] = NULL;
freeNum++; 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; entry = mdp->cur_tx % TX_RING_SIZE;
mdp->tx_skbuff[entry] = skb; mdp->tx_skbuff[entry] = skb;
txdesc = &mdp->tx_ring[entry]; txdesc = &mdp->tx_ring[entry];
txdesc->addr = virt_to_phys(skb->data);
/* soft swap. */ /* soft swap. */
if (!mdp->cd->hw_swap) if (!mdp->cd->hw_swap)
sh_eth_soft_swap(phys_to_virt(ALIGN(txdesc->addr, 4)), sh_eth_soft_swap(phys_to_virt(ALIGN(txdesc->addr, 4)),
skb->len + 2); skb->len + 2);
/* write back */ txdesc->addr = dma_map_single(&ndev->dev, skb->data, skb->len,
__flush_purge_region(skb->data, skb->len); DMA_TO_DEVICE);
if (skb->len < ETHERSMALL) if (skb->len < ETHERSMALL)
txdesc->buffer_length = ETHERSMALL; txdesc->buffer_length = ETHERSMALL;
else else