d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove useless NULL checks.

Browse Source 
NULL is not returned when allocating memory passing the M_WAITOK flag.

Submitted by:		trasz @
Differential Revision:  https://reviews.freebsd.org/D5772
Sponsored by:           Mellanox Technologies
MFC after:		1 week
This commit is contained in:
Hans Petter Selasky 2016-12-02 09:41:54 +00:00
parent c4247af46a
commit de83258d59
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c
View File

@ -854,8 +854,6 @@ mlx5e_create_main_flow_table(struct mlx5e_priv *priv)
u8 *dmac;
g = malloc(9 * sizeof(*g), M_MLX5EN, M_WAITOK | M_ZERO);
if (g == NULL)
return (-ENOMEM);
g[0].log_sz = 2;
g[0].match_criteria_enable = MLX5_MATCH_OUTER_HEADERS;
@ -939,8 +937,6 @@ mlx5e_create_vlan_flow_table(struct mlx5e_priv *priv)
struct mlx5_flow_table_group *g;
g = malloc(2 * sizeof(*g), M_MLX5EN, M_WAITOK | M_ZERO);
if (g == NULL)
return (-ENOMEM);
g[0].log_sz = 12;
g[0].match_criteria_enable = MLX5_MATCH_OUTER_HEADERS;

16
sys/dev/mlx5/mlx5_en/mlx5_en_main.c
View File

@ -656,10 +656,6 @@ mlx5e_create_rq(struct mlx5e_channel *c,
goto err_rq_wq_destroy;
rq->mbuf = malloc(wq_sz * sizeof(rq->mbuf[0]), M_MLX5EN, M_WAITOK | M_ZERO);
if (rq->mbuf == NULL) {
err = -ENOMEM;
goto err_lro_init;
}
for (i = 0; i != wq_sz; i++) {
struct mlx5e_rx_wqe *wqe = mlx5_wq_ll_get_wqe(&rq->wq, i);
uint32_t byte_count = rq->wqe_sz - MLX5E_NET_IP_ALIGN;
@ -686,7 +682,6 @@ mlx5e_create_rq(struct mlx5e_channel *c,
err_rq_mbuf_free:
free(rq->mbuf, M_MLX5EN);
err_lro_init:
tcp_lro_free(&rq->lro);
err_rq_wq_destroy:
mlx5_wq_destroy(&rq->wq_ctrl);
@ -897,8 +892,6 @@ mlx5e_alloc_sq_db(struct mlx5e_sq *sq)
int x;
sq->mbuf = malloc(wq_sz * sizeof(sq->mbuf[0]), M_MLX5EN, M_WAITOK | M_ZERO);
if (sq->mbuf == NULL)
return (-ENOMEM);
/* Create DMA descriptor MAPs */
for (x = 0; x != wq_sz; x++) {
@ -1486,9 +1479,6 @@ mlx5e_open_channel(struct mlx5e_priv *priv, int ix,
int err;
c = malloc(sizeof(*c), M_MLX5EN, M_WAITOK | M_ZERO);
if (c == NULL)
return (-ENOMEM);
c->priv = priv;
c->ix = ix;
c->cpu = 0;
@ -1699,8 +1689,6 @@ mlx5e_open_channels(struct mlx5e_priv *priv)
priv->channel = malloc(priv->params.num_channels *
sizeof(struct mlx5e_channel *), M_MLX5EN, M_WAITOK | M_ZERO);
if (priv->channel == NULL)
return (-ENOMEM);
mlx5e_build_channel_param(priv, &cparam);
for (i = 0; i < priv->params.num_channels; i++) {
@ -2879,10 +2867,6 @@ mlx5e_create_ifp(struct mlx5_core_dev *mdev)
return (NULL);
}
priv = malloc(sizeof(*priv), M_MLX5EN, M_WAITOK | M_ZERO);
if (priv == NULL) {
mlx5_core_err(mdev, "malloc() failed\n");
return (NULL);
}
mlx5e_priv_mtx_init(priv);
ifp = priv->ifp = if_alloc(IFT_ETHER);