RDMA/core: Remove unused ib cache functions

Now that all users have been converted to use the version of these APIs
that returns a gid_attr pointer we can delete the old entry points.

Signed-off-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>

diff --git a/drivers/infiniband/core/cache.c b/drivers/infiniband/core/cache.c
index dada33c5318864381b268ea93829a10d4def76e4..357a5cb328c72f4a4be0514a75bb84e146cb0a6e 100644 (file)
--- a/drivers/infiniband/core/cache.c
+++ b/drivers/infiniband/core/cache.c
@@ -643,30 +643,6 @@ int ib_cache_gid_del_all_netdev_gids(struct ib_device *ib_dev, u8 port,
        return 0;
 }
 
-static int __ib_cache_gid_get(struct ib_device *ib_dev, u8 port, int index,
-                             union ib_gid *gid, struct ib_gid_attr *attr)
-{
-       struct ib_gid_table *table;
-
-       table = rdma_gid_table(ib_dev, port);
-
-       if (index < 0 || index >= table->sz)
-               return -EINVAL;
-
-       if (!is_gid_entry_valid(table->data_vec[index]))
-               return -EINVAL;
-
-       memcpy(gid, &table->data_vec[index]->attr.gid, sizeof(*gid));
-       if (attr) {
-               memcpy(attr, &table->data_vec[index]->attr,
-                      sizeof(*attr));
-               if (attr->ndev)
-                       dev_hold(attr->ndev);
-       }
-
-       return 0;
-}
-
 /**
  * rdma_find_gid_by_port - Returns the GID entry attributes when it finds
  * a valid GID entry for given search parameters. It searches for the specified
@@ -973,28 +949,6 @@ static int gid_table_setup_one(struct ib_device *ib_dev)
        return err;
 }
 
-int ib_get_cached_gid(struct ib_device *device,
-                     u8                port_num,
-                     int               index,
-                     union ib_gid     *gid,
-                     struct ib_gid_attr *gid_attr)
-{
-       int res;
-       unsigned long flags;
-       struct ib_gid_table *table;
-
-       if (!rdma_is_port_valid(device, port_num))
-               return -EINVAL;
-
-       table = rdma_gid_table(device, port_num);
-       read_lock_irqsave(&table->rwlock, flags);
-       res = __ib_cache_gid_get(device, port_num, index, gid, gid_attr);
-       read_unlock_irqrestore(&table->rwlock, flags);
-
-       return res;
-}
-EXPORT_SYMBOL(ib_get_cached_gid);
-
 /**
  * rdma_query_gid - Read the GID content from the GID software cache
  * @device:            Device to query the GID
@@ -1102,28 +1056,6 @@ int ib_find_cached_gid(struct ib_device *device, const union ib_gid *gid,
 }
 EXPORT_SYMBOL(ib_find_cached_gid);
 
-int ib_find_gid_by_filter(struct ib_device *device,
-                         const union ib_gid *gid,
-                         u8 port_num,
-                         bool (*filter)(const union ib_gid *gid,
-                                        const struct ib_gid_attr *,
-                                        void *),
-                         void *context, u16 *index)
-{
-       const struct ib_gid_attr *res;
-
-       res = rdma_find_gid_by_filter(device, gid, port_num, filter,
-                                     context);
-       if (IS_ERR(res))
-               return PTR_ERR(res);
-
-       if (index)
-               *index = res->index;
-
-       rdma_put_gid_attr(res);
-       return 0;
-}
-
 int ib_get_cached_pkey(struct ib_device *device,
                       u8                port_num,
                       int               index,

diff --git a/include/rdma/ib_cache.h b/include/rdma/ib_cache.h
index 059f7d894939669085256812c6f7720e0e5045d2..1108d4220276967a7476d6c54797447aaf152933 100644 (file)
--- a/include/rdma/ib_cache.h
+++ b/include/rdma/ib_cache.h
@@ -37,56 +37,17 @@
 
 #include <rdma/ib_verbs.h>
 
-/**
- * ib_get_cached_gid - Returns a cached GID table entry
- * @device: The device to query.
- * @port_num: The port number of the device to query.
- * @index: The index into the cached GID table to query.
- * @gid: The GID value found at the specified index.
- * @attr: The GID attribute found at the specified index (only in RoCE).
- *   NULL means ignore (output parameter).
- *
- * ib_get_cached_gid() fetches the specified GID table entry stored in
- * the local software cache.
- */
-int ib_get_cached_gid(struct ib_device    *device,
-                     u8                   port_num,
-                     int                  index,
-                     union ib_gid        *gid,
-                     struct ib_gid_attr  *attr);
 int rdma_query_gid(struct ib_device *device, u8 port_num, int index,
                   union ib_gid *gid);
-
-int ib_find_cached_gid(struct ib_device *device,
-                      const union ib_gid *gid,
-                      enum ib_gid_type gid_type,
-                      struct net_device *ndev,
-                      u8               *port_num,
-                      u16              *index);
 const struct ib_gid_attr *rdma_find_gid(struct ib_device *device,
                                        const union ib_gid *gid,
                                        enum ib_gid_type gid_type,
                                        struct net_device *ndev);
-
-int ib_find_cached_gid_by_port(struct ib_device *device,
-                              const union ib_gid *gid,
-                              enum ib_gid_type gid_type,
-                              u8               port_num,
-                              struct net_device *ndev,
-                              u16              *index);
 const struct ib_gid_attr *rdma_find_gid_by_port(struct ib_device *ib_dev,
                                                const union ib_gid *gid,
                                                enum ib_gid_type gid_type,
                                                u8 port,
                                                struct net_device *ndev);
-
-int ib_find_gid_by_filter(struct ib_device *device,
-                         const union ib_gid *gid,
-                         u8 port_num,
-                         bool (*filter)(const union ib_gid *gid,
-                                        const struct ib_gid_attr *,
-                                        void *),
-                         void *context, u16 *index);
 const struct ib_gid_attr *rdma_find_gid_by_filter(
        struct ib_device *device, const union ib_gid *gid, u8 port_num,
        bool (*filter)(const union ib_gid *gid, const struct ib_gid_attr *,