korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-12 13:34:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

net: ks8851: Factor out TX work flush function

Browse Source 
While the SPI version of the KS8851 requires a TX worker thread to pump
data via SPI, the parallel bus version can write data into the TX FIFO
directly in .ndo_start_xmit, as the parallel bus access is much faster
and does not sleep. Factor out this TX work flush part, so it can be
overridden by the parallel bus driver.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Lukas Wunner <lukas@wunner.de>
Cc: Petr Stetiar <ynezz@true.cz>
Cc: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Marek Vasut 2020-05-29 00:21:41 +02:00 committed by David S. Miller
parent 24be72632c
commit 144ad36c3d
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/ethernet/micrel/ks8851.c
View File

@ -781,6 +781,17 @@ static void ks8851_tx_work(struct work_struct *work)
ks8851_unlock(ks, &flags); ks8851_unlock(ks, &flags);
} }
/**
* ks8851_flush_tx_work - flush outstanding TX work
* @ks: The device state
*/
static void ks8851_flush_tx_work(struct ks8851_net *ks)
{
struct ks8851_net_spi *kss = to_ks8851_spi(ks);
flush_work(&kss->tx_work);
}
/** /**
* ks8851_net_open - open network device * ks8851_net_open - open network device
* @dev: The network device being opened. * @dev: The network device being opened.
@ -880,11 +891,8 @@ static int ks8851_net_open(struct net_device *dev)
static int ks8851_net_stop(struct net_device *dev) static int ks8851_net_stop(struct net_device *dev)
{ {
struct ks8851_net *ks = netdev_priv(dev); struct ks8851_net *ks = netdev_priv(dev);
struct ks8851_net_spi *kss;
unsigned long flags; unsigned long flags;
kss = to_ks8851_spi(ks);
netif_info(ks, ifdown, dev, "shutting down\n"); netif_info(ks, ifdown, dev, "shutting down\n");
netif_stop_queue(dev); netif_stop_queue(dev);
@ -896,7 +904,7 @@ static int ks8851_net_stop(struct net_device *dev)
ks8851_unlock(ks, &flags); ks8851_unlock(ks, &flags);
/* stop any outstanding work */ /* stop any outstanding work */
flush_work(&kss->tx_work); ks8851_flush_tx_work(ks);
flush_work(&ks->rxctrl_work); flush_work(&ks->rxctrl_work);
ks8851_lock(ks, &flags); ks8851_lock(ks, &flags);