xen/netback: do some code cleanup

[linux-block.git] / drivers / net / xen-netback / netback.c

diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 0f7fd159f0f29af1db71711160484cf092fecf62..fc61a44187377525b6f5b2163600fc1aef6dc3c7 100644 (file)
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -112,6 +112,8 @@ static void make_tx_response(struct xenvif_queue *queue,
                             s8       st);
 static void push_tx_responses(struct xenvif_queue *queue);
 
+static void xenvif_idx_unmap(struct xenvif_queue *queue, u16 pending_idx);
+
 static inline int tx_work_todo(struct xenvif_queue *queue);
 
 static inline unsigned long idx_to_pfn(struct xenvif_queue *queue,
@@ -828,7 +830,7 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue,
                        break;
                }
 
-               work_to_do = RING_HAS_UNCONSUMED_REQUESTS(&queue->tx);
+               work_to_do = XEN_RING_NR_UNCONSUMED_REQUESTS(&queue->tx);
                if (!work_to_do)
                        break;
 
@@ -1418,7 +1420,7 @@ static void push_tx_responses(struct xenvif_queue *queue)
                notify_remote_via_irq(queue->tx_irq);
 }
 
-void xenvif_idx_unmap(struct xenvif_queue *queue, u16 pending_idx)
+static void xenvif_idx_unmap(struct xenvif_queue *queue, u16 pending_idx)
 {
        int ret;
        struct gnttab_unmap_grant_ref tx_unmap_op;