Skip to content

Commit

Permalink
liquidio: Removed one line function wake_q
Browse files Browse the repository at this point in the history
Removing one line function wake_q

Signed-off-by: Intiyaz Basha <intiyaz.basha@cavium.com>
Acked-by: Derek Chickles <derek.chickles@cavium.com>
Signed-off-by: Felix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Intiyaz Basha authored and David S. Miller committed Mar 25, 2018
1 parent 78a202f commit dd69deb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 23 deletions.
14 changes: 2 additions & 12 deletions drivers/net/ethernet/cavium/liquidio/lio_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -513,16 +513,6 @@ static void liquidio_deinit_pci(void)
pci_unregister_driver(&liquidio_pci_driver);
}

/**
* \brief Wake a queue
* @param netdev network device
* @param q which queue to wake
*/
static inline void wake_q(struct net_device *netdev, int q)
{
netif_wake_subqueue(netdev, q);
}

/**
* \brief Check Tx queue status, and take appropriate action
* @param lio per-network private data
Expand All @@ -541,7 +531,7 @@ static inline int check_txq_status(struct lio *lio)
if (octnet_iq_is_full(lio->oct_dev, iq))
continue;
if (__netif_subqueue_stopped(lio->netdev, q)) {
wake_q(lio->netdev, q);
netif_wake_subqueue(lio->netdev, q);
INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq,
tx_restart, 1);
ret_val++;
Expand Down Expand Up @@ -1661,7 +1651,7 @@ static inline int check_txq_state(struct lio *lio, struct sk_buff *skb)

if (__netif_subqueue_stopped(lio->netdev, q)) {
INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq, tx_restart, 1);
wake_q(lio->netdev, q);
netif_wake_subqueue(lio->netdev, q);
}
return 1;
}
Expand Down
12 changes: 1 addition & 11 deletions drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -284,16 +284,6 @@ static struct pci_driver liquidio_vf_pci_driver = {
.err_handler = &liquidio_vf_err_handler, /* For AER */
};

/**
* \brief Wake a queue
* @param netdev network device
* @param q which queue to wake
*/
static void wake_q(struct net_device *netdev, int q)
{
netif_wake_subqueue(netdev, q);
}

/**
* Remove the node at the head of the list. The list would be empty at
* the end of this call if there are no more nodes in the list.
Expand Down Expand Up @@ -980,7 +970,7 @@ static int check_txq_state(struct lio *lio, struct sk_buff *skb)

if (__netif_subqueue_stopped(lio->netdev, q)) {
INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq, tx_restart, 1);
wake_q(lio->netdev, q);
netif_wake_subqueue(lio->netdev, q);
}

return 1;
Expand Down

0 comments on commit dd69deb

Please sign in to comment.