]> git.droids-corp.org - dpdk.git/commitdiff
remove unnecessary null checks
authorStephen Hemminger <stephen@networkplumber.org>
Wed, 9 Feb 2022 19:17:15 +0000 (11:17 -0800)
committerThomas Monjalon <thomas@monjalon.net>
Sat, 12 Feb 2022 11:07:48 +0000 (12:07 +0100)
Functions like free, rte_free, and rte_mempool_free
already handle NULL pointer so the checks here are not necessary.

Remove redundant NULL pointer checks before free functions
found by nullfree.cocci

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
130 files changed:
app/pdump/main.c
app/test-crypto-perf/cperf_test_latency.c
app/test-crypto-perf/cperf_test_pmd_cyclecount.c
app/test-crypto-perf/cperf_test_throughput.c
app/test-crypto-perf/cperf_test_vector_parsing.c
app/test-crypto-perf/cperf_test_verify.c
app/test-pmd/cmd_flex_item.c
app/test-pmd/cmdline.c
app/test-pmd/testpmd.c
app/test-regex/main.c
app/test/test_cksum.c
app/test/test_compressdev.c
app/test/test_cryptodev.h
app/test/test_cryptodev_asym.c
app/test/test_cryptodev_blockcipher.c
app/test/test_func_reentrancy.c
app/test/test_hash.c
app/test/test_hash_perf.c
app/test/test_link_bonding.c
app/test/test_link_bonding_mode4.c
app/test/test_malloc.c
app/test/test_mbuf.c
app/test/test_pcapng.c
app/test/test_reorder.c
app/test/virtual_pmd.c
drivers/baseband/acc100/rte_acc100_pmd.c
drivers/baseband/la12xx/bbdev_la12xx.c
drivers/baseband/null/bbdev_null.c
drivers/baseband/turbo_sw/bbdev_turbo_software.c
drivers/bus/fslmc/fslmc_bus.c
drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
drivers/bus/ifpga/ifpga_bus.c
drivers/bus/pci/pci_params.c
drivers/bus/pci/windows/pci.c
drivers/bus/pci/windows/pci_netuio.c
drivers/common/cpt/cpt_ucode_asym.h
drivers/common/dpaax/compat.h
drivers/common/mlx5/mlx5_common_mr.c
drivers/common/mlx5/mlx5_common_pci.c
drivers/common/qat/qat_qp.c
drivers/compress/mlx5/mlx5_compress.c
drivers/compress/octeontx/otx_zip_pmd.c
drivers/crypto/armv8/rte_armv8_pmd_ops.c
drivers/crypto/ccp/ccp_dev.c
drivers/crypto/ccp/ccp_pmd_ops.c
drivers/crypto/cnxk/cnxk_ae.h
drivers/crypto/ipsec_mb/ipsec_mb_ops.c
drivers/crypto/mvsam/rte_mrvl_pmd_ops.c
drivers/crypto/null/null_crypto_pmd_ops.c
drivers/crypto/octeontx/otx_cryptodev_ops.c
drivers/crypto/openssl/rte_openssl_pmd_ops.c
drivers/crypto/scheduler/scheduler_pmd_ops.c
drivers/crypto/virtio/virtqueue.c
drivers/event/sw/sw_evdev.c
drivers/net/axgbe/axgbe_rxtx.c
drivers/net/bnx2x/bnx2x_rxtx.c
drivers/net/bnxt/bnxt_ethdev.c
drivers/net/bonding/rte_eth_bond_pmd.c
drivers/net/cnxk/cnxk_ethdev.c
drivers/net/cxgbe/cxgbe_main.c
drivers/net/dpaa/dpaa_ethdev.c
drivers/net/dpaa/fmlib/fm_lib.c
drivers/net/dpaa2/dpaa2_ethdev.c
drivers/net/dpaa2/dpaa2_mux.c
drivers/net/dpaa2/dpaa2_ptp.c
drivers/net/ena/ena_ethdev.c
drivers/net/hinic/hinic_pmd_ethdev.c
drivers/net/hns3/hns3_rxtx.c
drivers/net/i40e/i40e_ethdev.c
drivers/net/i40e/i40e_rxtx.c
drivers/net/iavf/iavf_rxtx.c
drivers/net/ice/ice_fdir_filter.c
drivers/net/igc/igc_flow.c
drivers/net/ixgbe/ixgbe_ethdev.c
drivers/net/ixgbe/ixgbe_rxtx.c
drivers/net/memif/rte_eth_memif.c
drivers/net/mlx4/mlx4_mr.c
drivers/net/mlx5/mlx5_flow.c
drivers/net/mvpp2/mrvl_qos.c
drivers/net/netvsc/hn_rxtx.c
drivers/net/null/rte_eth_null.c
drivers/net/octeontx/octeontx_ethdev.c
drivers/net/octeontx/octeontx_ethdev_ops.c
drivers/net/qede/qede_main.c
drivers/net/qede/qede_rxtx.c
drivers/net/softnic/rte_eth_softnic_cli.c
drivers/net/softnic/rte_eth_softnic_cryptodev.c
drivers/net/softnic/rte_eth_softnic_thread.c
drivers/net/tap/tap_flow.c
drivers/net/txgbe/txgbe_ethdev.c
drivers/net/vdev_netvsc/vdev_netvsc.c
drivers/net/virtio/virtio_user_ethdev.c
drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c
drivers/raw/dpaa2_qdma/dpaa2_qdma.c
drivers/raw/ifpga/ifpga_rawdev.c
drivers/raw/skeleton/skeleton_rawdev_test.c
drivers/regex/cn9k/cn9k_regexdev.c
drivers/regex/cn9k/cn9k_regexdev_compiler.c
drivers/regex/mlx5/mlx5_regex.c
drivers/regex/mlx5/mlx5_rxp.c
drivers/vdpa/ifc/ifcvf_vdpa.c
drivers/vdpa/mlx5/mlx5_vdpa_mem.c
drivers/vdpa/mlx5/mlx5_vdpa_virtq.c
examples/fips_validation/fips_dev_self_test.c
examples/fips_validation/fips_validation.c
examples/fips_validation/main.c
examples/ip_pipeline/cli.c
examples/ip_pipeline/cryptodev.c
examples/ip_pipeline/thread.c
examples/l2fwd-cat/cat.c
examples/pipeline/thread.c
examples/vhost_blk/vhost_blk.c
lib/compressdev/rte_compressdev.c
lib/eal/common/eal_common_devargs.c
lib/eal/common/eal_common_memzone.c
lib/eal/common/eal_common_options.c
lib/eal/common/eal_common_trace_ctf.c
lib/eal/freebsd/eal.c
lib/eal/linux/eal.c
lib/eal/windows/eal_alarm.c
lib/eal/windows/eal_memory.c
lib/ethdev/rte_ethdev.c
lib/graph/graph_stats.c
lib/ipsec/ipsec_sad.c
lib/port/rte_port_source_sink.c
lib/power/rte_power_empty_poll.c
lib/reorder/rte_reorder.c
lib/vhost/iotlb.c
lib/vhost/vhost_crypto.c
lib/vhost/vhost_user.c

index 46f9d25db00421f4e6bcfc7dab4cb2ad66e70e15..04a38e8911192a79dd44ae714fb8cec0a25493f0 100644 (file)
@@ -502,14 +502,11 @@ cleanup_rings(void)
        for (i = 0; i < num_tuples; i++) {
                pt = &pdump_t[i];
 
-               if (pt->device_id)
-                       free(pt->device_id);
+               free(pt->device_id);
 
                /* free the rings */
-               if (pt->rx_ring)
-                       rte_ring_free(pt->rx_ring);
-               if (pt->tx_ring)
-                       rte_ring_free(pt->tx_ring);
+               rte_ring_free(pt->rx_ring);
+               rte_ring_free(pt->tx_ring);
        }
 }
 
index ce49feaba9f3a01c5faec8c35e1d384937b42ade..4c7bc72eb5fdf3a5435083fb0cdb9d70cc01288d 100644 (file)
@@ -49,8 +49,7 @@ cperf_latency_test_free(struct cperf_latency_ctx *ctx)
                        rte_cryptodev_sym_session_free(ctx->sess);
                }
 
-               if (ctx->pool)
-                       rte_mempool_free(ctx->pool);
+               rte_mempool_free(ctx->pool);
 
                rte_free(ctx->res);
                rte_free(ctx);
index 5842f29d43e23ebc4e30d8ded5fdbf8dd36a6450..6b4d09e623eb1ea0e17b8bb9fd398a9b169fd2ed 100644 (file)
@@ -79,14 +79,11 @@ cperf_pmd_cyclecount_test_free(struct cperf_pmd_cyclecount_ctx *ctx)
                }
        }
 
-       if (ctx->pool)
-               rte_mempool_free(ctx->pool);
+       rte_mempool_free(ctx->pool);
 
-       if (ctx->ops)
-               rte_free(ctx->ops);
+       rte_free(ctx->ops);
 
-       if (ctx->ops_processed)
-               rte_free(ctx->ops_processed);
+       rte_free(ctx->ops_processed);
 
        rte_free(ctx);
 }
index 51512af2ad81a1b40a6eabab57997449561385aa..51fad5a055056baf67fda998df743d7f04392b38 100644 (file)
@@ -57,8 +57,7 @@ cperf_throughput_test_free(struct cperf_throughput_ctx *ctx)
                        rte_cryptodev_sym_session_free(ctx->sess);
                }
        }
-       if (ctx->pool)
-               rte_mempool_free(ctx->pool);
+       rte_mempool_free(ctx->pool);
 
        rte_free(ctx);
 }
index 1e9dfcfff087997580104ef7230bf17d53ca8e95..87f3a90055aaa4886f2c5a3ab5f8d6469b5119ff 100644 (file)
@@ -551,10 +551,8 @@ parse_file(struct cperf_test_vector *vector, struct cperf_options *opts)
 err:
        if (fp)
                fclose(fp);
-       if (line)
-               free(line);
-       if (entry)
-               rte_free(entry);
+       free(line);
+       rte_free(entry);
 
        return -1;
 }
index 496eb0de00f06318e0db7fd5b1d11356882cacf6..c031330afcfea1c5b31cbd530367f5577ba04e5b 100644 (file)
@@ -42,8 +42,7 @@ cperf_verify_test_free(struct cperf_verify_ctx *ctx)
                        rte_cryptodev_sym_session_free(ctx->sess);
                }
 
-               if (ctx->pool)
-                       rte_mempool_free(ctx->pool);
+               rte_mempool_free(ctx->pool);
 
                rte_free(ctx);
        }
index 908bcb3f47f80ce5365b1ce704198703f205cbda..9050825a81d79abcdb4c9d64eed3dcac1b0c3054 100644 (file)
@@ -364,8 +364,7 @@ flex_item_create(portid_t port_id, uint16_t flex_id, const char *filename)
                       flow_error.message ? flow_error.message : "");
        }
 out:
-       if (fp)
-               free(fp);
+       free(fp);
 }
 
 #else /* RTE_HAS_JANSSON */
index 9f10f35b4099d0e952823d97874bc60b71637923..99510dda40cf8917953d0024358983c883e5c31e 100644 (file)
@@ -14830,8 +14830,7 @@ no_print_pctypes:
 
        ret = 0;
 no_print_return:
-       if (proto)
-               free(proto);
+       free(proto);
 #endif
        if (ret == -ENOTSUP)
                fprintf(stderr, "Function not supported in PMD\n");
index e1da961311f847ad71d5d7ca01d93c5e294adb9b..6d2e52c7905f006c095699bf12e10ab1b43f9fb9 100644 (file)
@@ -908,8 +908,7 @@ create_extmem(uint32_t nb_mbufs, uint32_t mbuf_sz, struct extmem_param *param,
 
        return 0;
 fail:
-       if (iovas)
-               free(iovas);
+       free(iovas);
        if (addr)
                munmap(addr, mem_sz);
 
index 8e665df73ce0d8995b1bfe5d75a08d4b5f52329a..ab8a3e56e774106ad9a2a9752487b0c6d889b0db 100644 (file)
@@ -210,8 +210,7 @@ error:
        printf("Error, can't open file %s\n, err = %d", file, res);
        if (fp)
                fclose(fp);
-       if (*buf)
-               rte_free(*buf);
+       rte_free(*buf);
        return -res;
 }
 
@@ -299,8 +298,7 @@ init_port(uint16_t *nb_max_payload, char *rules_file, uint8_t *nb_max_matches,
        rte_free(rules);
        return 0;
 error:
-       if (rules)
-               rte_free(rules);
+       rte_free(rules);
        return res;
 }
 
@@ -367,8 +365,7 @@ regex_create_segmented_mbuf(struct rte_mempool *mbuf_pool, int pkt_len,
        return mbuf;
 
 fail:
-       if (mbuf)
-               rte_pktmbuf_free(mbuf);
+       rte_pktmbuf_free(mbuf);
        return NULL;
 }
 
@@ -612,8 +609,7 @@ end:
                rte_free(qp->buf);
                qp->buf = NULL;
        }
-       if (mbuf_mp)
-               rte_mempool_free(mbuf_mp);
+       rte_mempool_free(mbuf_mp);
        rte_free(qps);
        return res;
 }
index cd983d7c01ce87492431f21b6202ea6910ea50b6..6c15de9a93126c5cad90f585b5ca5c677cc0d77d 100644 (file)
@@ -218,8 +218,7 @@ test_l4_cksum(struct rte_mempool *pktmbuf_pool, const char *pktdata, size_t len)
        return 0;
 
 fail:
-       if (m)
-               rte_pktmbuf_free(m);
+       rte_pktmbuf_free(m);
 
        return -1;
 }
index 57c566aa92298dbd42444db5d2df4ffdd9ef8c96..fbecaf9aaad4571f64f08fc6462f184251cbd862 100644 (file)
@@ -2144,8 +2144,7 @@ exit:
 
        if (stream != NULL)
                rte_compressdev_stream_free(0, stream);
-       if (all_decomp_data != NULL)
-               rte_free(all_decomp_data);
+       rte_free(all_decomp_data);
 
        /* Free compress private xforms */
        for (i = 0; i < test_priv_data.num_priv_xforms; i++) {
index 70f23a3f67d0b942281714ce3e449d5db68c83ec..29a7d4db2b10e41a07843f3659a2b9868ff59387 100644 (file)
@@ -230,8 +230,7 @@ create_segmented_mbuf(struct rte_mempool *mbuf_pool, int pkt_len,
        return mbuf;
 
 fail:
-       if (mbuf)
-               rte_pktmbuf_free(mbuf);
+       rte_pktmbuf_free(mbuf);
        return NULL;
 }
 
index 9d3a5589bb9c8a6c5384f34649c6b5ee6c438324..3dadedf733e95d6c95d079e805fe7b9fffe64a31 100644 (file)
@@ -520,8 +520,7 @@ error_exit:
                if (op != NULL)
                        rte_crypto_op_free(op);
 
-               if (result != NULL)
-                       rte_free(result);
+               rte_free(result);
 
        return status;
 }
index 0c6f3ff42d4b39ee8388804098de75e47e8b0c47..494459195c49e281463d959b5749f0fc85022fa6 100644 (file)
@@ -807,20 +807,16 @@ error_exit:
                        rte_cryptodev_sym_session_clear(dev_id, sess);
                        rte_cryptodev_sym_session_free(sess);
                }
-               if (cipher_xform)
-                       rte_free(cipher_xform);
-               if (auth_xform)
-                       rte_free(auth_xform);
+               rte_free(cipher_xform);
+               rte_free(auth_xform);
        }
 
        if (op)
                rte_crypto_op_free(op);
 
-       if (obuf)
-               rte_pktmbuf_free(obuf);
+       rte_pktmbuf_free(obuf);
 
-       if (ibuf)
-               rte_pktmbuf_free(ibuf);
+       rte_pktmbuf_free(ibuf);
 
        return status;
 }
index 4ab4167eb03178bf302237d3d7af7b222d19021a..da00694daafd9f20f5fc7e6760b5aa8183b9df51 100644 (file)
@@ -89,15 +89,13 @@ ring_clean(unsigned int lcore_id)
        int i;
 
        rp = rte_ring_lookup("fr_test_once");
-       if (rp != NULL)
-               rte_ring_free(rp);
+       rte_ring_free(rp);
 
        for (i = 0; i < MAX_ITER_MULTI; i++) {
                snprintf(ring_name, sizeof(ring_name),
                                "fr_test_%d_%d", lcore_id, i);
                rp = rte_ring_lookup(ring_name);
-               if (rp != NULL)
-                       rte_ring_free(rp);
+               rte_ring_free(rp);
        }
 }
 
@@ -152,15 +150,13 @@ mempool_clean(unsigned int lcore_id)
        int i;
 
        mp = rte_mempool_lookup("fr_test_once");
-       if (mp != NULL)
-               rte_mempool_free(mp);
+       rte_mempool_free(mp);
 
        for (i = 0; i < MAX_ITER_MULTI; i++) {
                snprintf(mempool_name, sizeof(mempool_name), "fr_test_%d_%d",
                         lcore_id, i);
                mp = rte_mempool_lookup(mempool_name);
-               if (mp != NULL)
-                       rte_mempool_free(mp);
+               rte_mempool_free(mp);
        }
 }
 
@@ -215,8 +211,7 @@ hash_clean(unsigned lcore_id)
        int i;
 
        handle = rte_hash_find_existing("fr_test_once");
-       if (handle != NULL)
-               rte_hash_free(handle);
+       rte_hash_free(handle);
 
        for (i = 0; i < MAX_ITER_MULTI; i++) {
                snprintf(hash_name, sizeof(hash_name), "fr_test_%d_%d",  lcore_id, i);
index b99e8de1db71ef180e7f254a7840f457c65fbca2..d522cb7f8cbf6ec8cd6f0cace32d118c6c63676c 100644 (file)
@@ -1654,8 +1654,7 @@ test_hash_add_delete_jhash2(void)
        ret = 0;
 
 fail_jhash2:
-       if (handle != NULL)
-               rte_hash_free(handle);
+       rte_hash_free(handle);
 
        return ret;
 }
@@ -1689,8 +1688,7 @@ test_hash_add_delete_2_jhash2(void)
        ret = 0;
 
 fail_2_jhash2:
-       if (handle != NULL)
-               rte_hash_free(handle);
+       rte_hash_free(handle);
 
        return ret;
 }
@@ -1754,8 +1752,7 @@ test_hash_add_delete_jhash_1word(void)
        ret = 0;
 
 fail_jhash_1word:
-       if (handle != NULL)
-               rte_hash_free(handle);
+       rte_hash_free(handle);
 
        return ret;
 }
@@ -1789,8 +1786,7 @@ test_hash_add_delete_jhash_2word(void)
        ret = 0;
 
 fail_jhash_2word:
-       if (handle != NULL)
-               rte_hash_free(handle);
+       rte_hash_free(handle);
 
        return ret;
 }
@@ -1824,8 +1820,7 @@ test_hash_add_delete_jhash_3word(void)
        ret = 0;
 
 fail_jhash_3word:
-       if (handle != NULL)
-               rte_hash_free(handle);
+       rte_hash_free(handle);
 
        return ret;
 }
index 104a70b3974ec727077291d6cdd295d8241c4c60..5d36c0f4543d44a91a01b8d7615f9389a527d8a8 100644 (file)
@@ -106,12 +106,7 @@ create_table(unsigned int with_data, unsigned int table_index,
        ut_params.key_len = hashtest_key_lens[table_index];
        ut_params.socket_id = rte_socket_id();
        h[table_index] = rte_hash_find_existing(name);
-       if (h[table_index] != NULL)
-               /*
-                * If table was already created, free it to create it again,
-                * so we force it is empty
-                */
-               rte_hash_free(h[table_index]);
+       rte_hash_free(h[table_index]);
        h[table_index] = rte_hash_create(&ut_params);
        if (h[table_index] == NULL) {
                printf("Error creating table\n");
index dc6fc46b9c93ab45f1ddc0bd7743647cfa962309..82a9b8e01a8282290e3f74d01bd9c1743655223c 100644 (file)
@@ -1639,8 +1639,7 @@ test_roundrobin_rx_burst_on_single_slave(void)
 
        /* free mbufs */
        for (i = 0; i < MAX_PKT_BURST; i++) {
-               if (rx_pkt_burst[i] != NULL)
-                       rte_pktmbuf_free(rx_pkt_burst[i]);
+               rte_pktmbuf_free(rx_pkt_burst[i]);
        }
 
 
@@ -1722,8 +1721,7 @@ test_roundrobin_rx_burst_on_multiple_slaves(void)
 
        /* free mbufs */
        for (i = 0; i < MAX_PKT_BURST; i++) {
-               if (rx_pkt_burst[i] != NULL)
-                       rte_pktmbuf_free(rx_pkt_burst[i]);
+               rte_pktmbuf_free(rx_pkt_burst[i]);
        }
 
        /* Clean up and remove slaves from bonded device */
@@ -2010,8 +2008,7 @@ test_roundrobin_verify_slave_link_status_change_behaviour(void)
 
        /* free mbufs */
        for (i = 0; i < MAX_PKT_BURST; i++) {
-               if (rx_pkt_burst[i] != NULL)
-                       rte_pktmbuf_free(rx_pkt_burst[i]);
+               rte_pktmbuf_free(rx_pkt_burst[i]);
        }
 
        /* Clean up and remove slaves from bonded device */
index 351129de2f9b727b47a9d025334b8cdfab0362bf..d9b9c323c7f82f3a5a65bf8e9a513432cd2fa932 100644 (file)
@@ -194,8 +194,7 @@ free_pkts(struct rte_mbuf **pkts, uint16_t count)
        uint16_t i;
 
        for (i = 0; i < count; i++) {
-               if (pkts[i] != NULL)
-                       rte_pktmbuf_free(pkts[i]);
+               rte_pktmbuf_free(pkts[i]);
        }
 }
 
index 8db500c514e7a9abd00768f06f5dd900d5eef43f..de40e506113a38980461b7ce73fc6f54553ccc41 100644 (file)
@@ -823,7 +823,7 @@ test_zero_aligned_alloc(void)
 
 err_return:
        /*clean up */
-       if (p1) rte_free(p1);
+       rte_free(p1);
        return -1;
 }
 
@@ -876,8 +876,7 @@ test_malloc_bad_params(void)
 
 err_return:
        /* clean up pointer */
-       if (bad_ptr)
-               rte_free(bad_ptr);
+       rte_free(bad_ptr);
        return -1;
 }
 
index d37aefd2e969687a75c4e5d3314f2f8a413f3273..e09b2549ca40dc93703a02be170d02610cf247a9 100644 (file)
@@ -304,8 +304,7 @@ test_one_pktmbuf(struct rte_mempool *pktmbuf_pool)
        return 0;
 
 fail:
-       if (m)
-               rte_pktmbuf_free(m);
+       rte_pktmbuf_free(m);
        return -1;
 }
 
@@ -416,12 +415,9 @@ testclone_testupdate_testdetach(struct rte_mempool *pktmbuf_pool,
        return 0;
 
 fail:
-       if (m)
-               rte_pktmbuf_free(m);
-       if (clone)
-               rte_pktmbuf_free(clone);
-       if (clone2)
-               rte_pktmbuf_free(clone2);
+       rte_pktmbuf_free(m);
+       rte_pktmbuf_free(clone);
+       rte_pktmbuf_free(clone2);
        return -1;
 }
 
@@ -572,12 +568,9 @@ test_pktmbuf_copy(struct rte_mempool *pktmbuf_pool,
        return 0;
 
 fail:
-       if (m)
-               rte_pktmbuf_free(m);
-       if (copy)
-               rte_pktmbuf_free(copy);
-       if (copy2)
-               rte_pktmbuf_free(copy2);
+       rte_pktmbuf_free(m);
+       rte_pktmbuf_free(copy);
+       rte_pktmbuf_free(copy2);
        return -1;
 }
 
@@ -679,12 +672,9 @@ test_attach_from_different_pool(struct rte_mempool *pktmbuf_pool,
        return 0;
 
 fail:
-       if (m)
-               rte_pktmbuf_free(m);
-       if (clone)
-               rte_pktmbuf_free(clone);
-       if (clone2)
-               rte_pktmbuf_free(clone2);
+       rte_pktmbuf_free(m);
+       rte_pktmbuf_free(clone);
+       rte_pktmbuf_free(clone2);
        return -1;
 }
 
@@ -722,8 +712,7 @@ test_pktmbuf_pool(struct rte_mempool *pktmbuf_pool)
        }
        /* free them */
        for (i=0; i<NB_MBUF; i++) {
-               if (m[i] != NULL)
-                       rte_pktmbuf_free(m[i]);
+               rte_pktmbuf_free(m[i]);
        }
 
        return ret;
@@ -924,8 +913,7 @@ test_pktmbuf_pool_ptr(struct rte_mempool *pktmbuf_pool)
 
        /* free them */
        for (i=0; i<NB_MBUF; i++) {
-               if (m[i] != NULL)
-                       rte_pktmbuf_free(m[i]);
+               rte_pktmbuf_free(m[i]);
        }
 
        for (i=0; i<NB_MBUF; i++)
@@ -947,8 +935,7 @@ test_pktmbuf_pool_ptr(struct rte_mempool *pktmbuf_pool)
 
        /* free them */
        for (i=0; i<NB_MBUF; i++) {
-               if (m[i] != NULL)
-                       rte_pktmbuf_free(m[i]);
+               rte_pktmbuf_free(m[i]);
        }
 
        return ret;
@@ -1366,8 +1353,7 @@ test_mbuf_linearize(struct rte_mempool *pktmbuf_pool, int pkt_len,
        return 0;
 
 fail:
-       if (mbuf)
-               rte_pktmbuf_free(mbuf);
+       rte_pktmbuf_free(mbuf);
        return -1;
 }
 
@@ -2779,8 +2765,7 @@ test_nb_segs_and_next_reset(void)
        return 0;
 
 fail:
-       if (pool != NULL)
-               rte_mempool_free(pool);
+       rte_mempool_free(pool);
        return -1;
 }
 
index 34c5e1234695bb28a4113ba430f1c1822402bff0..320dacea34980ca921d0ef136c5a74eb34e4d255 100644 (file)
@@ -240,8 +240,7 @@ test_validate(void)
 static void
 test_cleanup(void)
 {
-       if (mp)
-               rte_mempool_free(mp);
+       rte_mempool_free(mp);
 
        if (pcapng)
                rte_pcapng_close(pcapng);
index 07dcce06d293ec9bab8cab6a2e60604dd0542608..f0714a5c18a3767e28a7a2e3914f79ab1e6b2e31 100644 (file)
@@ -218,8 +218,7 @@ test_reorder_insert(void)
 exit:
        rte_reorder_free(b);
        for (i = 0; i < num_bufs; i++) {
-               if (bufs[i] != NULL)
-                       rte_pktmbuf_free(bufs[i]);
+               rte_pktmbuf_free(bufs[i]);
        }
        return ret;
 }
@@ -278,8 +277,7 @@ test_reorder_drain(void)
                ret = -1;
                goto exit;
        }
-       if (robufs[0] != NULL)
-               rte_pktmbuf_free(robufs[0]);
+       rte_pktmbuf_free(robufs[0]);
 
        /* Insert more packets
         * RB[] = {NULL, NULL, NULL, NULL}
@@ -313,8 +311,7 @@ test_reorder_drain(void)
                goto exit;
        }
        for (i = 0; i < 3; i++) {
-               if (robufs[i] != NULL)
-                       rte_pktmbuf_free(robufs[i]);
+               rte_pktmbuf_free(robufs[i]);
        }
 
        /*
@@ -332,10 +329,8 @@ test_reorder_drain(void)
 exit:
        rte_reorder_free(b);
        for (i = 0; i < num_bufs; i++) {
-               if (bufs[i] != NULL)
-                       rte_pktmbuf_free(bufs[i]);
-               if (robufs[i] != NULL)
-                       rte_pktmbuf_free(robufs[i]);
+               rte_pktmbuf_free(bufs[i]);
+               rte_pktmbuf_free(robufs[i]);
        }
        return ret;
 }
index 3d27938520493cceac7b9188add23d1a521c4e09..cd4611ab48dfddfccc47fa3639418cb22d32f3a2 100644 (file)
@@ -397,8 +397,7 @@ virtual_ethdev_tx_burst_fail(void *queue, struct rte_mbuf **bufs,
                /* free packets in burst */
                for (i = 0; i < successfully_txd; i++) {
                        /* free packets in burst */
-                       if (bufs[i] != NULL)
-                               rte_pktmbuf_free(bufs[i]);
+                       rte_pktmbuf_free(bufs[i]);
 
                        bufs[i] = NULL;
                }
index 1c6080f2f8957823536f70573fa35896971c2cd9..f86474f7e0991885172e8ab582d78a78cf7ad151 100644 (file)
@@ -4402,8 +4402,7 @@ poweron_cleanup(struct rte_bbdev *bbdev, struct acc100_device *d,
        }
        printf("Number of 5GUL engines %d\n", numEngines);
 
-       if (d->sw_rings_base != NULL)
-               rte_free(d->sw_rings_base);
+       rte_free(d->sw_rings_base);
        usleep(ACC100_LONG_WAIT);
 }
 
index 4b05b5d3f2a669d2d8aeac025a69dfd71209f02d..4d1bd16751feb1fdb45fc76788c3dd197886bbb3 100644 (file)
@@ -975,8 +975,7 @@ parse_bbdev_la12xx_params(struct bbdev_la12xx_params *params,
        }
 
 exit:
-       if (kvlist)
-               rte_kvargs_free(kvlist);
+       rte_kvargs_free(kvlist);
        return ret;
 }
 
index 08cff582b99db9088f1f221586f5f810303e5f2d..248e12987f038d8beefcbb14cebb17a12855c06a 100644 (file)
@@ -251,8 +251,7 @@ parse_bbdev_null_params(struct bbdev_null_params *params,
        }
 
 exit:
-       if (kvlist)
-               rte_kvargs_free(kvlist);
+       rte_kvargs_free(kvlist);
        return ret;
 }
 
index c6b1eb8679cbcf23688f5f2fbc6d59a385958bb5..af7bc416f92e4e57aad90323939bc998cf0d0fce 100644 (file)
@@ -1918,8 +1918,7 @@ parse_turbo_sw_params(struct turbo_sw_params *params, const char *input_args)
        }
 
 exit:
-       if (kvlist)
-               rte_kvargs_free(kvlist);
+       rte_kvargs_free(kvlist);
        return ret;
 }
 
index 356253f6b412f7217ef04f76334258f77717247b..e9edc27e0ab012ae2c337d8a259c98c5efd2c2a7 100644 (file)
@@ -221,13 +221,11 @@ scan_one_fslmc_device(char *dev_name)
        insert_in_device_list(dev);
 
        /* Don't need the duplicated device filesystem entry anymore */
-       if (dup_dev_name)
-               free(dup_dev_name);
+       free(dup_dev_name);
 
        return 0;
 cleanup:
-       if (dup_dev_name)
-               free(dup_dev_name);
+       free(dup_dev_name);
        if (dev) {
                rte_intr_instance_free(dev->intr_handle);
                free(dev);
index 52605ea2c32c65d20e58eedd6b1a754a43e1a5ed..943fadee48166bddf8bf25b39e093a3471e02952 100644 (file)
@@ -149,8 +149,7 @@ dpaa2_affine_dpio_intr_to_respective_core(int32_t dpio_id, int cpu_id)
        if (!token) {
                DPAA2_BUS_WARN("Failed to get interrupt id for dpio.%d",
                               dpio_id);
-               if (temp)
-                       free(temp);
+               free(temp);
                fclose(file);
                return;
        }
@@ -574,8 +573,7 @@ dpaa2_free_dq_storage(struct queue_storage_info_t *q_storage)
        int i = 0;
 
        for (i = 0; i < NUM_DQS_PER_QUEUE; i++) {
-               if (q_storage->dq_storage[i])
-                       rte_free(q_storage->dq_storage[i]);
+               rte_free(q_storage->dq_storage[i]);
        }
 }
 
index c5c8bbd572196318c44274b5ff0aec5773d05c9f..e005f2cb70b3b6d5964e7b06c9c8495499019da9 100644 (file)
@@ -191,10 +191,8 @@ ifpga_scan_one(struct rte_rawdev *rawdev,
        return afu_dev;
 
 end:
-       if (kvlist)
-               rte_kvargs_free(kvlist);
-       if (path)
-               free(path);
+       rte_kvargs_free(kvlist);
+       free(path);
        if (afu_dev) {
                rte_intr_instance_free(afu_dev->intr_handle);
                free(afu_dev);
@@ -254,10 +252,8 @@ ifpga_scan(void)
        }
 
 end:
-       if (kvlist)
-               rte_kvargs_free(kvlist);
-       if (name)
-               free(name);
+       rte_kvargs_free(kvlist);
+       free(name);
 
        return 0;
 }
index 60b424b8297e14ae4439364b3cfbb216f8558c5d..61a868707f160b688523ee58fc2d596449c8919c 100644 (file)
@@ -117,8 +117,7 @@ rte_pci_devargs_parse(struct rte_devargs *da)
        rte_pci_device_name(&addr, da->name, sizeof(da->name));
 
 out:
-       if (kvargs != NULL)
-               rte_kvargs_free(kvargs);
+       rte_kvargs_free(kvargs);
        if (ret != 0)
                rte_errno = -ret;
        return ret;
index 39ba31be7d38a61dba4c6cf23a75d20d8015bab8..7bf091158ba281a448c3be7dbb7eb9b328eeca49 100644 (file)
@@ -418,8 +418,7 @@ pci_scan_one(HDEVINFO dev_info, PSP_DEVINFO_DATA device_info_data)
 
        return 0;
 end:
-       if (dev)
-               free(dev);
+       free(dev);
        return ret;
 }
 
index a0b175a8fca0ca2e64011f67745bf7559edbde38..5460399eea5f50a3279bf3600acb5488f23fa991 100644 (file)
@@ -180,8 +180,7 @@ end:
                        CloseHandle(netuio);
        }
 
-       if (dev_ifx_detail)
-               free(dev_ifx_detail);
+       free(dev_ifx_detail);
 
        if (di_set != INVALID_HANDLE_VALUE)
                SetupDiDestroyDeviceInfoList(di_set);
index f0b5dddd8cdfc348461ceafa8d32e482242fd1a0..f5d91f2583bdae4414f5abfdc0029428ec4502c0 100644 (file)
@@ -192,13 +192,11 @@ cpt_free_asym_session_parameters(struct cpt_asym_sess_misc *sess)
        switch (sess->xfrm_type) {
        case RTE_CRYPTO_ASYM_XFORM_RSA:
                rsa = &sess->rsa_ctx;
-               if (rsa->n.data)
-                       rte_free(rsa->n.data);
+               rte_free(rsa->n.data);
                break;
        case RTE_CRYPTO_ASYM_XFORM_MODEX:
                mod = &sess->mod_ctx;
-               if (mod->modulus.data)
-                       rte_free(mod->modulus.data);
+               rte_free(mod->modulus.data);
                break;
        case RTE_CRYPTO_ASYM_XFORM_ECDSA:
                /* Fall through */
index 7166f8cceb41888e406d181c8c8eafc4216c6169..cbabc1588b2111b7bf62f51eba452be1522820f2 100644 (file)
@@ -339,16 +339,9 @@ static inline void copy_bytes(void *dest, const void *src, size_t sz)
 
 /* Allocator stuff */
 #define kmalloc(sz, t) rte_malloc(NULL, sz, 0)
+#define kzalloc(sz, t)  rte_zmalloc(NULL, sz, 0)
 #define vmalloc(sz)    rte_malloc(NULL, sz, 0)
-#define kfree(p)       { if (p) rte_free(p); }
-static inline void *kzalloc(size_t sz, gfp_t __foo __rte_unused)
-{
-       void *ptr = rte_malloc(NULL, sz, 0);
-
-       if (ptr)
-               memset(ptr, 0, sz);
-       return ptr;
-}
+#define kfree(p)       rte_free(p)
 
 static inline unsigned long get_zeroed_page(gfp_t __foo __rte_unused)
 {
index 5f7e4f6734aacb924277910d3a2b56812940caca..fa27bd98de04820d5555e735f95e0618582f07e1 100644 (file)
@@ -516,8 +516,7 @@ mlx5_mr_free(struct mlx5_mr *mr, mlx5_dereg_mr_t dereg_mr_cb)
                return;
        DRV_LOG(DEBUG, "freeing MR(%p):", (void *)mr);
        dereg_mr_cb(&mr->pmd_mr);
-       if (mr->ms_bmp != NULL)
-               rte_bitmap_free(mr->ms_bmp);
+       rte_bitmap_free(mr->ms_bmp);
        mlx5_free(mr);
 }
 
index 8b38091d8741de488db10f206fca8d071b8c72d2..458630351cd168b08884c0dcb2590034eb413bd1 100644 (file)
@@ -97,8 +97,7 @@ pci_ids_table_update(const struct rte_pci_id *driver_id_table)
        updated_table[i].vendor_id = 0;
        mlx5_common_pci_driver.id_table = updated_table;
        mlx5_pci_id_table = updated_table;
-       if (old_table)
-               free(old_table);
+       free(old_table);
        return 0;
 }
 
index cde421eb77163e366807e46355cb8bf5b1596644..57ac8fefca3d7021d3abd91f053ea07ac9651f31 100644 (file)
@@ -175,11 +175,9 @@ qat_qp_setup(struct qat_pci_device *qat_dev,
 
 create_err:
        if (qp) {
-               if (qp->op_cookie_pool)
-                       rte_mempool_free(qp->op_cookie_pool);
+               rte_mempool_free(qp->op_cookie_pool);
 
-               if (qp->op_cookies)
-                       rte_free(qp->op_cookies);
+               rte_free(qp->op_cookies);
 
                rte_free(qp);
        }
@@ -329,8 +327,7 @@ qat_qp_release(enum qat_device_gen qat_dev_gen, struct qat_qp **qp_addr)
        for (i = 0; i < qp->nb_descriptors; i++)
                rte_mempool_put(qp->op_cookie_pool, qp->op_cookies[i]);
 
-       if (qp->op_cookie_pool)
-               rte_mempool_free(qp->op_cookie_pool);
+       rte_mempool_free(qp->op_cookie_pool);
 
        rte_free(qp->op_cookies);
        rte_free(qp);
index 82b871bd860aa72c1ee82b7a7d5683cd2826a7a8..b12951da8b5180fc85d7fbe000a3098994c072ee 100644 (file)
@@ -146,8 +146,7 @@ mlx5_compress_qp_release(struct rte_compressdev *dev, uint16_t qp_id)
                void *opaq = qp->opaque_mr.addr;
 
                mlx5_common_verbs_dereg_mr(&qp->opaque_mr);
-               if (opaq != NULL)
-                       rte_free(opaq);
+               rte_free(opaq);
        }
        mlx5_mr_btree_free(&qp->mr_ctrl.cache_bh);
        rte_free(qp);
index dd62285b863e56a0794da2520f6415532266f829..26cdce60a8590b53bbadc813bdc64c20a66aae66 100644 (file)
@@ -337,8 +337,7 @@ zip_pmd_qp_release(struct rte_compressdev *dev, uint16_t qp_id)
        if (qp != NULL) {
                zipvf_q_term(qp);
 
-               if (qp->processed_pkts)
-                       rte_ring_free(qp->processed_pkts);
+               rte_ring_free(qp->processed_pkts);
 
                rte_free(qp);
                dev->data->queue_pairs[qp_id] = NULL;
@@ -423,10 +422,8 @@ zip_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
        return 0;
 
 qp_setup_cleanup:
-       if (qp->processed_pkts)
-               rte_ring_free(qp->processed_pkts);
-       if (qp)
-               rte_free(qp);
+       rte_ring_free(qp->processed_pkts);
+       rte_free(qp);
        return -1;
 }
 
index 1b2749fe62c62503baae89c93557a15442df15ca..c07ac0489e5786a2ca19c07107e43cc08b88de73 100644 (file)
@@ -251,8 +251,7 @@ armv8_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
        return 0;
 
 qp_setup_cleanup:
-       if (qp)
-               rte_free(qp);
+       rte_free(qp);
 
        return -1;
 }
index 0eb1b0328ef0a2262fe3d96f7f90bf7092b43217..424ead82c3aac9611cb621f9af95a5007ac7c797 100644 (file)
@@ -673,8 +673,7 @@ fail:
        CCP_LOG_ERR("CCP Device probe failed");
        if (uio_fd >= 0)
                close(uio_fd);
-       if (ccp_dev)
-               rte_free(ccp_dev);
+       rte_free(ccp_dev);
        return -1;
 }
 
index 0d615d311c9bc2eebd4b464bb167053880750d9c..1b600e81ad5c080619b372f70742a9a1a0856f69 100644 (file)
@@ -744,8 +744,7 @@ ccp_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
 
 qp_setup_cleanup:
        dev->data->queue_pairs[qp_id] = NULL;
-       if (qp)
-               rte_free(qp);
+       rte_free(qp);
        return -1;
 }
 
index 6222171fe603bb01ea0693ab84521f9b0b1520a1..01ccfcd334324ab68238e252b201bd9d92d67249 100644 (file)
@@ -196,13 +196,11 @@ cnxk_ae_free_session_parameters(struct cnxk_ae_sess *sess)
        switch (sess->xfrm_type) {
        case RTE_CRYPTO_ASYM_XFORM_RSA:
                rsa = &sess->rsa_ctx;
-               if (rsa->n.data)
-                       rte_free(rsa->n.data);
+               rte_free(rsa->n.data);
                break;
        case RTE_CRYPTO_ASYM_XFORM_MODEX:
                mod = &sess->mod_ctx;
-               if (mod->modulus.data)
-                       rte_free(mod->modulus.data);
+               rte_free(mod->modulus.data);
                break;
        case RTE_CRYPTO_ASYM_XFORM_ECDSA:
                /* Fall through */
index 1ebd23e8f07322253abbca49753a311f48a44ba0..1cf37e983617f87898625c5fb1d35fe18142817a 100644 (file)
@@ -102,8 +102,7 @@ ipsec_mb_qp_release(struct rte_cryptodev *dev, uint16_t qp_id)
 
        if (qp != NULL && rte_eal_process_type() == RTE_PROC_PRIMARY) {
                r = rte_ring_lookup(qp->name);
-               if (r)
-                       rte_ring_free(r);
+               rte_ring_free(r);
 
 #if IMB_VERSION(1, 1, 0) > IMB_VERSION_NUM
                if (qp->mb_mgr)
index 3064b1f136fe1d35ade85c440a79463fbf60194b..f828dc9db5f6db72c86f6df394c2ec2e77a5bc86 100644 (file)
@@ -774,10 +774,8 @@ mrvl_crypto_pmd_sym_session_configure(__rte_unused struct rte_cryptodev *dev,
        }
 
        /* free the keys memory allocated for session creation */
-       if (mrvl_sess->sam_sess_params.cipher_key != NULL)
-               free(mrvl_sess->sam_sess_params.cipher_key);
-       if (mrvl_sess->sam_sess_params.auth_key != NULL)
-               free(mrvl_sess->sam_sess_params.auth_key);
+       free(mrvl_sess->sam_sess_params.cipher_key);
+       free(mrvl_sess->sam_sess_params.auth_key);
 
        return 0;
 }
index a8b5a06e7f4e39f56c026cf29345642052374207..90a675dfffe048d4c077cdf876520c83142d8426 100644 (file)
@@ -135,8 +135,7 @@ null_crypto_pmd_qp_release(struct rte_cryptodev *dev, uint16_t qp_id)
        if (dev->data->queue_pairs[qp_id] != NULL) {
                struct null_crypto_qp *qp = dev->data->queue_pairs[qp_id];
 
-               if (qp->processed_pkts)
-                       rte_ring_free(qp->processed_pkts);
+               rte_ring_free(qp->processed_pkts);
 
                rte_free(dev->data->queue_pairs[qp_id]);
                dev->data->queue_pairs[qp_id] = NULL;
@@ -241,8 +240,7 @@ null_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
        return 0;
 
 qp_setup_cleanup:
-       if (qp)
-               rte_free(qp);
+       rte_free(qp);
 
        return -1;
 }
index f7ca8a8a8e909ecd1995a704e4c635bb18c64b45..f1aae481c3c6553f14d79dc1ba4d7ae2f09c2e2a 100644 (file)
@@ -335,8 +335,7 @@ sym_session_clear(int driver_id, struct rte_cryptodev_sym_session *sess)
        misc = priv;
        ctx = SESS_PRIV(misc);
 
-       if (ctx->auth_key != NULL)
-               rte_free(ctx->auth_key);
+       rte_free(ctx->auth_key);
 
        memset(priv, 0, cpt_get_session_size());
 
index 52715f86f84aad25e5a1983cfe3b42ecfb76e1f0..b1c0b14fefd204755f515fce9523603925b6c8e8 100644 (file)
@@ -659,8 +659,7 @@ openssl_pmd_qp_release(struct rte_cryptodev *dev, uint16_t qp_id)
        if (dev->data->queue_pairs[qp_id] != NULL) {
                struct openssl_qp *qp = dev->data->queue_pairs[qp_id];
 
-               if (qp->processed_ops)
-                       rte_ring_free(qp->processed_ops);
+               rte_ring_free(qp->processed_ops);
 
                rte_free(dev->data->queue_pairs[qp_id]);
                dev->data->queue_pairs[qp_id] = NULL;
@@ -748,8 +747,7 @@ openssl_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
        return 0;
 
 qp_setup_cleanup:
-       if (qp)
-               rte_free(qp);
+       rte_free(qp);
 
        return -1;
 }
index f61640c9d646d15baefc3be27098142051383df5..f3a1bd626c6ffc8abf820c0d58cf9e1a2735d2f6 100644 (file)
@@ -371,10 +371,8 @@ scheduler_pmd_qp_release(struct rte_cryptodev *dev, uint16_t qp_id)
        if (!qp_ctx)
                return 0;
 
-       if (qp_ctx->order_ring)
-               rte_ring_free(qp_ctx->order_ring);
-       if (qp_ctx->private_qp_ctx)
-               rte_free(qp_ctx->private_qp_ctx);
+       rte_ring_free(qp_ctx->order_ring);
+       rte_free(qp_ctx->private_qp_ctx);
 
        rte_free(qp_ctx);
        dev->data->queue_pairs[qp_id] = NULL;
index fd8be581c9969a2678b5c9a80df482fe9e487f2d..3e2db1ebd25034020e13e0487690d6347d36df51 100644 (file)
@@ -32,10 +32,8 @@ virtqueue_detatch_unused(struct virtqueue *vq)
                for (idx = 0; idx < vq->vq_nentries; idx++) {
                        cop = vq->vq_descx[idx].crypto_op;
                        if (cop) {
-                               if (cop->sym->m_src)
-                                       rte_pktmbuf_free(cop->sym->m_src);
-                               if (cop->sym->m_dst)
-                                       rte_pktmbuf_free(cop->sym->m_dst);
+                               rte_pktmbuf_free(cop->sym->m_src);
+                               rte_pktmbuf_free(cop->sym->m_dst);
                                rte_crypto_op_free(cop);
                                vq->vq_descx[idx].crypto_op = NULL;
                        }
index 6ae613e0f2e785d997b146ba57ff2d40aa746238..ba82a80385b6dee2e9ce892805261fb1abd8fe0e 100644 (file)
@@ -526,8 +526,7 @@ sw_dev_configure(const struct rte_eventdev *dev)
         * IQ chunk references were cleaned out of the QIDs in sw_stop(), and
         * will be reinitialized in sw_start().
         */
-       if (sw->chunks)
-               rte_free(sw->chunks);
+       rte_free(sw->chunks);
 
        sw->chunks = rte_malloc_socket(NULL,
                                       sizeof(struct sw_queue_chunk) *
index 6bd41d3002bf7cc0596233263555ef99a5ca56a3..f38bb64fab6b37a40acd0e8aa0de33d8b4b0203d 100644 (file)
@@ -22,8 +22,7 @@ axgbe_rx_queue_release(struct axgbe_rx_queue *rx_queue)
                sw_ring = rx_queue->sw_ring;
                if (sw_ring) {
                        for (i = 0; i < rx_queue->nb_desc; i++) {
-                               if (sw_ring[i])
-                                       rte_pktmbuf_free(sw_ring[i]);
+                               rte_pktmbuf_free(sw_ring[i]);
                        }
                        rte_free(sw_ring);
                }
@@ -507,8 +506,7 @@ static void axgbe_tx_queue_release(struct axgbe_tx_queue *tx_queue)
                sw_ring = tx_queue->sw_ring;
                if (sw_ring) {
                        for (i = 0; i < tx_queue->nb_desc; i++) {
-                               if (sw_ring[i])
-                                       rte_pktmbuf_free(sw_ring[i]);
+                               rte_pktmbuf_free(sw_ring[i]);
                        }
                        rte_free(sw_ring);
                }
index 66b0512c8695c96774d7de6b7495f7b708751c7e..00ddccf151fd92cba8e5b0dace72a47bae9e0353 100644 (file)
@@ -27,8 +27,7 @@ bnx2x_rx_queue_release(struct bnx2x_rx_queue *rx_queue)
                sw_ring = rx_queue->sw_ring;
                if (NULL != sw_ring) {
                        for (i = 0; i < rx_queue->nb_rx_desc; i++) {
-                               if (NULL != sw_ring[i])
-                                       rte_pktmbuf_free(sw_ring[i]);
+                               rte_pktmbuf_free(sw_ring[i]);
                        }
                        rte_free(sw_ring);
                }
@@ -172,8 +171,7 @@ bnx2x_tx_queue_release(struct bnx2x_tx_queue *tx_queue)
                sw_ring = tx_queue->sw_ring;
                if (NULL != sw_ring) {
                        for (i = 0; i < tx_queue->nb_tx_desc; i++) {
-                               if (NULL != sw_ring[i])
-                                       rte_pktmbuf_free(sw_ring[i]);
+                               rte_pktmbuf_free(sw_ring[i]);
                        }
                        rte_free(sw_ring);
                }
index 22e015d5aa802c75462a875460df024466325b25..261fe0be56c3406026d971645afd45e7cda281e0 100644 (file)
@@ -5887,8 +5887,7 @@ static void bnxt_free_ctx_mem_buf(struct bnxt_ctx_mem_buf_info *ctx)
        if (!ctx)
                return;
 
-       if (ctx->va)
-               rte_free(ctx->va);
+       rte_free(ctx->va);
 
        ctx->va = NULL;
        ctx->dma = RTE_BAD_IOVA;
index bfa931098e4856b5ae8ff99c5dc3b810b7cf910c..845e8fd0cf27d71e8d570cd2525c10a508ca0a0d 100644 (file)
@@ -2155,8 +2155,7 @@ bond_ethdev_close(struct rte_eth_dev *dev)
         */
        rte_mempool_free(internals->mode6.mempool);
 
-       if (internals->kvlist != NULL)
-               rte_kvargs_free(internals->kvlist);
+       rte_kvargs_free(internals->kvlist);
 
        return 0;
 }
index 53dfb5eae80e368fe1a9877e6e6290db5c69062f..945600cdaf64133511e9e5b8ad46ab119cf6873d 100644 (file)
@@ -934,10 +934,8 @@ tx_queue_release:
        for (i = 0; i < eth_dev->data->nb_tx_queues; i++)
                dev_ops->tx_queue_release(eth_dev, i);
 fail:
-       if (tx_qconf)
-               free(tx_qconf);
-       if (rx_qconf)
-               free(rx_qconf);
+       free(tx_qconf);
+       free(rx_qconf);
 
        return rc;
 }
index f1ac322709619a6e552f4f9753fb90a8682f0beb..ab06e30a5e0f324a0c322bf40f74be56baf81f45 100644 (file)
@@ -463,8 +463,7 @@ void cxgbe_insert_tid(struct tid_info *t, void *data, unsigned int tid,
 static void tid_free(struct tid_info *t)
 {
        if (t->tid_tab) {
-               if (t->ftid_bmap)
-                       rte_bitmap_free(t->ftid_bmap);
+               rte_bitmap_free(t->ftid_bmap);
 
                if (t->ftid_bmap_array)
                        t4_os_free(t->ftid_bmap_array);
index b0c78ac0a14e60e5221df3c05b1be1184380c223..bddb3bb15ccc2b9b66817035561ff47bec80edb2 100644 (file)
@@ -474,8 +474,7 @@ static int dpaa_eth_dev_close(struct rte_eth_dev *dev)
        }
 
        /* release configuration memory */
-       if (dpaa_intf->fc_conf)
-               rte_free(dpaa_intf->fc_conf);
+       rte_free(dpaa_intf->fc_conf);
 
        /* Release RX congestion Groups */
        if (dpaa_intf->cgr_rx) {
index 0d1ca12378d8ba9a9499b41019c01527a5b35fa3..1d6816050c2fc0a565bdf1bd7b0404fdcaedfe01 100644 (file)
@@ -408,8 +408,7 @@ fm_port_close(t_handle h_fm_port)
        _fml_dbg("Calling...\n");
 
        close(p_dev->fd);
-       if (p_dev->h_user_priv)
-               free(p_dev->h_user_priv);
+       free(p_dev->h_user_priv);
        free(p_dev);
 
        _fml_dbg("Finishing.\n");
index 379daec5f4e81c604c9b8b030623dafe27764323..ee14a064ef2226cd48c46ea69e96781c23738d25 100644 (file)
@@ -510,8 +510,7 @@ dpaa2_free_rx_tx_queues(struct rte_eth_dev *dev)
                /* cleaning up queue storage */
                for (i = 0; i < priv->nb_rx_queues; i++) {
                        dpaa2_q = (struct dpaa2_queue *)priv->rx_vq[i];
-                       if (dpaa2_q->q_storage)
-                               rte_free(dpaa2_q->q_storage);
+                       rte_free(dpaa2_q->q_storage);
                }
                /* cleanup tx queue cscn */
                for (i = 0; i < priv->nb_tx_queues; i++) {
index cd2f7b8aa54492a63a8af56b87d5fae30a95e558..bd4596b89149fb5634f1d47ac40ae2b91ff22dcc 100644 (file)
@@ -353,8 +353,7 @@ dpaa2_create_dpdmux_device(int vdev_fd __rte_unused,
        return 0;
 
 init_err:
-       if (dpdmux_dev)
-               rte_free(dpdmux_dev);
+       rte_free(dpdmux_dev);
 
        return -1;
 }
index 3a4536dd69c1bdb8321d11993c022692cc13e9f8..4e6d375d1cbb61216a61896477907c1179dc2b59 100644 (file)
@@ -170,8 +170,7 @@ dpaa2_create_dprtc_device(int vdev_fd __rte_unused,
        return 0;
 
 init_err:
-       if (dprtc_dev)
-               rte_free(dprtc_dev);
+       rte_free(dprtc_dev);
 
        return -1;
 }
index dce26cfa48cf50b196d986a41d9f022468a8bd0b..db2b5ec8e77b741e87eeaa00f827b99d0bcd3598 100644 (file)
@@ -567,16 +567,13 @@ static void ena_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid)
        struct ena_ring *ring = dev->data->rx_queues[qid];
 
        /* Free ring resources */
-       if (ring->rx_buffer_info)
-               rte_free(ring->rx_buffer_info);
+       rte_free(ring->rx_buffer_info);
        ring->rx_buffer_info = NULL;
 
-       if (ring->rx_refill_buffer)
-               rte_free(ring->rx_refill_buffer);
+       rte_free(ring->rx_refill_buffer);
        ring->rx_refill_buffer = NULL;
 
-       if (ring->empty_rx_reqs)
-               rte_free(ring->empty_rx_reqs);
+       rte_free(ring->empty_rx_reqs);
        ring->empty_rx_reqs = NULL;
 
        ring->configured = 0;
@@ -590,14 +587,11 @@ static void ena_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid)
        struct ena_ring *ring = dev->data->tx_queues[qid];
 
        /* Free ring resources */
-       if (ring->push_buf_intermediate_buf)
-               rte_free(ring->push_buf_intermediate_buf);
+       rte_free(ring->push_buf_intermediate_buf);
 
-       if (ring->tx_buffer_info)
-               rte_free(ring->tx_buffer_info);
+       rte_free(ring->tx_buffer_info);
 
-       if (ring->empty_tx_reqs)
-               rte_free(ring->empty_tx_reqs);
+       rte_free(ring->empty_tx_reqs);
 
        ring->empty_tx_reqs = NULL;
        ring->tx_buffer_info = NULL;
index e8d9aaba84a6637904e3c4360a4db68ec542d519..35788f46eb4cd5661e22c1a65c58cc6e9abc2744 100644 (file)
@@ -2662,8 +2662,7 @@ static int hinic_copy_mempool_init(struct hinic_nic_dev *nic_dev)
 
 static void hinic_copy_mempool_uninit(struct hinic_nic_dev *nic_dev)
 {
-       if (nic_dev->cpy_mpool != NULL)
-               rte_mempool_free(nic_dev->cpy_mpool);
+       rte_mempool_free(nic_dev->cpy_mpool);
 }
 
 static int hinic_init_sw_rxtxqs(struct hinic_nic_dev *nic_dev)
index 3b72c2375a60ff3fdf09ca512322f186035058f2..2d98db377f722b9df834d17aa016a533f97b92f3 100644 (file)
@@ -86,8 +86,7 @@ hns3_rx_queue_release(void *queue)
                hns3_rx_queue_release_mbufs(rxq);
                if (rxq->mz)
                        rte_memzone_free(rxq->mz);
-               if (rxq->sw_ring)
-                       rte_free(rxq->sw_ring);
+               rte_free(rxq->sw_ring);
                rte_free(rxq);
        }
 }
@@ -100,10 +99,8 @@ hns3_tx_queue_release(void *queue)
                hns3_tx_queue_release_mbufs(txq);
                if (txq->mz)
                        rte_memzone_free(txq->mz);
-               if (txq->sw_ring)
-                       rte_free(txq->sw_ring);
-               if (txq->free)
-                       rte_free(txq->free);
+               rte_free(txq->sw_ring);
+               rte_free(txq->free);
                rte_free(txq);
        }
 }
index 1d417dbf8ad720b477881b3e2897451544fd83b7..ecfa3c94db44b453bce8bdd99c32ffbbdb91fb6a 100644 (file)
@@ -1781,10 +1781,8 @@ i40e_rm_ethtype_filter_list(struct i40e_pf *pf)
 
        ethertype_rule = &pf->ethertype;
        /* Remove all ethertype filter rules and hash */
-       if (ethertype_rule->hash_map)
-               rte_free(ethertype_rule->hash_map);
-       if (ethertype_rule->hash_table)
-               rte_hash_free(ethertype_rule->hash_table);
+       rte_free(ethertype_rule->hash_map);
+       rte_hash_free(ethertype_rule->hash_table);
 
        while ((p_ethertype = TAILQ_FIRST(&ethertype_rule->ethertype_list))) {
                TAILQ_REMOVE(&ethertype_rule->ethertype_list,
@@ -1801,10 +1799,8 @@ i40e_rm_tunnel_filter_list(struct i40e_pf *pf)
 
        tunnel_rule = &pf->tunnel;
        /* Remove all tunnel director rules and hash */
-       if (tunnel_rule->hash_map)
-               rte_free(tunnel_rule->hash_map);
-       if (tunnel_rule->hash_table)
-               rte_hash_free(tunnel_rule->hash_table);
+       rte_free(tunnel_rule->hash_map);
+       rte_hash_free(tunnel_rule->hash_table);
 
        while ((p_tunnel = TAILQ_FIRST(&tunnel_rule->tunnel_list))) {
                TAILQ_REMOVE(&tunnel_rule->tunnel_list, p_tunnel, rules);
@@ -1833,16 +1829,11 @@ i40e_fdir_memory_cleanup(struct i40e_pf *pf)
        fdir_info = &pf->fdir;
 
        /* flow director memory cleanup */
-       if (fdir_info->hash_map)
-               rte_free(fdir_info->hash_map);
-       if (fdir_info->hash_table)
-               rte_hash_free(fdir_info->hash_table);
-       if (fdir_info->fdir_flow_pool.bitmap)
-               rte_free(fdir_info->fdir_flow_pool.bitmap);
-       if (fdir_info->fdir_flow_pool.pool)
-               rte_free(fdir_info->fdir_flow_pool.pool);
-       if (fdir_info->fdir_filter_array)
-               rte_free(fdir_info->fdir_filter_array);
+       rte_free(fdir_info->hash_map);
+       rte_hash_free(fdir_info->hash_table);
+       rte_free(fdir_info->fdir_flow_pool.bitmap);
+       rte_free(fdir_info->fdir_flow_pool.pool);
+       rte_free(fdir_info->fdir_filter_array);
 }
 
 void i40e_flex_payload_reg_set_default(struct i40e_hw *hw)
index 9a00a9b71e2c426397884720eb41b9fef518c1b4..25a28ecea22c7f667480f35f30959802b613b143 100644 (file)
@@ -2573,8 +2573,7 @@ i40e_reset_rx_queue(struct i40e_rx_queue *rxq)
        rxq->rx_tail = 0;
        rxq->nb_rx_hold = 0;
 
-       if (rxq->pkt_first_seg != NULL)
-               rte_pktmbuf_free(rxq->pkt_first_seg);
+       rte_pktmbuf_free(rxq->pkt_first_seg);
 
        rxq->pkt_first_seg = NULL;
        rxq->pkt_last_seg = NULL;
index 94819e59b220298d0a5582bd844d53a840db9b7d..715893864349c2f6e70b27cd006c710444cb8ee9 100644 (file)
@@ -230,8 +230,7 @@ reset_rx_queue(struct iavf_rx_queue *rxq)
        rxq->rx_tail = 0;
        rxq->nb_rx_hold = 0;
 
-       if (rxq->pkt_first_seg != NULL)
-               rte_pktmbuf_free(rxq->pkt_first_seg);
+       rte_pktmbuf_free(rxq->pkt_first_seg);
 
        rxq->pkt_first_seg = NULL;
        rxq->pkt_last_seg = NULL;
index 287032a6a739cfb601a98a078fc85beae40877ca..b8728fb1be0b89ce9b213857277648c566745fcf 100644 (file)
@@ -421,10 +421,8 @@ ice_fdir_release_filter_list(struct ice_pf *pf)
 {
        struct ice_fdir_info *fdir_info = &pf->fdir;
 
-       if (fdir_info->hash_map)
-               rte_free(fdir_info->hash_map);
-       if (fdir_info->hash_table)
-               rte_hash_free(fdir_info->hash_table);
+       rte_free(fdir_info->hash_map);
+       rte_hash_free(fdir_info->hash_table);
 
        fdir_info->hash_map = NULL;
        fdir_info->hash_table = NULL;
index 66053060af5afbddb8bdb4791547ca4b8c56ae2c..58a6a8a539c6d570a0db714d669584e214e6f7f9 100644 (file)
@@ -775,10 +775,7 @@ igc_flow_create(struct rte_eth_dev *dev,
        }
 
        if (ret) {
-               /* check and free the memory */
-               if (flow)
-                       rte_free(flow);
-
+               rte_free(flow);
                rte_flow_error_set(error, -ret,
                                RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
                                "Failed to create flow.");
index 2f4ebb4e59408969ec42b50017a41fd9f9a47d9e..3d799d2187b9377c34e798afbcb5971f6f464722 100644 (file)
@@ -1336,10 +1336,8 @@ static int ixgbe_fdir_filter_uninit(struct rte_eth_dev *eth_dev)
                IXGBE_DEV_PRIVATE_TO_FDIR_INFO(eth_dev->data->dev_private);
        struct ixgbe_fdir_filter *fdir_filter;
 
-               if (fdir_info->hash_map)
-               rte_free(fdir_info->hash_map);
-       if (fdir_info->hash_handle)
-               rte_hash_free(fdir_info->hash_handle);
+       rte_free(fdir_info->hash_map);
+       rte_hash_free(fdir_info->hash_handle);
 
        while ((fdir_filter = TAILQ_FIRST(&fdir_info->fdir_list))) {
                TAILQ_REMOVE(&fdir_info->fdir_list,
@@ -1357,10 +1355,8 @@ static int ixgbe_l2_tn_filter_uninit(struct rte_eth_dev *eth_dev)
                IXGBE_DEV_PRIVATE_TO_L2_TN_INFO(eth_dev->data->dev_private);
        struct ixgbe_l2_tn_filter *l2_tn_filter;
 
-       if (l2_tn_info->hash_map)
-               rte_free(l2_tn_info->hash_map);
-       if (l2_tn_info->hash_handle)
-               rte_hash_free(l2_tn_info->hash_handle);
+       rte_free(l2_tn_info->hash_map);
+       rte_hash_free(l2_tn_info->hash_handle);
 
        while ((l2_tn_filter = TAILQ_FIRST(&l2_tn_info->l2_tn_list))) {
                TAILQ_REMOVE(&l2_tn_info->l2_tn_list,
index 99e928a2a97180697c4643f0c3b5c986f32f46b8..9e8ea366a506761303491d2de4240700e6d047f0 100644 (file)
@@ -2983,8 +2983,7 @@ ixgbe_reset_rx_queue(struct ixgbe_adapter *adapter, struct ixgbe_rx_queue *rxq)
        rxq->rx_tail = 0;
        rxq->nb_rx_hold = 0;
 
-       if (rxq->pkt_first_seg != NULL)
-               rte_pktmbuf_free(rxq->pkt_first_seg);
+       rte_pktmbuf_free(rxq->pkt_first_seg);
 
        rxq->pkt_first_seg = NULL;
        rxq->pkt_last_seg = NULL;
index 5700c6a2bf0f63227eb1baa76329641f4222ea99..587ad45576ca43d8e61967887b89be56c8e1d71a 100644 (file)
@@ -1709,8 +1709,7 @@ memif_check_socket_filename(const char *filename)
                ret = -EINVAL;
        }
 
-       if (dir != NULL)
-               rte_free(dir);
+       rte_free(dir);
 
        return ret;
 }
@@ -1881,8 +1880,7 @@ rte_pmd_memif_probe(struct rte_vdev_device *vdev)
                           log2_ring_size, pkt_buffer_size, secret, ether_addr);
 
 exit:
-       if (kvlist != NULL)
-               rte_kvargs_free(kvlist);
+       rte_kvargs_free(kvlist);
        return ret;
 }
 
index 2274b5df195016f318960c421a6d33f9ed6959c1..e95f45aa3e95e18aa6f9df4e09bf84e7bbfa7a6e 100644 (file)
@@ -471,8 +471,7 @@ mr_free(struct mlx4_mr *mr)
        DEBUG("freeing MR(%p):", (void *)mr);
        if (mr->ibv_mr != NULL)
                claim_zero(mlx4_glue->dereg_mr(mr->ibv_mr));
-       if (mr->ms_bmp != NULL)
-               rte_bitmap_free(mr->ms_bmp);
+       rte_bitmap_free(mr->ms_bmp);
        rte_free(mr);
 }
 
index d7cb1eb89b940e4381b8bdd79482beefefcf9130..179cc3b303783e38f342e0e4e8a1a48d2f27490a 100644 (file)
@@ -7008,8 +7008,7 @@ flow_alloc_thread_workspace(void)
        data->rssq_num = MLX5_RSSQ_DEFAULT_NUM;
        return data;
 err:
-       if (data->rss_desc.queue)
-               free(data->rss_desc.queue);
+       free(data->rss_desc.queue);
        free(data);
        return NULL;
 }
index 99f0ee56d1a70c5539dd19ee4c5af2e4e2435c04..f43217bc589c1e32ff66da82a5825071022bbeaa 100644 (file)
@@ -945,8 +945,7 @@ setup_tc(struct pp2_ppio_tc_params *param, uint8_t inqs,
        param->num_in_qs = inqs;
 
        /* Release old config if necessary. */
-       if (param->inqs_params)
-               rte_free(param->inqs_params);
+       rte_free(param->inqs_params);
 
        param->inqs_params = inq_params;
 
index 50ca1710ef3e8a75662bc58ceecd595a66c069bb..3e3488f1b87a30d20c2f93d8ecb6809e55c186fa 100644 (file)
@@ -315,8 +315,7 @@ hn_dev_tx_queue_setup(struct rte_eth_dev *dev,
        }
 
 error:
-       if (txq->txdesc_pool)
-               rte_mempool_free(txq->txdesc_pool);
+       rte_mempool_free(txq->txdesc_pool);
        rte_memzone_free(txq->tx_rndis_mz);
        rte_free(txq);
        return err;
@@ -365,8 +364,7 @@ hn_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid)
        if (!txq)
                return;
 
-       if (txq->txdesc_pool)
-               rte_mempool_free(txq->txdesc_pool);
+       rte_mempool_free(txq->txdesc_pool);
 
        rte_memzone_free(txq->tx_rndis_mz);
        rte_free(txq);
index ca03469d0e6dc9e5d28a4d304a17dcaa9f2bd581..bb89c1abc4a28695915d375ddbe0109780e7d68c 100644 (file)
@@ -717,8 +717,7 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)
        ret = eth_dev_null_create(dev, &args);
 
 free_kvlist:
-       if (kvlist)
-               rte_kvargs_free(kvlist);
+       rte_kvargs_free(kvlist);
        return ret;
 }
 
index b47472ebbd9351259eefd2bb9f0f02940f1a5129..f5ea9de8efe571ebad69b3476dd96b8ac07f8a53 100644 (file)
@@ -1037,8 +1037,7 @@ octeontx_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
        return res;
 
 err:
-       if (txq)
-               rte_free(txq);
+       rte_free(txq);
 
        return res;
 }
index 6ec2b71b067273bc3338ef80e3b368b5d5c7c53a..0b22e28a56257164750527af71aab925d4006491 100644 (file)
@@ -108,8 +108,7 @@ octeontx_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
        if (rc != 0) {
                octeontx_log_err("Fail to configure vlan filter entry "
                                 "for port %d", nic->port_id);
-               if (entry)
-                       rte_free(entry);
+               rte_free(entry);
 
                goto done;
        }
index 2d1f70693a3d615311efb45a509bbebb16f930b8..ad101194d613bd43075e9053764f04a6dbcd280e 100644 (file)
@@ -335,8 +335,7 @@ err1:
 err:
 #ifdef CONFIG_ECORE_BINARY_FW
        if (IS_PF(edev)) {
-               if (edev->firmware)
-                       rte_free(edev->firmware);
+               rte_free(edev->firmware);
                edev->firmware = NULL;
        }
 #endif
index 7088c57b501d37b443975de83524bc04313ce2a8..1c0a6ba5f1bf6e595f7c148759b0bbb923bf439e 100644 (file)
@@ -706,12 +706,10 @@ void qede_dealloc_fp_resc(struct rte_eth_dev *eth_dev)
                }
        }
 
-       if (qdev->fp_array)
-               rte_free(qdev->fp_array);
+       rte_free(qdev->fp_array);
        qdev->fp_array = NULL;
 
-       if (qdev->fp_array_cmt)
-               rte_free(qdev->fp_array_cmt);
+       rte_free(qdev->fp_array_cmt);
        qdev->fp_array_cmt = NULL;
 }
 
index b04e78c6e0af04ffb67813c14a5352d467837964..7acbeecae7a2979e2ae18a7c2cb9e04af82300a7 100644 (file)
@@ -4482,10 +4482,8 @@ parse_free_sym_crypto_param_data(struct rte_table_action_sym_crypto_params *p)
 
                switch (xform[i]->type) {
                case RTE_CRYPTO_SYM_XFORM_CIPHER:
-                       if (p->cipher_auth.cipher_iv.val)
-                               free(p->cipher_auth.cipher_iv.val);
-                       if (p->cipher_auth.cipher_iv_update.val)
-                               free(p->cipher_auth.cipher_iv_update.val);
+                       free(p->cipher_auth.cipher_iv.val);
+                       free(p->cipher_auth.cipher_iv_update.val);
                        break;
                case RTE_CRYPTO_SYM_XFORM_AUTH:
                        if (p->cipher_auth.auth_iv.val)
@@ -4494,10 +4492,8 @@ parse_free_sym_crypto_param_data(struct rte_table_action_sym_crypto_params *p)
                                free(p->cipher_auth.cipher_iv_update.val);
                        break;
                case RTE_CRYPTO_SYM_XFORM_AEAD:
-                       if (p->aead.iv.val)
-                               free(p->aead.iv.val);
-                       if (p->aead.aad.val)
-                               free(p->aead.aad.val);
+                       free(p->aead.iv.val);
+                       free(p->aead.aad.val);
                        break;
                default:
                        continue;
index 9a7d006f1a09ef146d70f97a607ee5a7112379ff..e4754055e90b66f5dfdbb3e32a2d3207e17d9ca3 100644 (file)
@@ -159,10 +159,8 @@ softnic_cryptodev_create(struct pmd_internals *p,
        return cryptodev;
 
 error_exit:
-       if (cryptodev->mp_create)
-               rte_mempool_free(cryptodev->mp_create);
-       if (cryptodev->mp_init)
-               rte_mempool_free(cryptodev->mp_init);
+       rte_mempool_free(cryptodev->mp_create);
+       rte_mempool_free(cryptodev->mp_init);
 
        free(cryptodev);
 
index 4a9f2fa6a452522f5749c51c4440a21322f4e4fb..ec8bef46941710c6055a49280b69ca5cb1b1359b 100644 (file)
@@ -29,11 +29,9 @@ softnic_thread_free(struct pmd_internals *softnic)
                struct softnic_thread *t = &softnic->thread[i];
 
                /* MSGQs */
-               if (t->msgq_req)
-                       rte_ring_free(t->msgq_req);
+               rte_ring_free(t->msgq_req);
 
-               if (t->msgq_rsp)
-                       rte_ring_free(t->msgq_rsp);
+               rte_ring_free(t->msgq_rsp);
        }
 }
 
index 76738239458a9b7dee0abe5f1e3dc85a0725990e..a9a55e439efcbcca4b66852e01e6b804255ff6d8 100644 (file)
@@ -1465,8 +1465,7 @@ tap_flow_create(struct rte_eth_dev *dev,
        }
        return flow;
 fail:
-       if (remote_flow)
-               rte_free(remote_flow);
+       rte_free(remote_flow);
        if (flow)
                tap_flow_free(pmd, flow);
        return NULL;
@@ -1541,8 +1540,7 @@ tap_flow_destroy_pmd(struct pmd_internals *pmd,
                }
        }
 end:
-       if (remote_flow)
-               rte_free(remote_flow);
+       rte_free(remote_flow);
        tap_flow_free(pmd, flow);
        return ret;
 }
@@ -1764,8 +1762,7 @@ int tap_flow_implicit_create(struct pmd_internals *pmd,
 success:
        return 0;
 fail:
-       if (remote_flow)
-               rte_free(remote_flow);
+       rte_free(remote_flow);
        return -1;
 }
 
index ac4d4e08f4078302f3fb4f74b3a2348dc5a9670b..6024397072c8bf181dcbac4e1a6ff62ebb770985 100644 (file)
@@ -821,10 +821,8 @@ static int txgbe_fdir_filter_uninit(struct rte_eth_dev *eth_dev)
        struct txgbe_hw_fdir_info *fdir_info = TXGBE_DEV_FDIR(eth_dev);
        struct txgbe_fdir_filter *fdir_filter;
 
-       if (fdir_info->hash_map)
-               rte_free(fdir_info->hash_map);
-       if (fdir_info->hash_handle)
-               rte_hash_free(fdir_info->hash_handle);
+       rte_free(fdir_info->hash_map);
+       rte_hash_free(fdir_info->hash_handle);
 
        while ((fdir_filter = TAILQ_FIRST(&fdir_info->fdir_list))) {
                TAILQ_REMOVE(&fdir_info->fdir_list,
@@ -841,10 +839,8 @@ static int txgbe_l2_tn_filter_uninit(struct rte_eth_dev *eth_dev)
        struct txgbe_l2_tn_info *l2_tn_info = TXGBE_DEV_L2_TN(eth_dev);
        struct txgbe_l2_tn_filter *l2_tn_filter;
 
-       if (l2_tn_info->hash_map)
-               rte_free(l2_tn_info->hash_map);
-       if (l2_tn_info->hash_handle)
-               rte_hash_free(l2_tn_info->hash_handle);
+       rte_free(l2_tn_info->hash_map);
+       rte_hash_free(l2_tn_info->hash_handle);
 
        while ((l2_tn_filter = TAILQ_FIRST(&l2_tn_info->l2_tn_list))) {
                TAILQ_REMOVE(&l2_tn_info->l2_tn_list,
index 55f2a342c5aef49a24c245272601a543cf1b928c..25871951685cc00f68c3e561aef6b2a93471fb5c 100644 (file)
@@ -717,8 +717,7 @@ vdev_netvsc_vdev_probe(struct rte_vdev_device *dev)
 error:
        ++vdev_netvsc_ctx_inst;
 ignore:
-       if (kvargs)
-               rte_kvargs_free(kvargs);
+       rte_kvargs_free(kvargs);
        /* Reset alarm if there are device context created */
        if (vdev_netvsc_ctx_count) {
                ret = rte_eal_alarm_set(VDEV_NETVSC_PROBE_MS * 1000,
index 16eca2f94080fd733a088a724f07fd61b0e830d9..a7d7063c2a8869d37e628b4e974bbe9e8c274f9a 100644 (file)
@@ -689,14 +689,10 @@ virtio_user_pmd_probe(struct rte_vdev_device *vdev)
        ret = 0;
 
 end:
-       if (kvlist)
-               rte_kvargs_free(kvlist);
-       if (path)
-               free(path);
-       if (mac_addr)
-               free(mac_addr);
-       if (ifname)
-               free(ifname);
+       rte_kvargs_free(kvlist);
+       free(path);
+       free(mac_addr);
+       free(ifname);
        return ret;
 }
 
index 0b694e1c03c377f7c118d34677b8bb4222fb7ad4..169cbc785531c8692493f6d9cfa9874cf19eb5e3 100644 (file)
@@ -233,8 +233,7 @@ cnxk_bphy_cgx_fini_queues(struct cnxk_bphy_cgx *cgx)
        unsigned int i;
 
        for (i = 0; i < cgx->num_queues; i++) {
-               if (cgx->queues[i].rsp)
-                       rte_free(cgx->queues[i].rsp);
+               rte_free(cgx->queues[i].rsp);
        }
 
        cgx->num_queues = 0;
index ebc2cd5d0ddc3e19a94638fedd1a48c39c60eff5..b2260439a4efffa812fbffebedc75c3e947c37dc 100644 (file)
@@ -1115,11 +1115,9 @@ dpaa2_qdma_reset(struct rte_rawdev *rawdev)
 
        /* Reset and free virtual queues */
        for (i = 0; i < qdma_dev->max_vqs; i++) {
-               if (qdma_dev->vqs[i].status_ring)
-                       rte_ring_free(qdma_dev->vqs[i].status_ring);
+               rte_ring_free(qdma_dev->vqs[i].status_ring);
        }
-       if (qdma_dev->vqs)
-               rte_free(qdma_dev->vqs);
+       rte_free(qdma_dev->vqs);
        qdma_dev->vqs = NULL;
 
        /* Reset per core info */
@@ -1314,8 +1312,7 @@ dpaa2_qdma_queue_setup(struct rte_rawdev *rawdev,
 
        if (qdma_dev->vqs[i].hw_queue == NULL) {
                DPAA2_QDMA_ERR("No H/W queue available for VQ");
-               if (qdma_dev->vqs[i].status_ring)
-                       rte_ring_free(qdma_dev->vqs[i].status_ring);
+               rte_ring_free(qdma_dev->vqs[i].status_ring);
                qdma_dev->vqs[i].status_ring = NULL;
                rte_spinlock_unlock(&qdma_dev->lock);
                return -ENODEV;
@@ -1516,14 +1513,12 @@ dpaa2_qdma_queue_release(struct rte_rawdev *rawdev,
        if (qdma_vq->exclusive_hw_queue)
                free_hw_queue(qdma_vq->hw_queue);
        else {
-               if (qdma_vq->status_ring)
-                       rte_ring_free(qdma_vq->status_ring);
+               rte_ring_free(qdma_vq->status_ring);
 
                put_hw_queue(qdma_vq->hw_queue);
        }
 
-       if (qdma_vq->fle_pool)
-               rte_mempool_free(qdma_vq->fle_pool);
+       rte_mempool_free(qdma_vq->fle_pool);
 
        memset(qdma_vq, 0, sizeof(struct qdma_virt_queue));
 
index fdf3c23d2c5f5eb095458497a161feea288d0430..b73512d3ada584e786ca8b9fb13cd55d03989b6a 100644 (file)
@@ -836,8 +836,7 @@ rte_fpga_do_pr(struct rte_rawdev *rawdev, int port_id,
        }
 
 free_buffer:
-       if (buf_to_free)
-               rte_free(buf_to_free);
+       rte_free(buf_to_free);
 close_fd:
        close(file_fd);
        file_fd = 0;
@@ -1739,10 +1738,8 @@ ifpga_cfg_probe(struct rte_vdev_device *dev)
        ret = rte_eal_hotplug_add(RTE_STR(IFPGA_BUS_NAME),
                        dev_name, devargs->args);
 end:
-       if (kvlist)
-               rte_kvargs_free(kvlist);
-       if (name)
-               free(name);
+       rte_kvargs_free(kvlist);
+       free(name);
 
        return ret;
 }
index 484468eeb460ad132a579841b9e36144018f8713..693b24c415de061aa347d8e455a38018352d12d2 100644 (file)
@@ -395,13 +395,11 @@ test_rawdev_enqdeq(void)
        RTE_TEST_ASSERT_EQUAL((unsigned int)ret, count,
                              "Unable to dequeue buffers");
 
-       if (deq_buffers)
-               free(deq_buffers);
+       free(deq_buffers);
 
        return TEST_SUCCESS;
 cleanup:
-       if (buffers[0].buf_addr)
-               free(buffers[0].buf_addr);
+       free(buffers[0].buf_addr);
 
        return TEST_FAILED;
 }
index 32d20c1be82b38fc81aaeef713a0816b76ae5ae3..56c862c5a76cb96bed3432978efb6d4bbdce4b99 100644 (file)
@@ -256,10 +256,8 @@ ree_dev_fini(struct rte_regexdev *dev)
                cn9k_err("Could not detach queues");
 
        /* TEMP : should be in lib */
-       if (data->queue_pairs)
-               rte_free(data->queue_pairs);
-       if (data->rules)
-               rte_free(data->rules);
+       rte_free(data->queue_pairs);
+       rte_free(data->rules);
 
        roc_ree_dev_fini(vf);
 
index 935b8a53b459965c6e740538abfc6df8d79f8399..60f1c1b4c4d87e31bce5a4e7379940ac72efa453 100644 (file)
@@ -214,8 +214,7 @@ free_structs:
        rxp_free_structs(NULL, NULL, NULL, NULL, NULL, &rof, NULL, &rofi, NULL,
                        1);
 
-       if (rule_db)
-               rte_free(rule_db);
+       rte_free(rule_db);
 
        return ret;
 }
index e5a12fb3cc4d5952b06bd7e41878dd4c5bb27ed8..48e39f6b8844f89669d74fa4c3456c06b43d2427 100644 (file)
@@ -127,8 +127,7 @@ error:
        if (priv->regexdev)
                rte_regexdev_unregister(priv->regexdev);
 dev_error:
-       if (priv)
-               rte_free(priv);
+       rte_free(priv);
        return -rte_errno;
 }
 
index 51b6e71376af3987dfa19df83cf99b5ff5c916e8..ed3af15e40deb435f143e3bf1142fd1ee4562a7e 100644 (file)
@@ -166,7 +166,6 @@ mlx5_regex_configure(struct rte_regexdev *dev,
                DRV_LOG(DEBUG, "Regex config without rules programming!");
        return 0;
 configure_error:
-       if (priv->qps)
-               rte_free(priv->qps);
+       rte_free(priv->qps);
        return -rte_errno;
 }
index 3853c4cf7e85ada3995c17a5bbd2347650841982..9f05595b6b34a0338f367d7a597d66b63395a5db 100644 (file)
@@ -226,8 +226,7 @@ ifcvf_dma_map(struct ifcvf_internal *internal, bool do_map)
        }
 
 exit:
-       if (mem)
-               free(mem);
+       free(mem);
        return ret;
 }
 
@@ -253,8 +252,7 @@ hva_to_gpa(int vid, uint64_t hva)
        }
 
 exit:
-       if (mem)
-               free(mem);
+       free(mem);
        return gpa;
 }
 
@@ -661,8 +659,7 @@ m_ifcvf_start(struct ifcvf_internal *internal)
 
 error:
        for (i = 0; i < nr_vring; i++)
-               if (internal->m_vring[i].desc)
-                       rte_free(internal->m_vring[i].desc);
+               rte_free(internal->m_vring[i].desc);
 
        return -1;
 }
index 130d201a85f553eae966cbe728809b44286020d7..599079500b03c40e1c9edfdd600fac4424fe7e8f 100644 (file)
@@ -283,8 +283,7 @@ mlx5_vdpa_mem_register(struct mlx5_vdpa_priv *priv)
        priv->gpa_mkey_index = entry->mkey->id;
        return 0;
 error:
-       if (entry)
-               rte_free(entry);
+       rte_free(entry);
        mlx5_vdpa_mem_dereg(priv);
        rte_errno = -ret;
        return ret;
index 2f32aef67fbc5780dd343c02bf8a6e2358442686..3416797d289c4e2411b727de79bec63dc7d9fe98 100644 (file)
@@ -91,8 +91,7 @@ mlx5_vdpa_virtq_unset(struct mlx5_vdpa_virtq *virtq)
                if (virtq->umems[i].obj)
                        claim_zero(mlx5_glue->devx_umem_dereg
                                                         (virtq->umems[i].obj));
-               if (virtq->umems[i].buf)
-                       rte_free(virtq->umems[i].buf);
+               rte_free(virtq->umems[i].buf);
        }
        memset(&virtq->umems, 0, sizeof(virtq->umems));
        if (virtq->eqp.fw_qp)
index b4eab05a9851afae5a3603390c76649ca50aa81a..076e9de099c06b55b5cd5d9f76f5187025fd5ae9 100644 (file)
@@ -1396,8 +1396,7 @@ check_aead_result(struct rte_crypto_op *op,
        if (!mbuf)
                return -1;
 
-       if (op->sym->aead.aad.data)
-               rte_free(op->sym->aead.aad.data);
+       rte_free(op->sym->aead.aad.data);
 
        if (dir == self_test_dir_enc_auth_gen) {
                src = vec->output.data;
@@ -1523,18 +1522,13 @@ static void
 fips_dev_auto_test_uninit(uint8_t dev_id,
                struct fips_dev_auto_test_env *env)
 {
-       if (env->mbuf)
-               rte_pktmbuf_free(env->mbuf);
+       rte_pktmbuf_free(env->mbuf);
        if (env->op)
                rte_crypto_op_free(env->op);
-       if (env->mpool)
-               rte_mempool_free(env->mpool);
-       if (env->op_pool)
-               rte_mempool_free(env->op_pool);
-       if (env->sess_pool)
-               rte_mempool_free(env->sess_pool);
-       if (env->sess_priv_pool)
-               rte_mempool_free(env->sess_priv_pool);
+       rte_mempool_free(env->mpool);
+       rte_mempool_free(env->op_pool);
+       rte_mempool_free(env->sess_pool);
+       rte_mempool_free(env->sess_priv_pool);
 
        rte_cryptodev_stop(dev_id);
 }
index 52a7bf952d46a73368cb11525d28cb27b5a97865..94253eaee8bf95cbc1d73c577b0d7de6bc0a0d57 100644 (file)
@@ -344,8 +344,7 @@ fips_test_clear(void)
                fclose(info.fp_rd);
        if (info.fp_wr)
                fclose(info.fp_wr);
-       if (info.one_line_text)
-               free(info.one_line_text);
+       free(info.one_line_text);
        if (info.nb_vec_lines) {
                uint32_t i;
 
index dc40bffe7d97f74f0fff9025205f99d3200862ee..e06ae37567fd58baa9994dad1d5f76d0d4db9627 100644 (file)
@@ -143,12 +143,9 @@ cryptodev_fips_validate_app_int(void)
 error_exit:
 
        rte_mempool_free(env.mpool);
-       if (env.sess_mpool)
-               rte_mempool_free(env.sess_mpool);
-       if (env.sess_priv_mpool)
-               rte_mempool_free(env.sess_priv_mpool);
-       if (env.op_pool)
-               rte_mempool_free(env.op_pool);
+       rte_mempool_free(env.sess_mpool);
+       rte_mempool_free(env.sess_priv_mpool);
+       rte_mempool_free(env.op_pool);
 
        return ret;
 }
@@ -523,8 +520,7 @@ prepare_data_mbufs(struct fips_val *val)
        uint16_t nb_seg;
        int ret = 0;
 
-       if (env.mbuf)
-               rte_pktmbuf_free(env.mbuf);
+       rte_pktmbuf_free(env.mbuf);
 
        if (total_len > RTE_MBUF_MAX_NB_SEGS) {
                RTE_LOG(ERR, USER1, "Data len %u too big\n", total_len);
@@ -598,8 +594,7 @@ prepare_data_mbufs(struct fips_val *val)
        return 0;
 
 error_exit:
-       if (head)
-               rte_pktmbuf_free(head);
+       rte_pktmbuf_free(head);
        return ret;
 }
 
@@ -656,8 +651,7 @@ prepare_auth_op(void)
        if (ret < 0)
                return ret;
 
-       if (env.digest)
-               rte_free(env.digest);
+       rte_free(env.digest);
 
        env.digest = rte_zmalloc(NULL, vec.cipher_auth.digest.len,
                        RTE_CACHE_LINE_SIZE);
@@ -705,8 +699,7 @@ prepare_aead_op(void)
                if (ret < 0)
                        return ret;
 
-               if (env.digest)
-                       rte_free(env.digest);
+               rte_free(env.digest);
                env.digest = rte_zmalloc(NULL, vec.aead.digest.len,
                                RTE_CACHE_LINE_SIZE);
                if (!env.digest) {
@@ -1430,8 +1423,7 @@ fips_mct_tdes_test(void)
                }
        }
 
-       if (val.val)
-               free(val.val);
+       free(val.val);
 
        return 0;
 }
@@ -1510,8 +1502,7 @@ fips_mct_aes_ecb_test(void)
                }
        }
 
-       if (val.val)
-               free(val.val);
+       free(val.val);
 
        return 0;
 }
@@ -1619,8 +1610,7 @@ fips_mct_aes_test(void)
                        memcpy(vec.iv.val, val.val, AES_BLOCK_SIZE);
        }
 
-       if (val.val)
-               free(val.val);
+       free(val.val);
 
        return 0;
 }
@@ -1706,8 +1696,7 @@ fips_mct_sha_test(void)
 
        rte_free(vec.pt.val);
 
-       if (val.val)
-               free(val.val);
+       free(val.val);
 
        return 0;
 }
@@ -1851,8 +1840,7 @@ error_one_case:
                rte_free(env.digest);
                env.digest = NULL;
        }
-       if (env.mbuf)
-               rte_pktmbuf_free(env.mbuf);
+       rte_pktmbuf_free(env.mbuf);
 
        return ret;
 }
index 0c372675a919f2d989823e4172346550d34bf27c..c918f30e06f3417827be1242f71274b0e01c6fb7 100644 (file)
@@ -3773,10 +3773,8 @@ parse_free_sym_crypto_param_data(struct rte_table_action_sym_crypto_params *p)
 
                switch (xform[i]->type) {
                case RTE_CRYPTO_SYM_XFORM_CIPHER:
-                       if (p->cipher_auth.cipher_iv.val)
-                               free(p->cipher_auth.cipher_iv.val);
-                       if (p->cipher_auth.cipher_iv_update.val)
-                               free(p->cipher_auth.cipher_iv_update.val);
+                       free(p->cipher_auth.cipher_iv.val);
+                       free(p->cipher_auth.cipher_iv_update.val);
                        break;
                case RTE_CRYPTO_SYM_XFORM_AUTH:
                        if (p->cipher_auth.auth_iv.val)
@@ -3785,10 +3783,8 @@ parse_free_sym_crypto_param_data(struct rte_table_action_sym_crypto_params *p)
                                free(p->cipher_auth.cipher_iv_update.val);
                        break;
                case RTE_CRYPTO_SYM_XFORM_AEAD:
-                       if (p->aead.iv.val)
-                               free(p->aead.iv.val);
-                       if (p->aead.aad.val)
-                               free(p->aead.aad.val);
+                       free(p->aead.iv.val);
+                       free(p->aead.aad.val);
                        break;
                default:
                        continue;
index 9997d974563f203a4c0c29525ef24ed36db1f881..cd0f9c3d4eac633d3b5f05dfbb58e5057ae7b29c 100644 (file)
@@ -151,10 +151,8 @@ cryptodev_create(const char *name, struct cryptodev_params *params)
        return cryptodev;
 
 error_exit:
-       if (cryptodev->mp_create)
-               rte_mempool_free(cryptodev->mp_create);
-       if (cryptodev->mp_init)
-               rte_mempool_free(cryptodev->mp_init);
+       rte_mempool_free(cryptodev->mp_create);
+       rte_mempool_free(cryptodev->mp_init);
 
        free(cryptodev);
 
index b2e97327052f61478a9d358828bf7843de5dc67c..82d5f87c384c43b9672a5bb785ba0edf0a22b7bf 100644 (file)
@@ -92,11 +92,9 @@ thread_free(void)
                        continue;
 
                /* MSGQs */
-               if (t->msgq_req)
-                       rte_ring_free(t->msgq_req);
+               rte_ring_free(t->msgq_req);
 
-               if (t->msgq_rsp)
-                       rte_ring_free(t->msgq_rsp);
+               rte_ring_free(t->msgq_rsp);
        }
 }
 
index 502c6b32780e492922ed74e56c1047887bbb77a0..77154c8b7e61679cb7b993a9dec61bad7a861c0b 100644 (file)
@@ -872,8 +872,7 @@ cat_fini(void)
 #if PQOS_VERSION <= 103
        memset(m_sockets, 0, sizeof(m_sockets));
 #else
-       if (m_sockets != NULL)
-               free(m_sockets);
+       free(m_sockets);
 #endif
        m_sock_count = 0;
        memset(m_config, 0, sizeof(m_config));
index bf11e6144b75f4e98f09ba51391e784541ef2607..5fe7eae00eb61813047add16517614b07d571d5e 100644 (file)
@@ -89,11 +89,9 @@ thread_free(void)
                        continue;
 
                /* MSGQs */
-               if (t->msgq_req)
-                       rte_ring_free(t->msgq_req);
+               rte_ring_free(t->msgq_req);
 
-               if (t->msgq_rsp)
-                       rte_ring_free(t->msgq_rsp);
+               rte_ring_free(t->msgq_rsp);
        }
 }
 
index feadacc62ee5ad167214e5192400c349f29c699c..2cab1e6994fe2e05215b202d569779ffddb04fcb 100644 (file)
@@ -849,8 +849,7 @@ static void
 vhost_blk_ctrlr_destroy(struct vhost_blk_ctrlr *ctrlr)
 {
        if (ctrlr->bdev != NULL) {
-               if (ctrlr->bdev->data != NULL)
-                       rte_free(ctrlr->bdev->data);
+               rte_free(ctrlr->bdev->data);
 
                rte_free(ctrlr->bdev);
        }
index 2e9218af68f6bfc2ba2ff4ef280083170d36773f..d4f7d4d3daf2b0be7c7cde318cec4dd4e8b83135 100644 (file)
@@ -405,8 +405,7 @@ rte_compressdev_queue_pairs_release(struct rte_compressdev *dev)
                        return ret;
        }
 
-       if (dev->data->queue_pairs != NULL)
-               rte_free(dev->data->queue_pairs);
+       rte_free(dev->data->queue_pairs);
        dev->data->queue_pairs = NULL;
        dev->data->nb_queue_pairs = 0;
 
index 8c7650cf6c271bdafd2bdfd6c43e14b007291ec9..69004b0a2d2f4e7277fc255290770b87b63a9c20 100644 (file)
@@ -161,8 +161,7 @@ rte_devargs_layers_parse(struct rte_devargs *devargs,
 
 get_out:
        for (i = 0; i < RTE_DIM(layers); i++) {
-               if (layers[i].kvlist)
-                       rte_kvargs_free(layers[i].kvlist);
+               rte_kvargs_free(layers[i].kvlist);
        }
        if (ret != 0) {
                if (allocated_data) {
@@ -285,8 +284,7 @@ rte_devargs_reset(struct rte_devargs *da)
 {
        if (da == NULL)
                return;
-       if (da->data)
-               free(da->data);
+       free(da->data);
        da->data = NULL;
 }
 
index ecde9441ee9002ff95cb6b319124f78de5a148dd..9a0c5309ac7e2f5022e748965bcc10828873f7d3 100644 (file)
@@ -300,8 +300,7 @@ rte_memzone_free(const struct rte_memzone *mz)
 
        rte_rwlock_write_unlock(&mcfg->mlock);
 
-       if (addr != NULL)
-               rte_free(addr);
+       rte_free(addr);
 
        rte_eal_trace_memzone_free(name, addr, ret);
        return ret;
index 45d393b3937eceb7137e0df1e35f4466858f4285..ff44d2124bab021aa7e16dc4f5e87b1537a9aa05 100644 (file)
@@ -1989,12 +1989,9 @@ compute_ctrl_threads_cpuset(struct internal_config *internal_cfg)
 int
 eal_cleanup_config(struct internal_config *internal_cfg)
 {
-       if (internal_cfg->hugefile_prefix != NULL)
-               free(internal_cfg->hugefile_prefix);
-       if (internal_cfg->hugepage_dir != NULL)
-               free(internal_cfg->hugepage_dir);
-       if (internal_cfg->user_mbuf_pool_ops_name != NULL)
-               free(internal_cfg->user_mbuf_pool_ops_name);
+       free(internal_cfg->hugefile_prefix);
+       free(internal_cfg->hugepage_dir);
+       free(internal_cfg->user_mbuf_pool_ops_name);
 
        return 0;
 }
index 33e419aac7fb5d691325ea5f68ed6fb33115ed1f..3b83bcdf57fd4bb93ad222cc668d930b0eb9c663 100644 (file)
@@ -52,8 +52,7 @@ meta_copy(char **meta, int *offset, char *str, int rc)
        return rc;
 
 free_str:
-       if (str)
-               free(str);
+       free(str);
        return -ENOMEM;
 }
 
@@ -291,8 +290,7 @@ trace_metadata_create(void)
        return 0;
 
 fail:
-       if (meta)
-               free(meta);
+       free(meta);
        return -EBADF;
 }
 
index eacd432ab621bcd798d52f957dadf762344815b3..71993fe25b6cb90ed2958e63ca378b86fc738da5 100644 (file)
@@ -456,9 +456,7 @@ eal_parse_args(int argc, char **argv)
                                RTE_LOG(ERR, EAL, "Could not store mbuf pool ops name\n");
                        else {
                                /* free old ops name */
-                               if (internal_conf->user_mbuf_pool_ops_name !=
-                                               NULL)
-                                       free(internal_conf->user_mbuf_pool_ops_name);
+                               free(internal_conf->user_mbuf_pool_ops_name);
 
                                internal_conf->user_mbuf_pool_ops_name =
                                                ops_name;
index 8acf086cd9378faadb60a833f9601a05c6459d80..e9990a95e626489473a3f90867af18909ba949b0 100644 (file)
@@ -643,8 +643,7 @@ eal_parse_args(int argc, char **argv)
                                RTE_LOG(ERR, EAL, "Could not store hugepage directory\n");
                        else {
                                /* free old hugepage dir */
-                               if (internal_conf->hugepage_dir != NULL)
-                                       free(internal_conf->hugepage_dir);
+                               free(internal_conf->hugepage_dir);
                                internal_conf->hugepage_dir = hdir;
                        }
                        break;
@@ -656,8 +655,7 @@ eal_parse_args(int argc, char **argv)
                                RTE_LOG(ERR, EAL, "Could not store file prefix\n");
                        else {
                                /* free old prefix */
-                               if (internal_conf->hugefile_prefix != NULL)
-                                       free(internal_conf->hugefile_prefix);
+                               free(internal_conf->hugefile_prefix);
                                internal_conf->hugefile_prefix = prefix;
                        }
                        break;
@@ -717,9 +715,7 @@ eal_parse_args(int argc, char **argv)
                                RTE_LOG(ERR, EAL, "Could not store mbuf pool ops name\n");
                        else {
                                /* free old ops name */
-                               if (internal_conf->user_mbuf_pool_ops_name !=
-                                               NULL)
-                                       free(internal_conf->user_mbuf_pool_ops_name);
+                               free(internal_conf->user_mbuf_pool_ops_name);
 
                                internal_conf->user_mbuf_pool_ops_name =
                                                ops_name;
index 103c1f909da3e75a3d3cf42808772d3a226ee4f7..51fe752c16d4bc6d9c8d60a87fce23ea330026b9 100644 (file)
@@ -162,8 +162,7 @@ rte_eal_alarm_set(uint64_t us, rte_eal_alarm_callback cb_fn, void *cb_arg)
 fail:
        if (timer != NULL)
                CloseHandle(timer);
-       if (ap != NULL)
-               free(ap);
+       free(ap);
 
 exit:
        rte_eal_trace_alarm_set(us, cb_fn, cb_arg, ret);
index 2fd37d97085e51c964dfd912d627cf1462b83d5d..215d768e2c573342deb387a874730b7ee0fe771d 100644 (file)
@@ -190,8 +190,7 @@ eal_mem_virt2iova_init(void)
        ret = 0;
 
 exit:
-       if (detail != NULL)
-               free(detail);
+       free(detail);
        if (list != INVALID_HANDLE_VALUE)
                SetupDiDestroyDeviceInfoList(list);
 
index 90e153c7b1a78bb5d69c87a5b9f941f20ce305bf..e03e669c317ab791207c73f5434e9a223b92fbc0 100644 (file)
@@ -6190,8 +6190,7 @@ rte_eth_devargs_parse(const char *dargs, struct rte_eth_devargs *eth_da)
        }
 
 parse_cleanup:
-       if (args.str)
-               free(args.str);
+       free(args.str);
 
        return result;
 }
index aa70929dc32e25339f9ac7e43647a4617f39715f..65e12d46a3139fc1dacdca18be43d9a9189b256b 100644 (file)
@@ -233,8 +233,7 @@ free:
 static void
 cluster_fini(struct cluster *cluster)
 {
-       if (cluster->graphs)
-               free(cluster->graphs);
+       free(cluster->graphs);
 }
 
 static int
index 531e1e323cdc1f855810133742f455c9053b6d9c..af4b1ce757d25babce43298d2fd708a389bf2bd2 100644 (file)
@@ -440,8 +440,7 @@ rte_ipsec_sad_destroy(struct rte_ipsec_sad *sad)
        rte_hash_free(sad->hash[RTE_IPSEC_SAD_SPI_DIP]);
        rte_hash_free(sad->hash[RTE_IPSEC_SAD_SPI_DIP_SIP]);
        rte_free(sad);
-       if (te != NULL)
-               rte_free(te);
+       rte_free(te);
 }
 
 /*
index 68575c98338d0804c494c2dde763a988616e9aa4..79042d13ff668e2b122c662469350e499d0dfd75 100644 (file)
@@ -163,14 +163,10 @@ pcap_source_load(struct rte_port_source *port,
        return 0;
 
 error_exit:
-       if (pkt_len_aligns)
-               rte_free(pkt_len_aligns);
-       if (port->pkt_len)
-               rte_free(port->pkt_len);
-       if (port->pkts)
-               rte_free(port->pkts);
-       if (port->pkt_buff)
-               rte_free(port->pkt_buff);
+       rte_free(pkt_len_aligns);
+       rte_free(port->pkt_len);
+       rte_free(port->pkts);
+       rte_free(port->pkt_buff);
 
        return -1;
 }
@@ -242,12 +238,9 @@ rte_port_source_free(void *port)
        if (p == NULL)
                return 0;
 
-       if (p->pkt_len)
-               rte_free(p->pkt_len);
-       if (p->pkts)
-               rte_free(p->pkts);
-       if (p->pkt_buff)
-               rte_free(p->pkt_buff);
+       rte_free(p->pkt_len);
+       rte_free(p->pkts);
+       rte_free(p->pkt_buff);
 
        rte_free(p);
 
index c4b5de9601cf1988dae4d67b40925da2c039be48..2261ce7820f649bdccf2ba04996dfad1c43375df 100644 (file)
@@ -457,8 +457,7 @@ rte_power_empty_poll_stat_free(void)
 
        RTE_LOG(INFO, POWER, "Close the Empty Poll\n");
 
-       if (ep_params != NULL)
-               rte_free(ep_params);
+       rte_free(ep_params);
 }
 
 int
index 9445853b79cc7bba919cb615d4a88f577025478d..bc0241bfb3fdfb794848ad836ad6c9a7df570c0f 100644 (file)
@@ -192,10 +192,8 @@ rte_reorder_free_mbufs(struct rte_reorder_buffer *b)
 
        /* Free up the mbufs of order buffer & ready buffer */
        for (i = 0; i < b->order_buf.size; i++) {
-               if (b->order_buf.entries[i])
-                       rte_pktmbuf_free(b->order_buf.entries[i]);
-               if (b->ready_buf.entries[i])
-                       rte_pktmbuf_free(b->ready_buf.entries[i]);
+               rte_pktmbuf_free(b->order_buf.entries[i]);
+               rte_pktmbuf_free(b->ready_buf.entries[i]);
        }
 }
 
index b24202a7eba3ac92340ac2543d7f38451a6e4d82..5a5ba8b82a61b6b92eefb34ea11e2176338d80f1 100644 (file)
@@ -324,8 +324,7 @@ vhost_user_iotlb_init(struct virtio_net *dev, int vq_index)
 
        /* If already created, free it and recreate */
        vq->iotlb_pool = rte_mempool_lookup(pool_name);
-       if (vq->iotlb_pool)
-               rte_mempool_free(vq->iotlb_pool);
+       rte_mempool_free(vq->iotlb_pool);
 
        vq->iotlb_pool = rte_mempool_create(pool_name,
                        IOTLB_CACHE_SIZE, sizeof(struct vhost_iotlb_entry), 0,
index afaf19ec80126dcbf6fe0a96aafdde586d785091..b1c0eb6a0f975473ff0899ec3fb2d01a1221a736 100644 (file)
@@ -1498,10 +1498,8 @@ rte_vhost_crypto_create(int vid, uint8_t cryptodev_id,
        return 0;
 
 error_exit:
-       if (vcrypto->session_map)
-               rte_hash_free(vcrypto->session_map);
-       if (vcrypto->mbuf_pool)
-               rte_mempool_free(vcrypto->mbuf_pool);
+       rte_hash_free(vcrypto->session_map);
+       rte_mempool_free(vcrypto->mbuf_pool);
 
        rte_free(vcrypto);
 
index 3b810c112cbb966a8af0c78aadc363de66bd0396..2e2417b0b9b3322e687c25642a897a1666e407b1 100644 (file)
@@ -491,8 +491,7 @@ vhost_user_set_vring_num(struct virtio_net **pdev,
        }
 
        if (vq_is_packed(dev)) {
-               if (vq->shadow_used_packed)
-                       rte_free(vq->shadow_used_packed);
+               rte_free(vq->shadow_used_packed);
                vq->shadow_used_packed = rte_malloc_socket(NULL,
                                vq->size *
                                sizeof(struct vring_used_elem_packed),
@@ -505,8 +504,7 @@ vhost_user_set_vring_num(struct virtio_net **pdev,
                }
 
        } else {
-               if (vq->shadow_used_split)
-                       rte_free(vq->shadow_used_split);
+               rte_free(vq->shadow_used_split);
 
                vq->shadow_used_split = rte_malloc_socket(NULL,
                                vq->size * sizeof(struct vring_used_elem),
@@ -520,8 +518,7 @@ vhost_user_set_vring_num(struct virtio_net **pdev,
                }
        }
 
-       if (vq->batch_copy_elems)
-               rte_free(vq->batch_copy_elems);
+       rte_free(vq->batch_copy_elems);
        vq->batch_copy_elems = rte_malloc_socket(NULL,
                                vq->size * sizeof(struct batch_copy_elem),
                                RTE_CACHE_LINE_SIZE, vq->numa_node);