RDMA/rtrs-srv: Kill __rtrs_srv_change_state
authorGuoqing Jiang <guoqing.jiang@cloud.ionos.com>
Fri, 28 May 2021 11:30:08 +0000 (13:30 +0200)
committerJason Gunthorpe <jgg@nvidia.com>
Fri, 28 May 2021 23:52:58 +0000 (20:52 -0300)
No need since the only user is rtrs_srv_change_state.

Link: https://lore.kernel.org/r/20210528113018.52290-11-jinpu.wang@ionos.com
Signed-off-by: Guoqing Jiang <guoqing.jiang@ionos.com>
Reviewed-by: Md Haris Iqbal <haris.iqbal@ionos.com>
Signed-off-by: Gioh Kim <gi-oh.kim@ionos.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
drivers/infiniband/ulp/rtrs/rtrs-srv.c

index 2ba6658..840a342 100644 (file)
@@ -67,13 +67,13 @@ static inline struct rtrs_srv_sess *to_srv_sess(struct rtrs_sess *s)
        return container_of(s, struct rtrs_srv_sess, s);
 }
 
-static bool __rtrs_srv_change_state(struct rtrs_srv_sess *sess,
-                                    enum rtrs_srv_state new_state)
+static bool rtrs_srv_change_state(struct rtrs_srv_sess *sess,
+                                 enum rtrs_srv_state new_state)
 {
        enum rtrs_srv_state old_state;
        bool changed = false;
 
-       lockdep_assert_held(&sess->state_lock);
+       spin_lock_irq(&sess->state_lock);
        old_state = sess->state;
        switch (new_state) {
        case RTRS_SRV_CONNECTED:
@@ -94,17 +94,6 @@ static bool __rtrs_srv_change_state(struct rtrs_srv_sess *sess,
        }
        if (changed)
                sess->state = new_state;
-
-       return changed;
-}
-
-static bool rtrs_srv_change_state(struct rtrs_srv_sess *sess,
-                                  enum rtrs_srv_state new_state)
-{
-       bool changed;
-
-       spin_lock_irq(&sess->state_lock);
-       changed = __rtrs_srv_change_state(sess, new_state);
        spin_unlock_irq(&sess->state_lock);
 
        return changed;