diff options
author | Henry Orosco <henry.orosco@intel.com> | 2016-11-09 22:42:26 -0500 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2016-12-05 16:09:38 -0500 |
commit | dfd9c43b3ce97e1b66a6dc1d9dcc95db9a27cc4b (patch) | |
tree | fd2fe6ec57bdbf5459388e4116fd198b489da5f8 | |
parent | 5ebcb0ff54e594668e506583fa7344d101e3d05e (diff) |
i40iw: Remove check on return from device_init_pestat()
Remove unnecessary check for return code from
device_init_pestat() and change func to void.
Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com>
Signed-off-by: Henry Orosco <henry.orosco@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
-rw-r--r-- | drivers/infiniband/hw/i40iw/i40iw_ctrl.c | 10 | ||||
-rw-r--r-- | drivers/infiniband/hw/i40iw/i40iw_p.h | 2 | ||||
-rw-r--r-- | drivers/infiniband/hw/i40iw/i40iw_virtchnl.c | 6 |
3 files changed, 4 insertions, 14 deletions
diff --git a/drivers/infiniband/hw/i40iw/i40iw_ctrl.c b/drivers/infiniband/hw/i40iw/i40iw_ctrl.c index 8417452a7a9c..5dde358349ee 100644 --- a/drivers/infiniband/hw/i40iw/i40iw_ctrl.c +++ b/drivers/infiniband/hw/i40iw/i40iw_ctrl.c | |||
@@ -4853,10 +4853,9 @@ static const struct i40iw_device_pestat_ops iw_device_pestat_ops = { | |||
4853 | * i40iw_device_init_pestat - Initialize the pestat structure | 4853 | * i40iw_device_init_pestat - Initialize the pestat structure |
4854 | * @dev: pestat struct | 4854 | * @dev: pestat struct |
4855 | */ | 4855 | */ |
4856 | enum i40iw_status_code i40iw_device_init_pestat(struct i40iw_dev_pestat *devstat) | 4856 | void i40iw_device_init_pestat(struct i40iw_dev_pestat *devstat) |
4857 | { | 4857 | { |
4858 | devstat->ops = iw_device_pestat_ops; | 4858 | devstat->ops = iw_device_pestat_ops; |
4859 | return 0; | ||
4860 | } | 4859 | } |
4861 | 4860 | ||
4862 | /** | 4861 | /** |
@@ -4881,12 +4880,7 @@ enum i40iw_status_code i40iw_device_init(struct i40iw_sc_dev *dev, | |||
4881 | 4880 | ||
4882 | dev->debug_mask = info->debug_mask; | 4881 | dev->debug_mask = info->debug_mask; |
4883 | 4882 | ||
4884 | ret_code = i40iw_device_init_pestat(&dev->dev_pestat); | 4883 | i40iw_device_init_pestat(&dev->dev_pestat); |
4885 | if (ret_code) { | ||
4886 | i40iw_debug(dev, I40IW_DEBUG_DEV, | ||
4887 | "%s: i40iw_device_init_pestat failed\n", __func__); | ||
4888 | return ret_code; | ||
4889 | } | ||
4890 | dev->hmc_fn_id = info->hmc_fn_id; | 4884 | dev->hmc_fn_id = info->hmc_fn_id; |
4891 | i40iw_fill_qos_list(info->l2params.qs_handle_list); | 4885 | i40iw_fill_qos_list(info->l2params.qs_handle_list); |
4892 | for (i = 0; i < I40IW_MAX_USER_PRIORITY; i++) { | 4886 | for (i = 0; i < I40IW_MAX_USER_PRIORITY; i++) { |
diff --git a/drivers/infiniband/hw/i40iw/i40iw_p.h b/drivers/infiniband/hw/i40iw/i40iw_p.h index c9e8cb8c4410..2a4bd3233b41 100644 --- a/drivers/infiniband/hw/i40iw/i40iw_p.h +++ b/drivers/infiniband/hw/i40iw/i40iw_p.h | |||
@@ -47,7 +47,7 @@ void i40iw_debug_buf(struct i40iw_sc_dev *dev, enum i40iw_debug_flag mask, | |||
47 | enum i40iw_status_code i40iw_device_init(struct i40iw_sc_dev *dev, | 47 | enum i40iw_status_code i40iw_device_init(struct i40iw_sc_dev *dev, |
48 | struct i40iw_device_init_info *info); | 48 | struct i40iw_device_init_info *info); |
49 | 49 | ||
50 | enum i40iw_status_code i40iw_device_init_pestat(struct i40iw_dev_pestat *); | 50 | void i40iw_device_init_pestat(struct i40iw_dev_pestat *devstat); |
51 | 51 | ||
52 | void i40iw_sc_cqp_post_sq(struct i40iw_sc_cqp *cqp); | 52 | void i40iw_sc_cqp_post_sq(struct i40iw_sc_cqp *cqp); |
53 | 53 | ||
diff --git a/drivers/infiniband/hw/i40iw/i40iw_virtchnl.c b/drivers/infiniband/hw/i40iw/i40iw_virtchnl.c index 3041003c94d2..dbd39c4af946 100644 --- a/drivers/infiniband/hw/i40iw/i40iw_virtchnl.c +++ b/drivers/infiniband/hw/i40iw/i40iw_virtchnl.c | |||
@@ -496,11 +496,7 @@ enum i40iw_status_code i40iw_vchnl_recv_pf(struct i40iw_sc_dev *dev, | |||
496 | i40iw_debug(dev, I40IW_DEBUG_VIRT, | 496 | i40iw_debug(dev, I40IW_DEBUG_VIRT, |
497 | "VF%u error CQP HMC Function operation.\n", | 497 | "VF%u error CQP HMC Function operation.\n", |
498 | vf_id); | 498 | vf_id); |
499 | ret_code = i40iw_device_init_pestat(&vf_dev->dev_pestat); | 499 | i40iw_device_init_pestat(&vf_dev->dev_pestat); |
500 | if (ret_code) | ||
501 | i40iw_debug(dev, I40IW_DEBUG_VIRT, | ||
502 | "VF%u - i40iw_device_init_pestat failed\n", | ||
503 | vf_id); | ||
504 | vf_dev->dev_pestat.ops.iw_hw_stat_init(&vf_dev->dev_pestat, | 500 | vf_dev->dev_pestat.ops.iw_hw_stat_init(&vf_dev->dev_pestat, |
505 | (u8)vf_dev->pmf_index, | 501 | (u8)vf_dev->pmf_index, |
506 | dev->hw, false); | 502 | dev->hw, false); |