Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c37077f authored by Zhu Yanjun's avatar Zhu Yanjun Committed by Doug Ledford
Browse files

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: default avatarZhu Yanjun <yanjun.zhu@oracle.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 3f9fade5

drivers/infiniband/ulp/ipoib/ipoib.h

+2 −2
Original line number Diff line number Diff line
@@ -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);
@@ -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);

drivers/infiniband/ulp/ipoib/ipoib_ib.c

+3 −3
Original line number Diff line number Diff line
@@ -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)

drivers/infiniband/ulp/ipoib/ipoib_main.c

+1 −5
Original line number Diff line number Diff line
@@ -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;
@@ -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);

drivers/infiniband/ulp/ipoib/ipoib_multicast.c

+1 −3
Original line number Diff line number Diff line
@@ -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;
@@ -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)