| From 95a5631f6c9f3045f26245e6045244652204dfdb Mon Sep 17 00:00:00 2001 |
| From: Kamal Heib <kamalheib1@gmail.com> |
| Date: Tue, 23 Jun 2020 13:52:36 +0300 |
| Subject: [PATCH] RDMA/ipoib: Return void from ipoib_ib_dev_stop() |
| |
| commit 95a5631f6c9f3045f26245e6045244652204dfdb upstream. |
| |
| The return value from ipoib_ib_dev_stop() is always 0 - change it to be |
| void. |
| |
| Link: https://lore.kernel.org/r/20200623105236.18683-1-kamalheib1@gmail.com |
| Signed-off-by: Kamal Heib <kamalheib1@gmail.com> |
| Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> |
| |
| diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h |
| index 15f519ce7e0b..3440dc48d02c 100644 |
| --- a/drivers/infiniband/ulp/ipoib/ipoib.h |
| +++ b/drivers/infiniband/ulp/ipoib/ipoib.h |
| @@ -515,7 +515,7 @@ void ipoib_ib_dev_cleanup(struct net_device *dev); |
| |
| int ipoib_ib_dev_open_default(struct net_device *dev); |
| int ipoib_ib_dev_open(struct net_device *dev); |
| -int ipoib_ib_dev_stop(struct net_device *dev); |
| +void ipoib_ib_dev_stop(struct net_device *dev); |
| void ipoib_ib_dev_up(struct net_device *dev); |
| void ipoib_ib_dev_down(struct net_device *dev); |
| int ipoib_ib_dev_stop_default(struct net_device *dev); |
| diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c |
| index da3c5315bbb5..6ee64c25aaff 100644 |
| --- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c |
| +++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c |
| @@ -846,7 +846,7 @@ timeout: |
| return 0; |
| } |
| |
| -int ipoib_ib_dev_stop(struct net_device *dev) |
| +void ipoib_ib_dev_stop(struct net_device *dev) |
| { |
| struct ipoib_dev_priv *priv = ipoib_priv(dev); |
| |
| @@ -854,8 +854,6 @@ int ipoib_ib_dev_stop(struct net_device *dev) |
| |
| clear_bit(IPOIB_FLAG_INITIALIZED, &priv->flags); |
| ipoib_flush_ah(dev); |
| - |
| - return 0; |
| } |
| |
| int ipoib_ib_dev_open_default(struct net_device *dev) |
| -- |
| 2.27.0 |
| |
