RDMA/cxgb4: Remove dependency on __GFP_NOFAIL

The alloc_skb() in various allocations are failable, so remove
__GFP_NOFAIL from their masks.

Signed-off-by: David Rientjes <rientjes@google.com>
Acked-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

3 files changed, 6 insertions, 6 deletions

diff --git a/drivers/infiniband/hw/cxgb4/cq.c b/drivers/infiniband/hw/cxgb4/cq.c
index fac5c6e68011..b3daf39eed4a 100644
--- a/drivers/infiniband/hw/cxgb4/cq.c
+++ b/drivers/infiniband/hw/cxgb4/cq.c
@@ -43,7 +43,7 @@ static int destroy_cq(struct c4iw_rdev *rdev, struct t4_cq *cq,
         int ret;
 
         wr_len = sizeof *res_wr + sizeof *res;
-        skb = alloc_skb(wr_len, GFP_KERNEL | __GFP_NOFAIL);
+        skb = alloc_skb(wr_len, GFP_KERNEL);
         if (!skb)
                 return -ENOMEM;
         set_wr_txq(skb, CPL_PRIORITY_CONTROL, 0);
@@ -118,7 +118,7 @@ static int create_cq(struct c4iw_rdev *rdev, struct t4_cq *cq,
         /* build fw_ri_res_wr */
         wr_len = sizeof *res_wr + sizeof *res;
 
-        skb = alloc_skb(wr_len, GFP_KERNEL | __GFP_NOFAIL);
+        skb = alloc_skb(wr_len, GFP_KERNEL);
         if (!skb) {
                 ret = -ENOMEM;
                 goto err4;
diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
index 82b5703b8947..269373a62f22 100644
--- a/drivers/infiniband/hw/cxgb4/mem.c
+++ b/drivers/infiniband/hw/cxgb4/mem.c
@@ -59,7 +59,7 @@ static int write_adapter_mem(struct c4iw_rdev *rdev, u32 addr, u32 len,
                 wr_len = roundup(sizeof *req + sizeof *sc +
                                  roundup(copy_len, T4_ULPTX_MIN_IO), 16);
 
-                skb = alloc_skb(wr_len, GFP_KERNEL | __GFP_NOFAIL);
+                skb = alloc_skb(wr_len, GFP_KERNEL);
                 if (!skb)
                         return -ENOMEM;
                 set_wr_txq(skb, CPL_PRIORITY_CONTROL, 0);
diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
index 7065cb310553..b88b1af28c30 100644
--- a/drivers/infiniband/hw/cxgb4/qp.c
+++ b/drivers/infiniband/hw/cxgb4/qp.c
@@ -130,7 +130,7 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
         /* build fw_ri_res_wr */
         wr_len = sizeof *res_wr + 2 * sizeof *res;
 
-        skb = alloc_skb(wr_len, GFP_KERNEL | __GFP_NOFAIL);
+        skb = alloc_skb(wr_len, GFP_KERNEL);
         if (!skb) {
                 ret = -ENOMEM;
                 goto err7;
@@ -961,7 +961,7 @@ static int rdma_fini(struct c4iw_dev *rhp, struct c4iw_qp *qhp)
         PDBG("%s qhp %p qid 0x%x tid %u\n", __func__, qhp, qhp->wq.sq.qid,
              qhp->ep->hwtid);
 
-        skb = alloc_skb(sizeof *wqe, GFP_KERNEL | __GFP_NOFAIL);
+        skb = alloc_skb(sizeof *wqe, GFP_KERNEL);
         if (!skb)
                 return -ENOMEM;
         set_wr_txq(skb, CPL_PRIORITY_DATA, qhp->ep->txq_idx);
@@ -1035,7 +1035,7 @@ static int rdma_init(struct c4iw_dev *rhp, struct c4iw_qp *qhp)
         PDBG("%s qhp %p qid 0x%x tid %u\n", __func__, qhp, qhp->wq.sq.qid,
              qhp->ep->hwtid);
 
-        skb = alloc_skb(sizeof *wqe, GFP_KERNEL | __GFP_NOFAIL);
+        skb = alloc_skb(sizeof *wqe, GFP_KERNEL);
         if (!skb)
                 return -ENOMEM;
         set_wr_txq(skb, CPL_PRIORITY_DATA, qhp->ep->txq_idx);