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

ionic: use wait_on_bit_lock() rather than open code

Browse Source 
Replace the open-coded ionic_wait_for_bit() with the
kernel's wait_on_bit_lock().

Signed-off-by: Shannon Nelson <snelson@pensando.io>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Shannon Nelson 2019-09-30 20:03:23 -07:00 committed by David S. Miller
parent da0729e8d2
commit d229be4b27
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
View File

@ -453,6 +453,7 @@ static int ionic_set_ringparam(struct net_device *netdev,
{
struct ionic_lif *lif = netdev_priv(netdev);
bool running;
int err;
if (ring->rx_mini_pending || ring->rx_jumbo_pending) {
netdev_info(netdev, "Changing jumbo or mini descriptors not supported\n");
@ -470,8 +471,9 @@ static int ionic_set_ringparam(struct net_device *netdev,
ring->rx_pending == lif->nrxq_descs)
return 0;
if (!ionic_wait_for_bit(lif, IONIC_LIF_QUEUE_RESET))
return -EBUSY;
err = ionic_wait_for_bit(lif, IONIC_LIF_QUEUE_RESET);
if (err)
return err;
running = test_bit(IONIC_LIF_UP, lif->state);
if (running)
@ -504,6 +506,7 @@ static int ionic_set_channels(struct net_device *netdev,
{
struct ionic_lif *lif = netdev_priv(netdev);
bool running;
int err;
if (!ch->combined_count || ch->other_count ||
ch->rx_count || ch->tx_count)
@ -512,8 +515,9 @@ static int ionic_set_channels(struct net_device *netdev,
if (ch->combined_count == lif->nxqs)
return 0;
if (!ionic_wait_for_bit(lif, IONIC_LIF_QUEUE_RESET))
return -EBUSY;
err = ionic_wait_for_bit(lif, IONIC_LIF_QUEUE_RESET);
if (err)
return err;
running = test_bit(IONIC_LIF_UP, lif->state);
if (running)

5
drivers/net/ethernet/pensando/ionic/ionic_lif.c
View File

@ -1619,8 +1619,9 @@ int ionic_reset_queues(struct ionic_lif *lif)
/* Put off the next watchdog timeout */
netif_trans_update(lif->netdev);
if (!ionic_wait_for_bit(lif, IONIC_LIF_QUEUE_RESET))
return -EBUSY;
err = ionic_wait_for_bit(lif, IONIC_LIF_QUEUE_RESET);
if (err)
return err;
running = netif_running(lif->netdev);
if (running)

9
drivers/net/ethernet/pensando/ionic/ionic_lif.h
View File

@ -185,15 +185,10 @@ struct ionic_lif {
#define lif_to_txq(lif, i) (&lif_to_txqcq((lif), i)->q)
#define lif_to_rxq(lif, i) (&lif_to_txqcq((lif), i)->q)
/* return 0 if successfully set the bit, else non-zero */
static inline int ionic_wait_for_bit(struct ionic_lif *lif, int bitname)
{
unsigned long tlimit = jiffies + HZ;
while (test_and_set_bit(bitname, lif->state) &&
time_before(jiffies, tlimit))
usleep_range(100, 200);
return test_bit(bitname, lif->state);
return wait_on_bit_lock(lif->state, bitname, TASK_INTERRUPTIBLE);
}
static inline u32 ionic_coal_usec_to_hw(struct ionic *ionic, u32 usecs)