liquidio: Moved common function list_delete_head to octeon_network.h

Moved common function list_delete_head to octeon_network.h
and renamed it to lio_list_delete_head

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 4ac3c4b..c117245 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -542,25 +542,6 @@ static inline int check_txq_status(struct lio *lio)
 }
 
 /**
- * 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.
- */
-static inline struct list_head *list_delete_head(struct list_head *root)
-{
-       struct list_head *node;
-
-       if ((root->prev == root) && (root->next == root))
-               node = NULL;
-       else
-               node = root->next;
-
-       if (node)
-               list_del(node);
-
-       return node;
-}
-
-/**
  * \brief Delete gather lists
  * @param lio per-network private data
  */
@@ -578,7 +559,7 @@ static void delete_glists(struct lio *lio)
        for (i = 0; i < lio->linfo.num_txpciq; i++) {
                do {
                        g = (struct octnic_gather *)
-                               list_delete_head(&lio->glist[i]);
+                               lio_list_delete_head(&lio->glist[i]);
                        if (g)
                                kfree(g);
                } while (g);
@@ -2590,7 +2571,7 @@ static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)
 
                spin_lock(&lio->glist_lock[q_idx]);
                g = (struct octnic_gather *)
-                       list_delete_head(&lio->glist[q_idx]);
+                       lio_list_delete_head(&lio->glist[q_idx]);
                spin_unlock(&lio->glist_lock[q_idx]);
 
                if (!g) {

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
index 1d3661b..0d97561 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
@@ -285,25 +285,6 @@ static struct pci_driver liquidio_vf_pci_driver = {
 };
 
 /**
- * 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.
- */
-static struct list_head *list_delete_head(struct list_head *root)
-{
-       struct list_head *node;
-
-       if ((root->prev == root) && (root->next == root))
-               node = NULL;
-       else
-               node = root->next;
-
-       if (node)
-               list_del(node);
-
-       return node;
-}
-
-/**
  * \brief Delete gather lists
  * @param lio per-network private data
  */
@@ -321,7 +302,7 @@ static void delete_glists(struct lio *lio)
        for (i = 0; i < lio->linfo.num_txpciq; i++) {
                do {
                        g = (struct octnic_gather *)
-                           list_delete_head(&lio->glist[i]);
+                           lio_list_delete_head(&lio->glist[i]);
                        kfree(g);
                } while (g);
 
@@ -1644,8 +1625,8 @@ static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)
                int i, frags;
 
                spin_lock(&lio->glist_lock[q_idx]);
-               g = (struct octnic_gather *)list_delete_head(
-                   &lio->glist[q_idx]);
+               g = (struct octnic_gather *)
+                       lio_list_delete_head(&lio->glist[q_idx]);
                spin_unlock(&lio->glist_lock[q_idx]);
 
                if (!g) {

diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_network.h b/drivers/net/ethernet/cavium/liquidio/octeon_network.h
index 11907e9..1d9392b 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/octeon_network.h
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_network.h
@@ -565,4 +565,23 @@ static inline int skb_iq(struct lio *lio, struct sk_buff *skb)
        return skb->queue_mapping % lio->linfo.num_txpciq;
 }
 
+/**
+ * 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.
+ */
+static inline struct list_head *lio_list_delete_head(struct list_head *root)
+{
+       struct list_head *node;
+
+       if (root->prev == root && root->next == root)
+               node = NULL;
+       else
+               node = root->next;
+
+       if (node)
+               list_del(node);
+
+       return node;
+}
+
 #endif