use simple zero initializers

[dpdk.git] / lib / librte_pmd_mlx4 / mlx4.c

diff --git a/lib/librte_pmd_mlx4/mlx4.c b/lib/librte_pmd_mlx4/mlx4.c
index fa749f4..024282a 100644 (file)
--- a/lib/librte_pmd_mlx4/mlx4.c
+++ b/lib/librte_pmd_mlx4/mlx4.c
@@ -792,10 +792,10 @@ txq_alloc_elts(struct txq *txq, unsigned int elts_n)
 error:
        if (mr_linear != NULL)
                claim_zero(ibv_dereg_mr(mr_linear));
-       if (elts_linear != NULL)
-               rte_free(elts_linear);
-       if (elts != NULL)
-               rte_free(elts);
+
+       rte_free(elts_linear);
+       rte_free(elts);
+
        DEBUG("%p: failed, freed everything", (void *)txq);
        assert(ret > 0);
        return ret;
@@ -823,8 +823,8 @@ txq_free_elts(struct txq *txq)
        txq->mr_linear = NULL;
        if (mr_linear != NULL)
                claim_zero(ibv_dereg_mr(mr_linear));
-       if (elts_linear != NULL)
-               rte_free(elts_linear);
+
+       rte_free(elts_linear);
        if (elts == NULL)
                return;
        for (i = 0; (i != elemof(*elts)); ++i) {
@@ -3497,7 +3497,7 @@ static void
 mlx4_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 {
        struct priv *priv = dev->data->dev_private;
-       struct rte_eth_stats tmp = { .ipackets = 0 };
+       struct rte_eth_stats tmp = {0};
        unsigned int i;
        unsigned int idx;
 
@@ -4162,7 +4162,7 @@ mlx4_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
        return -ret;
 }
 
-static struct eth_dev_ops mlx4_dev_ops = {
+static const struct eth_dev_ops mlx4_dev_ops = {
        .dev_configure = mlx4_dev_configure,
        .dev_start = mlx4_dev_start,
        .dev_stop = mlx4_dev_stop,
@@ -4602,8 +4602,7 @@ mlx4_pci_devinit(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                continue;
 
 port_error:
-               if (priv)
-                       rte_free(priv);
+               rte_free(priv);
                if (pd)
                        claim_zero(ibv_dealloc_pd(pd));
                if (ctx)