From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4C1BBA09E4; Fri, 29 Jan 2021 23:45:04 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 390F44069F; Fri, 29 Jan 2021 23:45:04 +0100 (CET) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mails.dpdk.org (Postfix) with ESMTP id 40A4B40697 for ; Fri, 29 Jan 2021 23:45:02 +0100 (CET) Received: by mail-pf1-f175.google.com with SMTP id m6so7144828pfk.1 for ; Fri, 29 Jan 2021 14:45:02 -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=ik41/F2A4B3kZEoQ7HdRoI4fq9mG/AX0jkmS0JveGTk=; b=WabEq0siLIUic+sp0m62mNDqv0XiSO0ebNcwHIynPNHDUp1wI2rCx8Tjc1Omii1e2h Ha1Kv8AYbf7lwytRLIYqC/hkNHVm1DbUSv8DhwT2waHCh506JszCuDqTcdswKcemnWg7 Nd/5Z47QHDKieABlkEADR1PUJ0f1v9A2WMs60i7OhuYqSyVHQTOFwF6/tVDuaLfn+3wG Ncy7cwLwqO9sYtRLdx2q8VDCg5ZwUYrKFGTH46o63jN0NbbIuF7ORj6Yq1qcEbAG5PlU 4bNPHPUc4SonAd9zDJGivYmd2DbfwfXY3DTvxkjz3ovVJ1BgZNbItR6PvFiKjSxHuvL4 jwZw== 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=ik41/F2A4B3kZEoQ7HdRoI4fq9mG/AX0jkmS0JveGTk=; b=lsIeukbNAZWqZk9aFkZAB9XiGpYvRcGjG+lT4hypBYgMR4Szuib7GHvGpM9rdiObhE qoZfJgkOvJkkJXmPg0FxuMwNvs8LAYMTxkbTIEbL4+1Ok3dv6GWrkhZVkPqxtp6j1jHS YWcVgyDzgjN2GvVdZv5dKboBg0xMoAv9hvme7r9NmtwjEQkIAOCJ1A5ZIL3Z/99K09lr 0+vBtLw7zeux1k2rjObwYlHtKYawCL+6b9J5VuHPfqDsBnZZKAZ0E/MxPyprX5DkK7nk Myx97IKIWQ+HwnmGHIFBNF5JQ8bxj0zM0cbYSTJLeuu7kIUtaNui9PvmN/b5u6R7etNk mpUw== X-Gm-Message-State: AOAM530d1ewwvcds6WUmh2kUhwn0MopByHMpOGfG7xfnsm3DbRVsboqm gEWchYAYuRUM+So+630vAhsOksP4SAnu9w== X-Google-Smtp-Source: ABdhPJxtQrT0LlfAdARbYN+iSVtTraKzzOvVserfRVlZrpM15PhUkdULbEljWVDErS1kBfJMP416KQ== X-Received: by 2002:a63:7050:: with SMTP id a16mr6937955pgn.164.1611960301160; Fri, 29 Jan 2021 14:45:01 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id i36sm10561557pgi.81.2021.01.29.14.45.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jan 2021 14:45:00 -0800 (PST) From: Andrew Boyer To: dev@dpdk.org Cc: Alfredo Cardigliano , Andrew Boyer Date: Fri, 29 Jan 2021 14:44:33 -0800 Message-Id: <20210129224434.71536-2-aboyer@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210129224434.71536-1-aboyer@pensando.io> References: <20210129224434.71536-1-aboyer@pensando.io> In-Reply-To: <20210118203508.1332-5-aboyer@pensando.io> References: <20210118203508.1332-5-aboyer@pensando.io> Subject: [dpdk-dev] [PATCH v2 4/13] net/ionic: use the existing array-size macro X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" Using the RTE_DIM() macro makes the code clearer. Signed-off-by: Andrew Boyer --- drivers/net/ionic/ionic_dev.c | 10 ++++------ drivers/net/ionic/ionic_ethdev.c | 3 +-- drivers/net/ionic/ionic_lif.c | 9 +++------ drivers/net/ionic/ionic_main.c | 32 +++++++++++--------------------- 4 files changed, 19 insertions(+), 35 deletions(-) diff --git a/drivers/net/ionic/ionic_dev.c b/drivers/net/ionic/ionic_dev.c index aba1713fbc..a9f9e2faf9 100644 --- a/drivers/net/ionic/ionic_dev.c +++ b/drivers/net/ionic/ionic_dev.c @@ -87,9 +87,8 @@ void ionic_dev_cmd_comp(struct ionic_dev *idev, void *mem) { union ionic_dev_cmd_comp *comp = mem; - unsigned int i; - uint32_t comp_size = sizeof(comp->words) / - sizeof(comp->words[0]); + uint32_t comp_size = RTE_DIM(comp->words); + uint32_t i; for (i = 0; i < comp_size; i++) comp->words[i] = ioread32(&idev->dev_cmd->comp.words[i]); @@ -98,9 +97,8 @@ ionic_dev_cmd_comp(struct ionic_dev *idev, void *mem) void ionic_dev_cmd_go(struct ionic_dev *idev, union ionic_dev_cmd *cmd) { - unsigned int i; - uint32_t cmd_size = sizeof(cmd->words) / - sizeof(cmd->words[0]); + uint32_t cmd_size = RTE_DIM(cmd->words); + uint32_t i; IONIC_PRINT(DEBUG, "Sending %s (%d) via dev_cmd", ionic_opcode_to_str(cmd->cmd.opcode), cmd->cmd.opcode); diff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c index a5b2301e46..747082a263 100644 --- a/drivers/net/ionic/ionic_ethdev.c +++ b/drivers/net/ionic/ionic_ethdev.c @@ -207,8 +207,7 @@ static const struct rte_ionic_xstats_name_off rte_ionic_xstats_strings[] = { tx_desc_data_error)}, }; -#define IONIC_NB_HW_STATS (sizeof(rte_ionic_xstats_strings) / \ - sizeof(rte_ionic_xstats_strings[0])) +#define IONIC_NB_HW_STATS RTE_DIM(rte_ionic_xstats_strings) static int ionic_dev_fw_version_get(struct rte_eth_dev *eth_dev, diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c index 3e2edde35d..8dd49b6628 100644 --- a/drivers/net/ionic/ionic_lif.c +++ b/drivers/net/ionic/ionic_lif.c @@ -1824,13 +1824,10 @@ ionic_lif_identify(struct ionic_adapter *adapter) struct ionic_dev *idev = &adapter->idev; struct ionic_identity *ident = &adapter->ident; union ionic_lif_config *cfg = &ident->lif.eth.config; + uint32_t lif_words = RTE_DIM(ident->lif.words); + uint32_t cmd_words = RTE_DIM(idev->dev_cmd->data); + uint32_t i, nwords; int err; - unsigned int i; - unsigned int lif_words = sizeof(ident->lif.words) / - sizeof(ident->lif.words[0]); - unsigned int cmd_words = sizeof(idev->dev_cmd->data) / - sizeof(idev->dev_cmd->data[0]); - unsigned int nwords; ionic_dev_cmd_lif_identify(idev, IONIC_LIF_TYPE_CLASSIC, IONIC_IDENTITY_VERSION_1); diff --git a/drivers/net/ionic/ionic_main.c b/drivers/net/ionic/ionic_main.c index 3f15a6f2f2..3f1a764888 100644 --- a/drivers/net/ionic/ionic_main.c +++ b/drivers/net/ionic/ionic_main.c @@ -263,15 +263,11 @@ ionic_identify(struct ionic_adapter *adapter) { struct ionic_dev *idev = &adapter->idev; struct ionic_identity *ident = &adapter->ident; - int err = 0; - uint32_t i; - unsigned int nwords; - uint32_t drv_size = sizeof(ident->drv.words) / - sizeof(ident->drv.words[0]); - uint32_t cmd_size = sizeof(idev->dev_cmd->data) / - sizeof(idev->dev_cmd->data[0]); - uint32_t dev_size = sizeof(ident->dev.words) / - sizeof(ident->dev.words[0]); + uint32_t drv_size = RTE_DIM(ident->drv.words); + uint32_t cmd_size = RTE_DIM(idev->dev_cmd->data); + uint32_t dev_size = RTE_DIM(ident->dev.words); + uint32_t i, nwords; + int err; memset(ident, 0, sizeof(*ident)); @@ -323,12 +319,9 @@ ionic_port_identify(struct ionic_adapter *adapter) { struct ionic_dev *idev = &adapter->idev; struct ionic_identity *ident = &adapter->ident; - unsigned int port_words = sizeof(ident->port.words) / - sizeof(ident->port.words[0]); - unsigned int cmd_words = sizeof(idev->dev_cmd->data) / - sizeof(idev->dev_cmd->data[0]); - unsigned int i; - unsigned int nwords; + uint32_t port_words = RTE_DIM(ident->port.words); + uint32_t cmd_words = RTE_DIM(idev->dev_cmd->data); + uint32_t i, nwords; int err; ionic_dev_cmd_port_identify(idev); @@ -374,12 +367,9 @@ ionic_port_init(struct ionic_adapter *adapter) struct ionic_dev *idev = &adapter->idev; struct ionic_identity *ident = &adapter->ident; char z_name[RTE_MEMZONE_NAMESIZE]; - unsigned int config_words = sizeof(ident->port.config.words) / - sizeof(ident->port.config.words[0]); - unsigned int cmd_words = sizeof(idev->dev_cmd->data) / - sizeof(idev->dev_cmd->data[0]); - unsigned int nwords; - unsigned int i; + uint32_t config_words = RTE_DIM(ident->port.config.words); + uint32_t cmd_words = RTE_DIM(idev->dev_cmd->data); + uint32_t i, nwords; int err; if (idev->port_info) -- 2.17.1