IB/ocrdma: Removed GID add/del null routines

add_gid() and del_gid() are optional callback routines.
ib_core ignores invoking them while updating GID table entries if
they are not implemented by provider drivers. Therefore remove them.

Reviewed-by: Daniel Jurgens <danielj@mellanox.com>
Reviewed-by: Mark Bloch <markb@mellanox.com>
Signed-off-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
index fbfbd9e961471ab4652b7884b7125f7b89dee3e0..42dc0de54cb837a22ddd1d9f4cf58155587a583f 100644 (file)
--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
@@ -160,8 +160,6 @@ static int ocrdma_register_device(struct ocrdma_dev *dev)
        dev->ibdev.modify_port = ocrdma_modify_port;
        dev->ibdev.query_gid = ocrdma_query_gid;
        dev->ibdev.get_netdev = ocrdma_get_netdev;
-       dev->ibdev.add_gid = ocrdma_add_gid;
-       dev->ibdev.del_gid = ocrdma_del_gid;
        dev->ibdev.get_link_layer = ocrdma_link_layer;
        dev->ibdev.alloc_pd = ocrdma_alloc_pd;
        dev->ibdev.dealloc_pd = ocrdma_dealloc_pd;

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 8009bdad4e5bad85f25cee76f16ae037472c20dc..1e3dc92bc37bea403341feb4946aac56384ed713 100644 (file)
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -80,22 +80,6 @@ int ocrdma_query_gid(struct ib_device *ibdev, u8 port,
        return ret;
 }
 
-int ocrdma_add_gid(struct ib_device *device,
-                  u8 port_num,
-                  unsigned int index,
-                  const union ib_gid *gid,
-                  const struct ib_gid_attr *attr,
-                  void **context) {
-       return  0;
-}
-
-int  ocrdma_del_gid(struct ib_device *device,
-                   u8 port_num,
-                   unsigned int index,
-                   void **context) {
-       return 0;
-}
-
 int ocrdma_query_device(struct ib_device *ibdev, struct ib_device_attr *attr,
                        struct ib_udata *uhw)
 {

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h
index 704ef1e9271b74b62ec14e5cf7178014fed8df72..a48eab35861feeb407500f44ed7d215986b0d016 100644 (file)
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h
@@ -64,16 +64,6 @@ void ocrdma_get_guid(struct ocrdma_dev *, u8 *guid);
 int ocrdma_query_gid(struct ib_device *, u8 port,
                     int index, union ib_gid *gid);
 struct net_device *ocrdma_get_netdev(struct ib_device *device, u8 port_num);
-int ocrdma_add_gid(struct ib_device *device,
-                  u8 port_num,
-                  unsigned int index,
-                  const union ib_gid *gid,
-                  const struct ib_gid_attr *attr,
-                  void **context);
-int  ocrdma_del_gid(struct ib_device *device,
-                   u8 port_num,
-                   unsigned int index,
-                   void **context);
 int ocrdma_query_pkey(struct ib_device *, u8 port, u16 index, u16 *pkey);
 
 struct ib_ucontext *ocrdma_alloc_ucontext(struct ib_device *,