diff options
author | Peter Senna Tschudin <peter.senna@gmail.com> | 2014-05-31 09:14:10 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-06-02 19:58:13 -0400 |
commit | f6d9b514de2edfd9b72b65024343891f5b2cbd78 (patch) | |
tree | 2167996fdec57f1164e9d146b46d960103af8383 /drivers/net/ethernet/neterion | |
parent | b2bda2f7450fa7ed4ae826c61d3a4b302024a297 (diff) |
vxge: Remove useless return variables
This patch remove variables that are initialized with a constant,
are never updated, and are only used as parameter of return.
Return the constant instead of using a variable.
Verified by compilation only.
The coccinelle script that find and fixes this issue is:
// <smpl>
@@
type T;
constant C;
identifier ret;
@@
- T ret = C;
... when != ret
when strict
return
- ret
+ C
;
// </smpl>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/neterion')
-rw-r--r-- | drivers/net/ethernet/neterion/vxge/vxge-config.c | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c index 089b713b9f7b..2bbd01fcb9b0 100644 --- a/drivers/net/ethernet/neterion/vxge/vxge-config.c +++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c | |||
@@ -120,7 +120,6 @@ __vxge_hw_device_register_poll(void __iomem *reg, u64 mask, u32 max_millis) | |||
120 | { | 120 | { |
121 | u64 val64; | 121 | u64 val64; |
122 | u32 i = 0; | 122 | u32 i = 0; |
123 | enum vxge_hw_status ret = VXGE_HW_FAIL; | ||
124 | 123 | ||
125 | udelay(10); | 124 | udelay(10); |
126 | 125 | ||
@@ -139,7 +138,7 @@ __vxge_hw_device_register_poll(void __iomem *reg, u64 mask, u32 max_millis) | |||
139 | mdelay(1); | 138 | mdelay(1); |
140 | } while (++i <= max_millis); | 139 | } while (++i <= max_millis); |
141 | 140 | ||
142 | return ret; | 141 | return VXGE_HW_FAIL; |
143 | } | 142 | } |
144 | 143 | ||
145 | static inline enum vxge_hw_status | 144 | static inline enum vxge_hw_status |
@@ -1682,12 +1681,10 @@ enum vxge_hw_status vxge_hw_driver_stats_get( | |||
1682 | struct __vxge_hw_device *hldev, | 1681 | struct __vxge_hw_device *hldev, |
1683 | struct vxge_hw_device_stats_sw_info *sw_stats) | 1682 | struct vxge_hw_device_stats_sw_info *sw_stats) |
1684 | { | 1683 | { |
1685 | enum vxge_hw_status status = VXGE_HW_OK; | ||
1686 | |||
1687 | memcpy(sw_stats, &hldev->stats.sw_dev_info_stats, | 1684 | memcpy(sw_stats, &hldev->stats.sw_dev_info_stats, |
1688 | sizeof(struct vxge_hw_device_stats_sw_info)); | 1685 | sizeof(struct vxge_hw_device_stats_sw_info)); |
1689 | 1686 | ||
1690 | return status; | 1687 | return VXGE_HW_OK; |
1691 | } | 1688 | } |
1692 | 1689 | ||
1693 | /* | 1690 | /* |
@@ -3228,7 +3225,6 @@ enum vxge_hw_status | |||
3228 | vxge_hw_vpath_strip_fcs_check(struct __vxge_hw_device *hldev, u64 vpath_mask) | 3225 | vxge_hw_vpath_strip_fcs_check(struct __vxge_hw_device *hldev, u64 vpath_mask) |
3229 | { | 3226 | { |
3230 | struct vxge_hw_vpmgmt_reg __iomem *vpmgmt_reg; | 3227 | struct vxge_hw_vpmgmt_reg __iomem *vpmgmt_reg; |
3231 | enum vxge_hw_status status = VXGE_HW_OK; | ||
3232 | int i = 0, j = 0; | 3228 | int i = 0, j = 0; |
3233 | 3229 | ||
3234 | for (i = 0; i < VXGE_HW_MAX_VIRTUAL_PATHS; i++) { | 3230 | for (i = 0; i < VXGE_HW_MAX_VIRTUAL_PATHS; i++) { |
@@ -3241,7 +3237,7 @@ vxge_hw_vpath_strip_fcs_check(struct __vxge_hw_device *hldev, u64 vpath_mask) | |||
3241 | return VXGE_HW_FAIL; | 3237 | return VXGE_HW_FAIL; |
3242 | } | 3238 | } |
3243 | } | 3239 | } |
3244 | return status; | 3240 | return VXGE_HW_OK; |
3245 | } | 3241 | } |
3246 | /* | 3242 | /* |
3247 | * vxge_hw_mgmt_reg_Write - Write Titan register. | 3243 | * vxge_hw_mgmt_reg_Write - Write Titan register. |
@@ -3979,7 +3975,6 @@ __vxge_hw_vpath_mgmt_read( | |||
3979 | { | 3975 | { |
3980 | u32 i, mtu = 0, max_pyld = 0; | 3976 | u32 i, mtu = 0, max_pyld = 0; |
3981 | u64 val64; | 3977 | u64 val64; |
3982 | enum vxge_hw_status status = VXGE_HW_OK; | ||
3983 | 3978 | ||
3984 | for (i = 0; i < VXGE_HW_MAC_MAX_MAC_PORT_ID; i++) { | 3979 | for (i = 0; i < VXGE_HW_MAC_MAX_MAC_PORT_ID; i++) { |
3985 | 3980 | ||
@@ -4009,7 +4004,7 @@ __vxge_hw_vpath_mgmt_read( | |||
4009 | else | 4004 | else |
4010 | VXGE_HW_DEVICE_LINK_STATE_SET(vpath->hldev, VXGE_HW_LINK_DOWN); | 4005 | VXGE_HW_DEVICE_LINK_STATE_SET(vpath->hldev, VXGE_HW_LINK_DOWN); |
4011 | 4006 | ||
4012 | return status; | 4007 | return VXGE_HW_OK; |
4013 | } | 4008 | } |
4014 | 4009 | ||
4015 | /* | 4010 | /* |
@@ -4039,14 +4034,13 @@ static enum vxge_hw_status | |||
4039 | __vxge_hw_vpath_reset(struct __vxge_hw_device *hldev, u32 vp_id) | 4034 | __vxge_hw_vpath_reset(struct __vxge_hw_device *hldev, u32 vp_id) |
4040 | { | 4035 | { |
4041 | u64 val64; | 4036 | u64 val64; |
4042 | enum vxge_hw_status status = VXGE_HW_OK; | ||
4043 | 4037 | ||
4044 | val64 = VXGE_HW_CMN_RSTHDLR_CFG0_SW_RESET_VPATH(1 << (16 - vp_id)); | 4038 | val64 = VXGE_HW_CMN_RSTHDLR_CFG0_SW_RESET_VPATH(1 << (16 - vp_id)); |
4045 | 4039 | ||
4046 | __vxge_hw_pio_mem_write32_upper((u32)vxge_bVALn(val64, 0, 32), | 4040 | __vxge_hw_pio_mem_write32_upper((u32)vxge_bVALn(val64, 0, 32), |
4047 | &hldev->common_reg->cmn_rsthdlr_cfg0); | 4041 | &hldev->common_reg->cmn_rsthdlr_cfg0); |
4048 | 4042 | ||
4049 | return status; | 4043 | return VXGE_HW_OK; |
4050 | } | 4044 | } |
4051 | 4045 | ||
4052 | /* | 4046 | /* |
@@ -4227,7 +4221,6 @@ static enum vxge_hw_status | |||
4227 | __vxge_hw_vpath_mac_configure(struct __vxge_hw_device *hldev, u32 vp_id) | 4221 | __vxge_hw_vpath_mac_configure(struct __vxge_hw_device *hldev, u32 vp_id) |
4228 | { | 4222 | { |
4229 | u64 val64; | 4223 | u64 val64; |
4230 | enum vxge_hw_status status = VXGE_HW_OK; | ||
4231 | struct __vxge_hw_virtualpath *vpath; | 4224 | struct __vxge_hw_virtualpath *vpath; |
4232 | struct vxge_hw_vp_config *vp_config; | 4225 | struct vxge_hw_vp_config *vp_config; |
4233 | struct vxge_hw_vpath_reg __iomem *vp_reg; | 4226 | struct vxge_hw_vpath_reg __iomem *vp_reg; |
@@ -4283,7 +4276,7 @@ __vxge_hw_vpath_mac_configure(struct __vxge_hw_device *hldev, u32 vp_id) | |||
4283 | 4276 | ||
4284 | writeq(val64, &vp_reg->rxmac_vcfg1); | 4277 | writeq(val64, &vp_reg->rxmac_vcfg1); |
4285 | } | 4278 | } |
4286 | return status; | 4279 | return VXGE_HW_OK; |
4287 | } | 4280 | } |
4288 | 4281 | ||
4289 | /* | 4282 | /* |
@@ -4295,7 +4288,6 @@ static enum vxge_hw_status | |||
4295 | __vxge_hw_vpath_tim_configure(struct __vxge_hw_device *hldev, u32 vp_id) | 4288 | __vxge_hw_vpath_tim_configure(struct __vxge_hw_device *hldev, u32 vp_id) |
4296 | { | 4289 | { |
4297 | u64 val64; | 4290 | u64 val64; |
4298 | enum vxge_hw_status status = VXGE_HW_OK; | ||
4299 | struct __vxge_hw_virtualpath *vpath; | 4291 | struct __vxge_hw_virtualpath *vpath; |
4300 | struct vxge_hw_vpath_reg __iomem *vp_reg; | 4292 | struct vxge_hw_vpath_reg __iomem *vp_reg; |
4301 | struct vxge_hw_vp_config *config; | 4293 | struct vxge_hw_vp_config *config; |
@@ -4545,7 +4537,7 @@ __vxge_hw_vpath_tim_configure(struct __vxge_hw_device *hldev, u32 vp_id) | |||
4545 | val64 |= VXGE_HW_TIM_WRKLD_CLC_CNT_RX_TX(3); | 4537 | val64 |= VXGE_HW_TIM_WRKLD_CLC_CNT_RX_TX(3); |
4546 | writeq(val64, &vp_reg->tim_wrkld_clc); | 4538 | writeq(val64, &vp_reg->tim_wrkld_clc); |
4547 | 4539 | ||
4548 | return status; | 4540 | return VXGE_HW_OK; |
4549 | } | 4541 | } |
4550 | 4542 | ||
4551 | /* | 4543 | /* |