From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 46527A04DB; Thu, 10 Dec 2020 03:10:21 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4A6F9C9DA; Thu, 10 Dec 2020 03:08:12 +0100 (CET) Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by dpdk.org (Postfix) with ESMTP id 60B91C9BC for ; Thu, 10 Dec 2020 03:08:07 +0100 (CET) Received: by mail-pg1-f196.google.com with SMTP id w5so1963651pgj.3 for ; Wed, 09 Dec 2020 18:08:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pensando.io; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=1ZVvyBY//njtsop6M5/B5l7qhDW/0nU0BIKMVUqdFBE=; b=g6UC0YIk6KiZTirVGUfiMxAnJ4VTYJVB8FkAZC2HIJEi0shg3QznV4pbb1fiECMR4+ h095BfsjIwyvY4QW9sVjz2xO/tHgrk1W7FXTBjvu2wzhTQjhiA2aWCmqiq9s4lG3eV5s TaPiRr2Fdbua6sHfcSnksFdPkQ2gXM5PTiRBjMcY5fZ8s5sd7rT3HuJbWNymMciSfyQa sOZzJs81Bu4aj6EySIrkRHk2hKsqjmth1UX7Vq1bhUZ+UQwsm9AyEhpTjjzXti9KRLg5 7B1zK8GlKbmSU14RLOyZWNYYwuCDqeDU840UDy/Bnp5KxWuO84/zMy6jQUd5xqAMRkWh BElg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=1ZVvyBY//njtsop6M5/B5l7qhDW/0nU0BIKMVUqdFBE=; b=K2kE6Mpswj3bYs0k4ihaahZ/rz0TzL1TE2wVSAMBbKwtV9Rwy8gRdGT8IXBs3duP6L yvHw8rvc+a7ZdIhu+eti6oISJj3gJS9DyGqzjvwYEW6CZFL4Dgz1/Y/hKRsaiwv0HNnn 3xboQNUXXppN9e8/lEeenFYcma/gIepUsqSWrUgumlkW4fVEyjd4yTF1lk7h8CqjdLQM dWUDUniJtTasGvxjKa5+2YGa1gNU8emJqdzTkWCdz7S9OqALynURfb3SGPnF/oKegdkZ QYPnTSAPLRTrkG9jtWPqYfo4Co94WOTechTq391O1rvboLTIe1RSKYTM+L4onE1zLp53 qL/g== X-Gm-Message-State: AOAM5302tRBaxf92E6oCwLkpJUgK2AZFom2901JTYaw6Bx3jF50pH41J UUs0aXTI6Kh0oMtlO6Km4xhXg8Vsn2/2Uw== X-Google-Smtp-Source: ABdhPJxuf5/JVk353mQ2Q8d2POonPTDVO3dQjIPuItS6WRfb6Eg3QfPg4wDREGD2TVdpjAXVF6gDsw== X-Received: by 2002:a63:30c6:: with SMTP id w189mr4525305pgw.120.1607566086414; Wed, 09 Dec 2020 18:08:06 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id p185sm1344537pfb.165.2020.12.09.18.08.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Dec 2020 18:08:05 -0800 (PST) From: Andrew Boyer To: dev@dpdk.org Cc: Alfredo Cardigliano , Andrew Boyer Date: Wed, 9 Dec 2020 18:07:42 -0800 Message-Id: <20201210020743.68927-9-aboyer@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201210020743.68927-1-aboyer@pensando.io> References: <20201210020743.68927-1-aboyer@pensando.io> In-Reply-To: <20201204201646.51746-1-aboyer@pensando.io> References: <20201204201646.51746-1-aboyer@pensando.io> Subject: [dpdk-dev] [PATCH v4 8/9] net/ionic: minor refactorings and helper variables X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This makes the code clearer and conserves resources. Signed-off-by: Andrew Boyer --- drivers/net/ionic/ionic_lif.c | 15 ++++++++++----- drivers/net/ionic/ionic_main.c | 18 +++++++----------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c index 2e33fb8d9..722a89565 100644 --- a/drivers/net/ionic/ionic_lif.c +++ b/drivers/net/ionic/ionic_lif.c @@ -77,11 +77,14 @@ void ionic_lif_reset(struct ionic_lif *lif) { struct ionic_dev *idev = &lif->adapter->idev; + int err; IONIC_PRINT_CALL(); ionic_dev_cmd_lif_reset(idev, lif->index); - ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT); + err = ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT); + if (err) + IONIC_PRINT(WARNING, "Failed to reset lif"); } static void @@ -305,10 +308,11 @@ ionic_dev_add_mac(struct rte_eth_dev *eth_dev, } void -ionic_dev_remove_mac(struct rte_eth_dev *eth_dev, uint32_t index __rte_unused) +ionic_dev_remove_mac(struct rte_eth_dev *eth_dev, uint32_t index) { struct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev); struct ionic_adapter *adapter = lif->adapter; + struct rte_ether_addr *mac_addr; IONIC_PRINT_CALL(); @@ -319,11 +323,12 @@ ionic_dev_remove_mac(struct rte_eth_dev *eth_dev, uint32_t index __rte_unused) return; } - if (!rte_is_valid_assigned_ether_addr(ð_dev->data->mac_addrs[index])) + mac_addr = ð_dev->data->mac_addrs[index]; + + if (!rte_is_valid_assigned_ether_addr(mac_addr)) return; - ionic_lif_addr_del(lif, (const uint8_t *) - ð_dev->data->mac_addrs[index]); + ionic_lif_addr_del(lif, (const uint8_t *)mac_addr); } int diff --git a/drivers/net/ionic/ionic_main.c b/drivers/net/ionic/ionic_main.c index f77bddaa4..92cf0f398 100644 --- a/drivers/net/ionic/ionic_main.c +++ b/drivers/net/ionic/ionic_main.c @@ -188,8 +188,7 @@ ionic_adminq_post_wait(struct ionic_lif *lif, struct ionic_admin_ctx *ctx) done = ionic_wait_ctx_for_completion(lif, qcq, ctx, IONIC_DEVCMD_TIMEOUT); - err = ionic_adminq_check_err(ctx, !done /* timed out */); - return err; + return ionic_adminq_check_err(ctx, !done /* timed out */); } static int @@ -241,10 +240,11 @@ ionic_dev_cmd_wait_check(struct ionic_dev *idev, unsigned long max_wait) int err; err = ionic_dev_cmd_wait(idev, max_wait); - if (err) - return err; - return ionic_dev_cmd_check_error(idev); + if (!err) + err = ionic_dev_cmd_check_error(idev); + + return err; } int @@ -299,22 +299,18 @@ int ionic_init(struct ionic_adapter *adapter) { struct ionic_dev *idev = &adapter->idev; - int err; ionic_dev_cmd_init(idev); - err = ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT); - return err; + return ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT); } int ionic_reset(struct ionic_adapter *adapter) { struct ionic_dev *idev = &adapter->idev; - int err; ionic_dev_cmd_reset(idev); - err = ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT); - return err; + return ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT); } int -- 2.17.1