Skip to content

Commit dfc0e55

Browse files
Zhu Yanjundledford
authored andcommitted
IB/ipoib: function interface change
The ipoib_ib_dev_down/ipoib_ib_dev_stop return zero unconditionally and the callers never check the returned values, change the return type to void and remove the redundant return values. Reviewed-by: Shan Hai <[email protected]> Signed-off-by: Zhu Yanjun <[email protected]> Reviewed-by: Yuval Shaia <[email protected]> Reviewed-by: Leon Romanovsky <[email protected]> Signed-off-by: Doug Ledford <[email protected]>
1 parent 820cd30 commit dfc0e55

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

drivers/infiniband/ulp/ipoib/ipoib.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -501,8 +501,8 @@ void ipoib_ib_dev_cleanup(struct net_device *dev);
501501

502502
int ipoib_ib_dev_open(struct net_device *dev);
503503
int ipoib_ib_dev_up(struct net_device *dev);
504-
int ipoib_ib_dev_down(struct net_device *dev);
505-
int ipoib_ib_dev_stop(struct net_device *dev);
504+
void ipoib_ib_dev_down(struct net_device *dev);
505+
void ipoib_ib_dev_stop(struct net_device *dev);
506506
void ipoib_pkey_dev_check_presence(struct net_device *dev);
507507

508508
int ipoib_dev_init(struct net_device *dev, struct ib_device *ca, int port);

drivers/infiniband/ulp/ipoib/ipoib_ib.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ int ipoib_ib_dev_up(struct net_device *dev)
771771
return ipoib_mcast_start_thread(dev);
772772
}
773773

774-
int ipoib_ib_dev_down(struct net_device *dev)
774+
void ipoib_ib_dev_down(struct net_device *dev)
775775
{
776776
struct ipoib_dev_priv *priv = netdev_priv(dev);
777777

@@ -784,8 +784,6 @@ int ipoib_ib_dev_down(struct net_device *dev)
784784
ipoib_mcast_dev_flush(dev);
785785

786786
ipoib_flush_paths(dev);
787-
788-
return 0;
789787
}
790788

791789
static int recvs_pending(struct net_device *dev)
@@ -840,7 +838,7 @@ void ipoib_drain_cq(struct net_device *dev)
840838
local_bh_enable();
841839
}
842840

843-
int ipoib_ib_dev_stop(struct net_device *dev)
841+
void ipoib_ib_dev_stop(struct net_device *dev)
844842
{
845843
struct ipoib_dev_priv *priv = netdev_priv(dev);
846844
struct ib_qp_attr qp_attr;
@@ -913,8 +911,6 @@ int ipoib_ib_dev_stop(struct net_device *dev)
913911
ipoib_flush_ah(dev);
914912

915913
ib_req_notify_cq(priv->recv_cq, IB_CQ_NEXT_COMP);
916-
917-
return 0;
918914
}
919915

920916
int ipoib_ib_dev_init(struct net_device *dev, struct ib_device *ca, int port)

0 commit comments

Comments
 (0)