liquidio: Removed one line function wake_q

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>

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c
index 69a396d47eb8e69f940b64759333891b124adcd7..15129d0d45e9a9bdf1fc10c012cff93a94c85fd5 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -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
@@ -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++;
@@ -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;
 }

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
index 3120aed30c611622eda149f6c89005cf11ffd9d1..5ab0831d6b53a3d03e63c23990c29e12925f3cd9 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
@@ -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.
@@ -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;