3 files changed, 0 insertions, 13 deletions

diff --git a/drivers/infiniband/hw/mthca/mthca_cq.c b/drivers/infiniband/hw/mthca/mthca_cq.c
index 16a851b341f..78d9cc119f3 100644
--- a/drivers/infiniband/hw/mthca/mthca_cq.c
+++ b/drivers/infiniband/hw/mthca/mthca_cq.c
@@ -696,8 +696,6 @@ int mthca_init_cq(struct mthca_dev *dev, int nent,
         u8 status;
         int i;
 
-        might_sleep();
-
         cq->ibcq.cqe  = nent - 1;
         cq->is_kernel = !ctx;
 
@@ -827,8 +825,6 @@ void mthca_free_cq(struct mthca_dev *dev,
         int err;
         u8 status;
 
-        might_sleep();
-
         mailbox = mthca_alloc_mailbox(dev, GFP_KERNEL);
         if (IS_ERR(mailbox)) {
                 mthca_warn(dev, "No memory for mailbox to free CQ.\n");
diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
index e995e2aa016..551320fdc9c 100644
--- a/drivers/infiniband/hw/mthca/mthca_mr.c
+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
@@ -340,8 +340,6 @@ int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
         int err;
         u8 status;
 
-        might_sleep();
-
         WARN_ON(buffer_size_shift >= 32);
 
         key = mthca_alloc(&dev->mr_table.mpt_alloc);
@@ -467,8 +465,6 @@ void mthca_free_mr(struct mthca_dev *dev, struct mthca_mr *mr)
         int err;
         u8 status;
 
-        might_sleep();
-
         err = mthca_HW2SW_MPT(dev, NULL,
                               key_to_hw_index(dev, mr->ibmr.lkey) &
                               (dev->limits.num_mpts - 1),
@@ -495,8 +491,6 @@ int mthca_fmr_alloc(struct mthca_dev *dev, u32 pd,
         int err = -ENOMEM;
         int i;
 
-        might_sleep();
-
         if (mr->attr.page_size < 12 || mr->attr.page_size >= 32)
                 return -EINVAL;
 
diff --git a/drivers/infiniband/hw/mthca/mthca_pd.c b/drivers/infiniband/hw/mthca/mthca_pd.c
index 3dbf06a6e6f..105fc5faadd 100644
--- a/drivers/infiniband/hw/mthca/mthca_pd.c
+++ b/drivers/infiniband/hw/mthca/mthca_pd.c
@@ -43,8 +43,6 @@ int mthca_pd_alloc(struct mthca_dev *dev, int privileged, struct mthca_pd *pd)
 {
         int err = 0;
 
-        might_sleep();
-
         pd->privileged = privileged;
 
         atomic_set(&pd->sqp_count, 0);
@@ -66,7 +64,6 @@ int mthca_pd_alloc(struct mthca_dev *dev, int privileged, struct mthca_pd *pd)
 
 void mthca_pd_free(struct mthca_dev *dev, struct mthca_pd *pd)
 {
-        might_sleep();
         if (pd->privileged)
                 mthca_free_mr(dev, &pd->ntmr);
         mthca_free(&dev->pd_table.alloc, pd->pd_num);