Merge branches 'x86/early-printk', 'x86/microcode' and 'core/objtool' into x86/urgent...

[linux.git] / include / rdma / ib_cache.h

diff --git a/include/rdma/ib_cache.h b/include/rdma/ib_cache.h
index 3e11e7cc60b7457befa97bc8f589a23ad0ef1457..62e990b620aaf7c17f54f696c1390dbc60c4c8bd 100644 (file)
--- a/include/rdma/ib_cache.h
+++ b/include/rdma/ib_cache.h
@@ -133,28 +133,4 @@ const struct ib_gid_attr *rdma_get_gid_attr(struct ib_device *device,
 void rdma_put_gid_attr(const struct ib_gid_attr *attr);
 void rdma_hold_gid_attr(const struct ib_gid_attr *attr);
 
-/*
- * This is to be removed. It only exists to make merging rdma and smc simpler.
- */
-static inline __deprecated int ib_query_gid(struct ib_device *device,
-                                           u8 port_num, int index,
-                                           union ib_gid *gid,
-                                           struct ib_gid_attr *attr_out)
-{
-       const struct ib_gid_attr *attr;
-
-       memset(attr_out, 0, sizeof(*attr_out));
-       attr = rdma_get_gid_attr(device, port_num, index);
-       if (IS_ERR(attr))
-               return PTR_ERR(attr);
-
-       if (attr->ndev)
-               dev_hold(attr->ndev);
-       *attr_out = *attr;
-
-       rdma_put_gid_attr(attr);
-
-       return 0;
-}
-
 #endif /* _IB_CACHE_H */