Simplify the return expression at diffrent gve_adminq.c file, simplify this all.

Signed-off-by: Zheng Yongjun <zhengyongj...@huawei.com>
---
 drivers/net/ethernet/google/gve/gve_adminq.c | 21 +++-----------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c 
b/drivers/net/ethernet/google/gve/gve_adminq.c
index 24ae6a28a806..6719181afdfd 100644
--- a/drivers/net/ethernet/google/gve/gve_adminq.c
+++ b/drivers/net/ethernet/google/gve/gve_adminq.c
@@ -318,7 +318,6 @@ static int gve_adminq_create_tx_queue(struct gve_priv 
*priv, u32 queue_index)
 {
        struct gve_tx_ring *tx = &priv->tx[queue_index];
        union gve_adminq_command cmd;
-       int err;
 
        memset(&cmd, 0, sizeof(cmd));
        cmd.opcode = cpu_to_be32(GVE_ADMINQ_CREATE_TX_QUEUE);
@@ -332,11 +331,7 @@ static int gve_adminq_create_tx_queue(struct gve_priv 
*priv, u32 queue_index)
                .ntfy_id = cpu_to_be32(tx->ntfy_id),
        };
 
-       err = gve_adminq_issue_cmd(priv, &cmd);
-       if (err)
-               return err;
-
-       return 0;
+       return gve_adminq_issue_cmd(priv, &cmd);
 }
 
 int gve_adminq_create_tx_queues(struct gve_priv *priv, u32 num_queues)
@@ -357,7 +352,6 @@ static int gve_adminq_create_rx_queue(struct gve_priv 
*priv, u32 queue_index)
 {
        struct gve_rx_ring *rx = &priv->rx[queue_index];
        union gve_adminq_command cmd;
-       int err;
 
        memset(&cmd, 0, sizeof(cmd));
        cmd.opcode = cpu_to_be32(GVE_ADMINQ_CREATE_RX_QUEUE);
@@ -372,11 +366,7 @@ static int gve_adminq_create_rx_queue(struct gve_priv 
*priv, u32 queue_index)
                .queue_page_list_id = cpu_to_be32(rx->data.qpl->id),
        };
 
-       err = gve_adminq_issue_cmd(priv, &cmd);
-       if (err)
-               return err;
-
-       return 0;
+       return gve_adminq_issue_cmd(priv, &cmd);
 }
 
 int gve_adminq_create_rx_queues(struct gve_priv *priv, u32 num_queues)
@@ -396,7 +386,6 @@ int gve_adminq_create_rx_queues(struct gve_priv *priv, u32 
num_queues)
 static int gve_adminq_destroy_tx_queue(struct gve_priv *priv, u32 queue_index)
 {
        union gve_adminq_command cmd;
-       int err;
 
        memset(&cmd, 0, sizeof(cmd));
        cmd.opcode = cpu_to_be32(GVE_ADMINQ_DESTROY_TX_QUEUE);
@@ -404,11 +393,7 @@ static int gve_adminq_destroy_tx_queue(struct gve_priv 
*priv, u32 queue_index)
                .queue_id = cpu_to_be32(queue_index),
        };
 
-       err = gve_adminq_issue_cmd(priv, &cmd);
-       if (err)
-               return err;
-
-       return 0;
+       return gve_adminq_issue_cmd(priv, &cmd);
 }
 
 int gve_adminq_destroy_tx_queues(struct gve_priv *priv, u32 num_queues)
-- 
2.22.0

Reply via email to