Skip to content

L
linux
Commit a45e5f18 authored by Ruan Jinjie's avatar Ruan Jinjie Committed by Leon Romanovsky
Browse files
Options

RDMA/mlx: Remove unnecessary variable initializations 

Remove unnecessary variable initializations.
Signed-off-by: default avatarRuan Jinjie <ruanjinjie@huawei.com>
Link: https://lore.kernel.org/r/20230728065139.3411703-1-ruanjinjie@huawei.comSigned-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent 72d422c2
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 42 deletions
drivers/infiniband/hw/mlx4/main.c
View file @ a45e5f18
...@@ -132,7 +132,7 @@ static struct net_device *mlx4_ib_get_netdev(struct ib_device *device, ...@@ -132,7 +132,7 @@ static struct net_device *mlx4_ib_get_netdev(struct ib_device *device,
if (dev) { if (dev) {
if (mlx4_is_bonded(ibdev->dev)) { if (mlx4_is_bonded(ibdev->dev)) {
struct net_device *upper = NULL; struct net_device *upper;
upper = netdev_master_upper_dev_get_rcu(dev); upper = netdev_master_upper_dev_get_rcu(dev);
if (upper) { if (upper) {
...@@ -254,7 +254,7 @@ static int mlx4_ib_add_gid(const struct ib_gid_attr *attr, void **context) ...@@ -254,7 +254,7 @@ static int mlx4_ib_add_gid(const struct ib_gid_attr *attr, void **context)
int ret = 0; int ret = 0;
int hw_update = 0; int hw_update = 0;
int i; int i;
struct gid_entry *gids = NULL; struct gid_entry *gids;
u16 vlan_id = 0xffff; u16 vlan_id = 0xffff;
u8 mac[ETH_ALEN]; u8 mac[ETH_ALEN];
...@@ -345,7 +345,7 @@ static int mlx4_ib_del_gid(const struct ib_gid_attr *attr, void **context) ...@@ -345,7 +345,7 @@ static int mlx4_ib_del_gid(const struct ib_gid_attr *attr, void **context)
struct mlx4_port_gid_table *port_gid_table; struct mlx4_port_gid_table *port_gid_table;
int ret = 0; int ret = 0;
int hw_update = 0; int hw_update = 0;
struct gid_entry *gids = NULL; struct gid_entry *gids;
if (!rdma_cap_roce_gid_table(attr->device, attr->port_num)) if (!rdma_cap_roce_gid_table(attr->device, attr->port_num))
return -EINVAL; return -EINVAL;
...@@ -431,8 +431,8 @@ static int mlx4_ib_query_device(struct ib_device *ibdev, ...@@ -431,8 +431,8 @@ static int mlx4_ib_query_device(struct ib_device *ibdev,
struct ib_udata *uhw) struct ib_udata *uhw)
{ {
struct mlx4_ib_dev *dev = to_mdev(ibdev); struct mlx4_ib_dev *dev = to_mdev(ibdev);
struct ib_smp *in_mad = NULL; struct ib_smp *in_mad;
struct ib_smp *out_mad = NULL; struct ib_smp *out_mad;
int err; int err;
int have_ib_ports; int have_ib_ports;
struct mlx4_uverbs_ex_query_device cmd; struct mlx4_uverbs_ex_query_device cmd;
...@@ -649,8 +649,8 @@ mlx4_ib_port_link_layer(struct ib_device *device, u32 port_num) ...@@ -649,8 +649,8 @@ mlx4_ib_port_link_layer(struct ib_device *device, u32 port_num)
static int ib_link_query_port(struct ib_device *ibdev, u32 port, static int ib_link_query_port(struct ib_device *ibdev, u32 port,
struct ib_port_attr *props, int netw_view) struct ib_port_attr *props, int netw_view)
{ {
struct ib_smp *in_mad = NULL; struct ib_smp *in_mad;
struct ib_smp *out_mad = NULL; struct ib_smp *out_mad;
int ext_active_speed; int ext_active_speed;
int mad_ifc_flags = MLX4_MAD_IFC_IGNORE_KEYS; int mad_ifc_flags = MLX4_MAD_IFC_IGNORE_KEYS;
int err = -ENOMEM; int err = -ENOMEM;
...@@ -827,8 +827,8 @@ static int mlx4_ib_query_port(struct ib_device *ibdev, u32 port, ...@@ -827,8 +827,8 @@ static int mlx4_ib_query_port(struct ib_device *ibdev, u32 port,
int __mlx4_ib_query_gid(struct ib_device *ibdev, u32 port, int index, int __mlx4_ib_query_gid(struct ib_device *ibdev, u32 port, int index,
union ib_gid *gid, int netw_view) union ib_gid *gid, int netw_view)
{ {
struct ib_smp *in_mad = NULL; struct ib_smp *in_mad;
struct ib_smp *out_mad = NULL; struct ib_smp *out_mad;
int err = -ENOMEM; int err = -ENOMEM;
struct mlx4_ib_dev *dev = to_mdev(ibdev); struct mlx4_ib_dev *dev = to_mdev(ibdev);
int clear = 0; int clear = 0;
...@@ -892,8 +892,8 @@ static int mlx4_ib_query_sl2vl(struct ib_device *ibdev, u32 port, ...@@ -892,8 +892,8 @@ static int mlx4_ib_query_sl2vl(struct ib_device *ibdev, u32 port,
u64 *sl2vl_tbl) u64 *sl2vl_tbl)
{ {
union sl2vl_tbl_to_u64 sl2vl64; union sl2vl_tbl_to_u64 sl2vl64;
struct ib_smp *in_mad = NULL; struct ib_smp *in_mad;
struct ib_smp *out_mad = NULL; struct ib_smp *out_mad;
int mad_ifc_flags = MLX4_MAD_IFC_IGNORE_KEYS; int mad_ifc_flags = MLX4_MAD_IFC_IGNORE_KEYS;
int err = -ENOMEM; int err = -ENOMEM;
int jj; int jj;
...@@ -952,8 +952,8 @@ static void mlx4_init_sl2vl_tbl(struct mlx4_ib_dev *mdev) ...@@ -952,8 +952,8 @@ static void mlx4_init_sl2vl_tbl(struct mlx4_ib_dev *mdev)
int __mlx4_ib_query_pkey(struct ib_device *ibdev, u32 port, u16 index, int __mlx4_ib_query_pkey(struct ib_device *ibdev, u32 port, u16 index,
u16 *pkey, int netw_view) u16 *pkey, int netw_view)
{ {
struct ib_smp *in_mad = NULL; struct ib_smp *in_mad;
struct ib_smp *out_mad = NULL; struct ib_smp *out_mad;
int mad_ifc_flags = MLX4_MAD_IFC_IGNORE_KEYS; int mad_ifc_flags = MLX4_MAD_IFC_IGNORE_KEYS;
int err = -ENOMEM; int err = -ENOMEM;
...@@ -1968,8 +1968,8 @@ static int mlx4_ib_mcg_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) ...@@ -1968,8 +1968,8 @@ static int mlx4_ib_mcg_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
static int init_node_data(struct mlx4_ib_dev *dev) static int init_node_data(struct mlx4_ib_dev *dev)
{ {
struct ib_smp *in_mad = NULL; struct ib_smp *in_mad;
struct ib_smp *out_mad = NULL; struct ib_smp *out_mad;
int mad_ifc_flags = MLX4_MAD_IFC_IGNORE_KEYS; int mad_ifc_flags = MLX4_MAD_IFC_IGNORE_KEYS;
int err = -ENOMEM; int err = -ENOMEM;
...@@ -2621,7 +2621,7 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) ...@@ -2621,7 +2621,7 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
int num_req_counters; int num_req_counters;
int allocated; int allocated;
u32 counter_index; u32 counter_index;
struct counter_index *new_counter_index = NULL; struct counter_index *new_counter_index;
pr_info_once("%s", mlx4_ib_version); pr_info_once("%s", mlx4_ib_version);
...@@ -2923,7 +2923,7 @@ int mlx4_ib_steer_qp_reg(struct mlx4_ib_dev *mdev, struct mlx4_ib_qp *mqp, ...@@ -2923,7 +2923,7 @@ int mlx4_ib_steer_qp_reg(struct mlx4_ib_dev *mdev, struct mlx4_ib_qp *mqp,
{ {
int err; int err;
size_t flow_size; size_t flow_size;
struct ib_flow_attr *flow = NULL; struct ib_flow_attr *flow;
struct ib_flow_spec_ib *ib_spec; struct ib_flow_spec_ib *ib_spec;
if (is_attach) { if (is_attach) {
...@@ -2943,11 +2943,11 @@ int mlx4_ib_steer_qp_reg(struct mlx4_ib_dev *mdev, struct mlx4_ib_qp *mqp, ...@@ -2943,11 +2943,11 @@ int mlx4_ib_steer_qp_reg(struct mlx4_ib_dev *mdev, struct mlx4_ib_qp *mqp,
err = __mlx4_ib_create_flow(&mqp->ibqp, flow, MLX4_DOMAIN_NIC, err = __mlx4_ib_create_flow(&mqp->ibqp, flow, MLX4_DOMAIN_NIC,
MLX4_FS_REGULAR, &mqp->reg_id); MLX4_FS_REGULAR, &mqp->reg_id);
} else { kfree(flow);
err = __mlx4_ib_destroy_flow(mdev->dev, mqp->reg_id); return err;
} }
kfree(flow);
return err; return __mlx4_ib_destroy_flow(mdev->dev, mqp->reg_id);
} }
static void mlx4_ib_remove(struct mlx4_dev *dev, void *ibdev_ptr) static void mlx4_ib_remove(struct mlx4_dev *dev, void *ibdev_ptr)
...@@ -2992,7 +2992,7 @@ static void mlx4_ib_remove(struct mlx4_dev *dev, void *ibdev_ptr) ...@@ -2992,7 +2992,7 @@ static void mlx4_ib_remove(struct mlx4_dev *dev, void *ibdev_ptr)
static void do_slave_init(struct mlx4_ib_dev *ibdev, int slave, int do_init) static void do_slave_init(struct mlx4_ib_dev *ibdev, int slave, int do_init)
{ {
struct mlx4_ib_demux_work **dm = NULL; struct mlx4_ib_demux_work **dm;
struct mlx4_dev *dev = ibdev->dev; struct mlx4_dev *dev = ibdev->dev;
int i; int i;
unsigned long flags; unsigned long flags;
......
drivers/infiniband/hw/mlx5/mad.c
View file @ a45e5f18
...@@ -308,8 +308,8 @@ int mlx5_ib_process_mad(struct ib_device *ibdev, int mad_flags, u32 port_num, ...@@ -308,8 +308,8 @@ int mlx5_ib_process_mad(struct ib_device *ibdev, int mad_flags, u32 port_num,
int mlx5_query_ext_port_caps(struct mlx5_ib_dev *dev, unsigned int port) int mlx5_query_ext_port_caps(struct mlx5_ib_dev *dev, unsigned int port)
{ {
struct ib_smp *in_mad = NULL; struct ib_smp *in_mad;
struct ib_smp *out_mad = NULL; struct ib_smp *out_mad;
int err = -ENOMEM; int err = -ENOMEM;
u16 packet_error; u16 packet_error;
...@@ -338,8 +338,8 @@ int mlx5_query_ext_port_caps(struct mlx5_ib_dev *dev, unsigned int port) ...@@ -338,8 +338,8 @@ int mlx5_query_ext_port_caps(struct mlx5_ib_dev *dev, unsigned int port)
static int mlx5_query_mad_ifc_smp_attr_node_info(struct ib_device *ibdev, static int mlx5_query_mad_ifc_smp_attr_node_info(struct ib_device *ibdev,
struct ib_smp *out_mad) struct ib_smp *out_mad)
{ {
struct ib_smp *in_mad = NULL; struct ib_smp *in_mad;
int err = -ENOMEM; int err;
in_mad = kzalloc(sizeof(*in_mad), GFP_KERNEL); in_mad = kzalloc(sizeof(*in_mad), GFP_KERNEL);
if (!in_mad) if (!in_mad)
...@@ -358,8 +358,8 @@ static int mlx5_query_mad_ifc_smp_attr_node_info(struct ib_device *ibdev, ...@@ -358,8 +358,8 @@ static int mlx5_query_mad_ifc_smp_attr_node_info(struct ib_device *ibdev,
int mlx5_query_mad_ifc_system_image_guid(struct ib_device *ibdev, int mlx5_query_mad_ifc_system_image_guid(struct ib_device *ibdev,
__be64 *sys_image_guid) __be64 *sys_image_guid)
{ {
struct ib_smp *out_mad = NULL; struct ib_smp *out_mad;
int err = -ENOMEM; int err;
out_mad = kmalloc(sizeof(*out_mad), GFP_KERNEL); out_mad = kmalloc(sizeof(*out_mad), GFP_KERNEL);
if (!out_mad) if (!out_mad)
...@@ -380,8 +380,8 @@ int mlx5_query_mad_ifc_system_image_guid(struct ib_device *ibdev, ...@@ -380,8 +380,8 @@ int mlx5_query_mad_ifc_system_image_guid(struct ib_device *ibdev,
int mlx5_query_mad_ifc_max_pkeys(struct ib_device *ibdev, int mlx5_query_mad_ifc_max_pkeys(struct ib_device *ibdev,
u16 *max_pkeys) u16 *max_pkeys)
{ {
struct ib_smp *out_mad = NULL; struct ib_smp *out_mad;
int err = -ENOMEM; int err;
out_mad = kmalloc(sizeof(*out_mad), GFP_KERNEL); out_mad = kmalloc(sizeof(*out_mad), GFP_KERNEL);
if (!out_mad) if (!out_mad)
...@@ -402,8 +402,8 @@ int mlx5_query_mad_ifc_max_pkeys(struct ib_device *ibdev, ...@@ -402,8 +402,8 @@ int mlx5_query_mad_ifc_max_pkeys(struct ib_device *ibdev,
int mlx5_query_mad_ifc_vendor_id(struct ib_device *ibdev, int mlx5_query_mad_ifc_vendor_id(struct ib_device *ibdev,
u32 *vendor_id) u32 *vendor_id)
{ {
struct ib_smp *out_mad = NULL; struct ib_smp *out_mad;
int err = -ENOMEM; int err;
out_mad = kmalloc(sizeof(*out_mad), GFP_KERNEL); out_mad = kmalloc(sizeof(*out_mad), GFP_KERNEL);
if (!out_mad) if (!out_mad)
...@@ -423,8 +423,8 @@ int mlx5_query_mad_ifc_vendor_id(struct ib_device *ibdev, ...@@ -423,8 +423,8 @@ int mlx5_query_mad_ifc_vendor_id(struct ib_device *ibdev,
int mlx5_query_mad_ifc_node_desc(struct mlx5_ib_dev *dev, char *node_desc) int mlx5_query_mad_ifc_node_desc(struct mlx5_ib_dev *dev, char *node_desc)
{ {
struct ib_smp *in_mad = NULL; struct ib_smp *in_mad;
struct ib_smp *out_mad = NULL; struct ib_smp *out_mad;
int err = -ENOMEM; int err = -ENOMEM;
in_mad = kzalloc(sizeof(*in_mad), GFP_KERNEL); in_mad = kzalloc(sizeof(*in_mad), GFP_KERNEL);
...@@ -448,8 +448,8 @@ int mlx5_query_mad_ifc_node_desc(struct mlx5_ib_dev *dev, char *node_desc) ...@@ -448,8 +448,8 @@ int mlx5_query_mad_ifc_node_desc(struct mlx5_ib_dev *dev, char *node_desc)
int mlx5_query_mad_ifc_node_guid(struct mlx5_ib_dev *dev, __be64 *node_guid) int mlx5_query_mad_ifc_node_guid(struct mlx5_ib_dev *dev, __be64 *node_guid)
{ {
struct ib_smp *in_mad = NULL; struct ib_smp *in_mad;
struct ib_smp *out_mad = NULL; struct ib_smp *out_mad;
int err = -ENOMEM; int err = -ENOMEM;
in_mad = kzalloc(sizeof(*in_mad), GFP_KERNEL); in_mad = kzalloc(sizeof(*in_mad), GFP_KERNEL);
...@@ -474,8 +474,8 @@ int mlx5_query_mad_ifc_node_guid(struct mlx5_ib_dev *dev, __be64 *node_guid) ...@@ -474,8 +474,8 @@ int mlx5_query_mad_ifc_node_guid(struct mlx5_ib_dev *dev, __be64 *node_guid)
int mlx5_query_mad_ifc_pkey(struct ib_device *ibdev, u32 port, u16 index, int mlx5_query_mad_ifc_pkey(struct ib_device *ibdev, u32 port, u16 index,
u16 *pkey) u16 *pkey)
{ {
struct ib_smp *in_mad = NULL; struct ib_smp *in_mad;
struct ib_smp *out_mad = NULL; struct ib_smp *out_mad;
int err = -ENOMEM; int err = -ENOMEM;
in_mad = kzalloc(sizeof(*in_mad), GFP_KERNEL); in_mad = kzalloc(sizeof(*in_mad), GFP_KERNEL);
...@@ -503,8 +503,8 @@ int mlx5_query_mad_ifc_pkey(struct ib_device *ibdev, u32 port, u16 index, ...@@ -503,8 +503,8 @@ int mlx5_query_mad_ifc_pkey(struct ib_device *ibdev, u32 port, u16 index,
int mlx5_query_mad_ifc_gids(struct ib_device *ibdev, u32 port, int index, int mlx5_query_mad_ifc_gids(struct ib_device *ibdev, u32 port, int index,
union ib_gid *gid) union ib_gid *gid)
{ {
struct ib_smp *in_mad = NULL; struct ib_smp *in_mad;
struct ib_smp *out_mad = NULL; struct ib_smp *out_mad;
int err = -ENOMEM; int err = -ENOMEM;
in_mad = kzalloc(sizeof(*in_mad), GFP_KERNEL); in_mad = kzalloc(sizeof(*in_mad), GFP_KERNEL);
...@@ -545,8 +545,8 @@ int mlx5_query_mad_ifc_port(struct ib_device *ibdev, u32 port, ...@@ -545,8 +545,8 @@ int mlx5_query_mad_ifc_port(struct ib_device *ibdev, u32 port,
{ {
struct mlx5_ib_dev *dev = to_mdev(ibdev); struct mlx5_ib_dev *dev = to_mdev(ibdev);
struct mlx5_core_dev *mdev = dev->mdev; struct mlx5_core_dev *mdev = dev->mdev;
struct ib_smp *in_mad = NULL; struct ib_smp *in_mad;
struct ib_smp *out_mad = NULL; struct ib_smp *out_mad;
int ext_active_speed; int ext_active_speed;
int err = -ENOMEM; int err = -ENOMEM;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7