Merge tag 'for-linus-unmerged' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma...
[muen/linux.git] / drivers / infiniband / hw / qedr / main.c
index f9a645c..f4cb60b 100644 (file)
@@ -162,10 +162,6 @@ static int qedr_iw_register_device(struct qedr_dev *dev)
 static void qedr_roce_register_device(struct qedr_dev *dev)
 {
        dev->ibdev.node_type = RDMA_NODE_IB_CA;
-       dev->ibdev.query_gid = qedr_query_gid;
-
-       dev->ibdev.add_gid = qedr_add_gid;
-       dev->ibdev.del_gid = qedr_del_gid;
 
        dev->ibdev.get_port_immutable = qedr_roce_port_immutable;
 }
@@ -257,6 +253,7 @@ static int qedr_register_device(struct qedr_dev *dev)
        dev->ibdev.get_link_layer = qedr_link_layer;
        dev->ibdev.get_dev_fw_str = qedr_get_dev_fw_str;
 
+       dev->ibdev.driver_id = RDMA_DRIVER_QEDR;
        return ib_register_device(&dev->ibdev, NULL);
 }
 
@@ -707,7 +704,7 @@ static void qedr_affiliated_event(void *context, u8 e_code, void *fw_handle)
                             "Error: CQ event with NULL pointer ibcq. Handle=%llx\n",
                             roce_handle64);
                }
-               DP_ERR(dev, "CQ event %d on hanlde %p\n", e_code, cq);
+               DP_ERR(dev, "CQ event %d on handle %p\n", e_code, cq);
                break;
        case EVENT_TYPE_QP:
                qp = (struct qedr_qp *)(uintptr_t)roce_handle64;
@@ -723,7 +720,7 @@ static void qedr_affiliated_event(void *context, u8 e_code, void *fw_handle)
                             "Error: QP event with NULL pointer ibqp. Handle=%llx\n",
                             roce_handle64);
                }
-               DP_ERR(dev, "QP event %d on hanlde %p\n", e_code, qp);
+               DP_ERR(dev, "QP event %d on handle %p\n", e_code, qp);
                break;
        default:
                break;