Skip to content

Commit

Permalink
IB/ipoib: Remove the unnecessary error check
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Zhu Yanjun authored and Doug Ledford committed Jan 24, 2017
1 parent 3f9fade commit 5c37077
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 13 deletions.
4 changes: 2 additions & 2 deletions drivers/infiniband/ulp/ipoib/ipoib.h
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ void ipoib_pkey_event(struct work_struct *work);
void ipoib_ib_dev_cleanup(struct net_device *dev);

int ipoib_ib_dev_open(struct net_device *dev);
int ipoib_ib_dev_up(struct net_device *dev);
void ipoib_ib_dev_up(struct net_device *dev);
void ipoib_ib_dev_down(struct net_device *dev);
void ipoib_ib_dev_stop(struct net_device *dev);
void ipoib_pkey_dev_check_presence(struct net_device *dev);
Expand All @@ -513,7 +513,7 @@ void ipoib_mcast_carrier_on_task(struct work_struct *work);
void ipoib_mcast_send(struct net_device *dev, u8 *daddr, struct sk_buff *skb);

void ipoib_mcast_restart_task(struct work_struct *work);
int ipoib_mcast_start_thread(struct net_device *dev);
void ipoib_mcast_start_thread(struct net_device *dev);
int ipoib_mcast_stop_thread(struct net_device *dev);

void ipoib_mcast_dev_down(struct net_device *dev);
Expand Down
6 changes: 3 additions & 3 deletions drivers/infiniband/ulp/ipoib/ipoib_ib.c
Original file line number Diff line number Diff line change
Expand Up @@ -755,20 +755,20 @@ 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);

ipoib_pkey_dev_check_presence(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)
Expand Down
6 changes: 1 addition & 5 deletions drivers/infiniband/ulp/ipoib/ipoib_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,7 @@ int ipoib_open(struct net_device *dev)
goto err_disable;
}

if (ipoib_ib_dev_up(dev))
goto err_stop;
ipoib_ib_dev_up(dev);

if (!test_bit(IPOIB_FLAG_SUBINTERFACE, &priv->flags)) {
struct ipoib_dev_priv *cpriv;
Expand All @@ -150,9 +149,6 @@ int ipoib_open(struct net_device *dev)

return 0;

err_stop:
ipoib_ib_dev_stop(dev);

err_disable:
clear_bit(IPOIB_FLAG_ADMIN_UP, &priv->flags);

Expand Down
4 changes: 1 addition & 3 deletions drivers/infiniband/ulp/ipoib/ipoib_multicast.c
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ void ipoib_mcast_join_task(struct work_struct *work)
spin_unlock_irq(&priv->lock);
}

int ipoib_mcast_start_thread(struct net_device *dev)
void ipoib_mcast_start_thread(struct net_device *dev)
{
struct ipoib_dev_priv *priv = netdev_priv(dev);
unsigned long flags;
Expand All @@ -686,8 +686,6 @@ int ipoib_mcast_start_thread(struct net_device *dev)
spin_lock_irqsave(&priv->lock, flags);
__ipoib_mcast_schedule_join_thread(priv, NULL, 0);
spin_unlock_irqrestore(&priv->lock, flags);

return 0;
}

int ipoib_mcast_stop_thread(struct net_device *dev)
Expand Down

0 comments on commit 5c37077

Please sign in to comment.