Skip to content

Commit 52aa0b1

Browse files
Zheng Yongjundavem330
authored andcommitted
net: vxge: Declare the function vxge_reset_all_vpaths as void
variable 'status' is unneeded and it's noneed to check the return value of function vxge_reset_all_vpaths,so declare it as void. Signed-off-by: Zheng Yongjun <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 163d01c commit 52aa0b1

File tree

1 file changed

+6
-21
lines changed

1 file changed

+6
-21
lines changed

drivers/net/ethernet/neterion/vxge/vxge-main.c

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ static unsigned int bw_percentage[VXGE_HW_MAX_VIRTUAL_PATHS] =
8787
module_param_array(bw_percentage, uint, NULL, 0);
8888

8989
static struct vxge_drv_config *driver_config;
90-
static enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev);
90+
static void vxge_reset_all_vpaths(struct vxgedev *vdev);
9191

9292
static inline int is_vxge_card_up(struct vxgedev *vdev)
9393
{
@@ -1606,7 +1606,6 @@ static void vxge_config_ci_for_tti_rti(struct vxgedev *vdev)
16061606

16071607
static int do_vxge_reset(struct vxgedev *vdev, int event)
16081608
{
1609-
enum vxge_hw_status status;
16101609
int ret = 0, vp_id, i;
16111610

16121611
vxge_debug_entryexit(VXGE_TRACE, "%s:%d", __func__, __LINE__);
@@ -1709,14 +1708,7 @@ static int do_vxge_reset(struct vxgedev *vdev, int event)
17091708
netif_tx_stop_all_queues(vdev->ndev);
17101709

17111710
if (event == VXGE_LL_FULL_RESET) {
1712-
status = vxge_reset_all_vpaths(vdev);
1713-
if (status != VXGE_HW_OK) {
1714-
vxge_debug_init(VXGE_ERR,
1715-
"fatal: %s: can not reset vpaths",
1716-
vdev->ndev->name);
1717-
ret = -EPERM;
1718-
goto out;
1719-
}
1711+
vxge_reset_all_vpaths(vdev);
17201712
}
17211713

17221714
if (event == VXGE_LL_COMPL_RESET) {
@@ -1969,9 +1961,8 @@ static enum vxge_hw_status vxge_rth_configure(struct vxgedev *vdev)
19691961
}
19701962

19711963
/* reset vpaths */
1972-
static enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev)
1964+
static void vxge_reset_all_vpaths(struct vxgedev *vdev)
19731965
{
1974-
enum vxge_hw_status status = VXGE_HW_OK;
19751966
struct vxge_vpath *vpath;
19761967
int i;
19771968

@@ -1986,18 +1977,16 @@ static enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev)
19861977
"vxge_hw_vpath_recover_"
19871978
"from_reset failed for vpath: "
19881979
"%d", i);
1989-
return status;
1980+
return;
19901981
}
19911982
} else {
19921983
vxge_debug_init(VXGE_ERR,
19931984
"vxge_hw_vpath_reset failed for "
19941985
"vpath:%d", i);
1995-
return status;
1986+
return;
19961987
}
19971988
}
19981989
}
1999-
2000-
return status;
20011990
}
20021991

20031992
/* close vpaths */
@@ -2676,11 +2665,7 @@ static int vxge_set_features(struct net_device *dev, netdev_features_t features)
26762665
/* !netif_running() ensured by vxge_fix_features() */
26772666

26782667
vdev->devh->config.rth_en = !!(features & NETIF_F_RXHASH);
2679-
if (vxge_reset_all_vpaths(vdev) != VXGE_HW_OK) {
2680-
dev->features = features ^ NETIF_F_RXHASH;
2681-
vdev->devh->config.rth_en = !!(dev->features & NETIF_F_RXHASH);
2682-
return -EIO;
2683-
}
2668+
vxge_reset_all_vpaths(vdev);
26842669

26852670
return 0;
26862671
}

0 commit comments

Comments
 (0)