[Resend] xen/netback: do some code cleanup

Commit Message

Jürgen Groß June 7, 2022, 5:28 a.m. UTC

Remove some unused macros and functions, make local functions static.

Signed-off-by: Juergen Gross <[e-mail]>
Acked-by: Wei Liu <[e-mail]>
---
  drivers/net/xen-netback/common.h    | 12 ------------
  drivers/net/xen-netback/interface.c | 16 +---------------
  drivers/net/xen-netback/netback.c   |  4 +++-
  drivers/net/xen-netback/rx.c        |  2 +-
  4 files changed, 5 insertions(+), 29 deletions(-)

Comments

Jakub Kicinski June 8, 2022, 12:25 a.m. UTC | #1

On Tue, 7 Jun 2022 07:28:38 +0200 Juergen Gross wrote:
> Remove some unused macros and functions, make local functions static.

> --- a/drivers/net/xen-netback/rx.c
> +++ b/drivers/net/xen-netback/rx.c
> @@ -486,7 +486,7 @@ static void xenvif_rx_skb(struct xenvif_queue *queue)
>    #define RX_BATCH_SIZE 64
>   -void xenvif_rx_action(struct xenvif_queue *queue)
> +static void xenvif_rx_action(struct xenvif_queue *queue)

Strange, I haven't seen this kind of corruption before, but the patch
certainly looks corrupted. It doesn't apply.
Could you "git send-email" it?

>   {

Patch

diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h
index d9dea4829c86..8174d7b2966c 100644
--- a/drivers/net/xen-netback/common.h
+++ b/drivers/net/xen-netback/common.h
@@ -48,7 +48,6 @@ 
  #include <linux/debugfs.h>
   typedef unsigned int pending_ring_idx_t;
-#define INVALID_PENDING_RING_IDX (~0U)
   struct pending_tx_info {
  	struct xen_netif_tx_request req; /* tx request */
@@ -82,8 +81,6 @@  struct xenvif_rx_meta {
  /* Discriminate from any valid pending_idx value. */
  #define INVALID_PENDING_IDX 0xFFFF
  -#define MAX_BUFFER_OFFSET XEN_PAGE_SIZE
-
  #define MAX_PENDING_REQS XEN_NETIF_TX_RING_SIZE
   /* The maximum number of frags is derived from the size of a grant (same
@@ -367,11 +364,6 @@  void xenvif_free(struct xenvif *vif);
  int xenvif_xenbus_init(void);
  void xenvif_xenbus_fini(void);
  -int xenvif_schedulable(struct xenvif *vif);
-
-int xenvif_queue_stopped(struct xenvif_queue *queue);
-void xenvif_wake_queue(struct xenvif_queue *queue);
-
  /* (Un)Map communication rings. */
  void xenvif_unmap_frontend_data_rings(struct xenvif_queue *queue);
  int xenvif_map_frontend_data_rings(struct xenvif_queue *queue,
@@ -394,7 +386,6 @@  int xenvif_dealloc_kthread(void *data);
  irqreturn_t xenvif_ctrl_irq_fn(int irq, void *data);
   bool xenvif_have_rx_work(struct xenvif_queue *queue, bool test_kthread);
-void xenvif_rx_action(struct xenvif_queue *queue);
  void xenvif_rx_queue_tail(struct xenvif_queue *queue, struct sk_buff *skb);
   void xenvif_carrier_on(struct xenvif *vif);
@@ -403,9 +394,6 @@  void xenvif_carrier_on(struct xenvif *vif);
  void xenvif_zerocopy_callback(struct sk_buff *skb, struct ubuf_info *ubuf,
  			      bool zerocopy_success);
  -/* Unmap a pending page and release it back to the guest */
-void xenvif_idx_unmap(struct xenvif_queue *queue, u16 pending_idx);
-
  static inline pending_ring_idx_t nr_pending_reqs(struct xenvif_queue *queue)
  {
  	return MAX_PENDING_REQS -
diff --git a/drivers/net/xen-netback/interface.c 
b/drivers/net/xen-netback/interface.c
index 8e035374a370..fb32ae82d9b0 100644
--- a/drivers/net/xen-netback/interface.c
+++ b/drivers/net/xen-netback/interface.c
@@ -69,7 +69,7 @@  void xenvif_skb_zerocopy_complete(struct xenvif_queue *queue)
  	wake_up(&queue->dealloc_wq);
  }
  -int xenvif_schedulable(struct xenvif *vif)
+static int xenvif_schedulable(struct xenvif *vif)
  {
  	return netif_running(vif->dev) &&
  		test_bit(VIF_STATUS_CONNECTED, &vif->status) &&
@@ -177,20 +177,6 @@  irqreturn_t xenvif_interrupt(int irq, void *dev_id)
  	return IRQ_HANDLED;
  }
  -int xenvif_queue_stopped(struct xenvif_queue *queue)
-{
-	struct net_device *dev = queue->vif->dev;
-	unsigned int id = queue->id;
-	return netif_tx_queue_stopped(netdev_get_tx_queue(dev, id));
-}
-
-void xenvif_wake_queue(struct xenvif_queue *queue)
-{
-	struct net_device *dev = queue->vif->dev;
-	unsigned int id = queue->id;
-	netif_tx_wake_queue(netdev_get_tx_queue(dev, id));
-}
-
  static u16 xenvif_select_queue(struct net_device *dev, struct sk_buff *skb,
  			       struct net_device *sb_dev)
  {
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index d93814c14a23..fc61a4418737 100644
--- 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,
@@ -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;
diff --git a/drivers/net/xen-netback/rx.c b/drivers/net/xen-netback/rx.c
index dbac4c03d21a..8df2c736fd23 100644
--- a/drivers/net/xen-netback/rx.c
+++ b/drivers/net/xen-netback/rx.c
@@ -486,7 +486,7 @@  static void xenvif_rx_skb(struct xenvif_queue *queue)
   #define RX_BATCH_SIZE 64
  -void xenvif_rx_action(struct xenvif_queue *queue)
+static void xenvif_rx_action(struct xenvif_queue *queue)
  {
  	struct sk_buff_head completed_skbs;
  	unsigned int work_done = 0;
-- 
2.35.3