diff options
| author | Zhu Yanjun <yanjun.zhu@oracle.com> | 2017-01-18 23:16:06 -0500 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-01-24 16:22:24 -0500 |
| commit | 5c37077fd025c0fa3aa3ab2e6b607d653a4fc604 (patch) | |
| tree | 205ce7dff6915f6bd880b41289abba0228247a81 /drivers/infiniband/ulp/ipoib/ipoib_ib.c | |
| parent | 3f9fade5e77da67f618ac766ce1a6ded1679fb1a (diff) | |
| download | linux-5c37077fd025c0fa3aa3ab2e6b607d653a4fc604.tar.gz linux-5c37077fd025c0fa3aa3ab2e6b607d653a4fc604.tar.bz2 linux-5c37077fd025c0fa3aa3ab2e6b607d653a4fc604.zip | |
IB/ipoib: Remove the unnecessary error check
The function ipoib_mcast_start_thread/ipoib_ib_dev_up always return zero.
As such, in the function ipoib_open, err_stop will never be reached.
So remove this err_stop and change the return type of the function
ipoib_mcast_start_thread/ipoib_ib_dev_up to void.
Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/ulp/ipoib/ipoib_ib.c')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_ib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c index 6f443f725fca..12c4f84a6639 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c @@ -755,7 +755,7 @@ void ipoib_pkey_dev_check_presence(struct net_device *dev) set_bit(IPOIB_PKEY_ASSIGNED, &priv->flags); } -int ipoib_ib_dev_up(struct net_device *dev) +void ipoib_ib_dev_up(struct net_device *dev) { struct ipoib_dev_priv *priv = netdev_priv(dev); @@ -763,12 +763,12 @@ int ipoib_ib_dev_up(struct net_device *dev) if (!test_bit(IPOIB_PKEY_ASSIGNED, &priv->flags)) { ipoib_dbg(priv, "PKEY is not assigned.\n"); - return 0; + return; } set_bit(IPOIB_FLAG_OPER_UP, &priv->flags); - return ipoib_mcast_start_thread(dev); + ipoib_mcast_start_thread(dev); } void ipoib_ib_dev_down(struct net_device *dev) |