From: Knut Omang Date: Tue, 14 Jun 2016 11:28:28 +0000 (+0200) Subject: sif: Remove ib_query_mr - it has been removed upstream X-Git-Tag: v4.1.12-92~129^2~14 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7f4bf87626b7e8614a558fb46b09dae63829b5a9;p=users%2Fjedix%2Flinux-maple.git sif: Remove ib_query_mr - it has been removed upstream Signed-off-by: Knut Omang --- diff --git a/drivers/infiniband/hw/sif/sif_ireg.c b/drivers/infiniband/hw/sif/sif_ireg.c index 4ab3476ccb80..b5cd96608ba5 100644 --- a/drivers/infiniband/hw/sif/sif_ireg.c +++ b/drivers/infiniband/hw/sif/sif_ireg.c @@ -767,7 +767,6 @@ int sif_register_ib_device(struct sif_dev *sdev) (1ull << IB_USER_VERBS_CMD_REG_MR) | (1ull << IB_USER_VERBS_CMD_REG_SMR) | (1ull << IB_USER_VERBS_CMD_REREG_MR) | - (1ull << IB_USER_VERBS_CMD_QUERY_MR) | (1ull << IB_USER_VERBS_CMD_DEREG_MR) | (1ull << IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL) | (1ull << IB_USER_VERBS_CMD_CREATE_CQ) | @@ -846,7 +845,6 @@ int sif_register_ib_device(struct sif_dev *sdev) dev->rereg_phys_mr = sif_rereg_phys_mr; dev->reg_user_mr = sif_reg_user_mr; dev->dereg_mr = sif_dereg_mr; - dev->query_mr = sif_query_mr; dev->alloc_fmr = sif_alloc_fmr; dev->map_phys_fmr = sif_map_phys_fmr; diff --git a/drivers/infiniband/hw/sif/sif_mr.c b/drivers/infiniband/hw/sif/sif_mr.c index 95c604bee720..74ff0850a846 100644 --- a/drivers/infiniband/hw/sif/sif_mr.c +++ b/drivers/infiniband/hw/sif/sif_mr.c @@ -313,13 +313,6 @@ err_reg_mr: return ERR_PTR(ret); } -int sif_query_mr(struct ib_mr *ibmr, struct ib_mr_attr *mr_attr) -{ - sif_logi(ibmr->device, SIF_MR, "Not implemented"); - return -EOPNOTSUPP; -} - - /* If the MMU is involved (not pass-through mode) * PSIF MR deregistration is asyncronous and five-step (see #2002): * 1) Invalidate associated dma validation entry but first diff --git a/drivers/infiniband/hw/sif/sif_mr.h b/drivers/infiniband/hw/sif/sif_mr.h index 959f8b407887..64eeb392463d 100644 --- a/drivers/infiniband/hw/sif/sif_mr.h +++ b/drivers/infiniband/hw/sif/sif_mr.h @@ -41,7 +41,6 @@ struct ib_mr *sif_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 length, u64 virt_addr, int mr_access_flags, struct ib_udata *udata); -int sif_query_mr(struct ib_mr *ibmr, struct ib_mr_attr *mr_attr); int sif_dereg_mr(struct ib_mr *ibmr); struct ib_mr *sif_alloc_fast_reg_mr(struct ib_pd *ibpd, int max_page_list_len);