Commit 39868926 authored by Ruan Jinjie's avatar Ruan Jinjie Committed by Paolo Abeni
Browse files

net/mlx4: Remove many unnecessary NULL values 



The NULL initialization of the pointers assigned by kzalloc() first is
not necessary, because if the kzalloc() failed, the pointers will be
assigned NULL, otherwise it works as usual. so remove it.

Signed-off-by: default avatarRuan Jinjie <ruanjinjie@huawei.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Link: https://lore.kernel.org/r/20230802040026.2588675-1-ruanjinjie@huawei.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 3cb6a338

drivers/net/ethernet/mellanox/mlx4/en_ethtool.c

+5 −5
Original line number Diff line number Diff line
@@ -1467,8 +1467,8 @@ static int add_ip_rule(struct mlx4_en_priv *priv, 
		       struct list_head *list_h)

{

	int err;

	struct mlx4_spec_list *spec_l2 = NULL;

	struct mlx4_spec_list *spec_l3 = NULL;

	struct mlx4_spec_list *spec_l2;

	struct mlx4_spec_list *spec_l3;

	struct ethtool_usrip4_spec *l3_mask = &cmd->fs.m_u.usr_ip4_spec;



	spec_l3 = kzalloc(sizeof(*spec_l3), GFP_KERNEL);
@@ -1505,9 +1505,9 @@ static int add_tcp_udp_rule(struct mlx4_en_priv *priv, 
			     struct list_head *list_h, int proto)

{

	int err;

	struct mlx4_spec_list *spec_l2 = NULL;

	struct mlx4_spec_list *spec_l3 = NULL;

	struct mlx4_spec_list *spec_l4 = NULL;

	struct mlx4_spec_list *spec_l2;

	struct mlx4_spec_list *spec_l3;

	struct mlx4_spec_list *spec_l4;

	struct ethtool_tcpip4_spec *l4_mask = &cmd->fs.m_u.tcp_ip4_spec;



	spec_l2 = kzalloc(sizeof(*spec_l2), GFP_KERNEL);

drivers/net/ethernet/mellanox/mlx4/en_netdev.c

+2 −2
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ mlx4_en_filter_alloc(struct mlx4_en_priv *priv, int rxq_index, __be32 src_ip, 
		     __be32 dst_ip, u8 ip_proto, __be16 src_port,

		     __be16 dst_port, u32 flow_id)

{

	struct mlx4_en_filter *filter = NULL;

	struct mlx4_en_filter *filter;



	filter = kzalloc(sizeof(struct mlx4_en_filter), GFP_ATOMIC);

	if (!filter)
@@ -2935,7 +2935,7 @@ static void mlx4_en_bond_work(struct work_struct *work) 
static int mlx4_en_queue_bond_work(struct mlx4_en_priv *priv, int is_bonded,

				   u8 v2p_p1, u8 v2p_p2)

{

	struct mlx4_en_bond *bond = NULL;

	struct mlx4_en_bond *bond;



	bond = kzalloc(sizeof(*bond), GFP_ATOMIC);

	if (!bond)

drivers/net/ethernet/mellanox/mlx4/main.c

+4 −4
Original line number Diff line number Diff line
@@ -864,7 +864,7 @@ static void mlx4_slave_destroy_special_qp_cap(struct mlx4_dev *dev) 


static int mlx4_slave_special_qp_cap(struct mlx4_dev *dev)

{

	struct mlx4_func_cap *func_cap = NULL;

	struct mlx4_func_cap *func_cap;

	struct mlx4_caps *caps = &dev->caps;

	int i, err = 0;
@@ -908,9 +908,9 @@ static int mlx4_slave_cap(struct mlx4_dev *dev) 
{

	int			   err;

	u32			   page_size;

	struct mlx4_dev_cap	   *dev_cap = NULL;

	struct mlx4_func_cap	   *func_cap = NULL;

	struct mlx4_init_hca_param *hca_param = NULL;

	struct mlx4_dev_cap	   *dev_cap;

	struct mlx4_func_cap	   *func_cap;

	struct mlx4_init_hca_param *hca_param;



	hca_param = kzalloc(sizeof(*hca_param), GFP_KERNEL);

	func_cap = kzalloc(sizeof(*func_cap), GFP_KERNEL);