Skip to content

Commit dd69deb

Browse files
Intiyaz Bashadavem330
authored andcommitted
liquidio: Removed one line function wake_q
Removing one line function wake_q Signed-off-by: Intiyaz Basha <[email protected]> Acked-by: Derek Chickles <[email protected]> Signed-off-by: Felix Manlunas <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 78a202f commit dd69deb

File tree

2 files changed

+3
-23
lines changed

2 files changed

+3
-23
lines changed

drivers/net/ethernet/cavium/liquidio/lio_main.c

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -513,16 +513,6 @@ static void liquidio_deinit_pci(void)
513513
pci_unregister_driver(&liquidio_pci_driver);
514514
}
515515

516-
/**
517-
* \brief Wake a queue
518-
* @param netdev network device
519-
* @param q which queue to wake
520-
*/
521-
static inline void wake_q(struct net_device *netdev, int q)
522-
{
523-
netif_wake_subqueue(netdev, q);
524-
}
525-
526516
/**
527517
* \brief Check Tx queue status, and take appropriate action
528518
* @param lio per-network private data
@@ -541,7 +531,7 @@ static inline int check_txq_status(struct lio *lio)
541531
if (octnet_iq_is_full(lio->oct_dev, iq))
542532
continue;
543533
if (__netif_subqueue_stopped(lio->netdev, q)) {
544-
wake_q(lio->netdev, q);
534+
netif_wake_subqueue(lio->netdev, q);
545535
INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq,
546536
tx_restart, 1);
547537
ret_val++;
@@ -1661,7 +1651,7 @@ static inline int check_txq_state(struct lio *lio, struct sk_buff *skb)
16611651

16621652
if (__netif_subqueue_stopped(lio->netdev, q)) {
16631653
INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq, tx_restart, 1);
1664-
wake_q(lio->netdev, q);
1654+
netif_wake_subqueue(lio->netdev, q);
16651655
}
16661656
return 1;
16671657
}

drivers/net/ethernet/cavium/liquidio/lio_vf_main.c

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -284,16 +284,6 @@ static struct pci_driver liquidio_vf_pci_driver = {
284284
.err_handler = &liquidio_vf_err_handler, /* For AER */
285285
};
286286

287-
/**
288-
* \brief Wake a queue
289-
* @param netdev network device
290-
* @param q which queue to wake
291-
*/
292-
static void wake_q(struct net_device *netdev, int q)
293-
{
294-
netif_wake_subqueue(netdev, q);
295-
}
296-
297287
/**
298288
* Remove the node at the head of the list. The list would be empty at
299289
* the end of this call if there are no more nodes in the list.
@@ -980,7 +970,7 @@ static int check_txq_state(struct lio *lio, struct sk_buff *skb)
980970

981971
if (__netif_subqueue_stopped(lio->netdev, q)) {
982972
INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq, tx_restart, 1);
983-
wake_q(lio->netdev, q);
973+
netif_wake_subqueue(lio->netdev, q);
984974
}
985975

986976
return 1;

0 commit comments

Comments
 (0)