IB/mad: Remove debug prints after allocation failure

The prints after [k|v][m|z|c]alloc() functions are not needed,
because in case of failure, allocator will print their internal
error prints anyway.

Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index 40cbd6bdb73be1f23095387dd95f58c8508227b1..dadce12e9056925924abd55f1f2c5679d792ade5 100644 (file)
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -816,7 +816,6 @@ static int handle_outgoing_dr_smp(struct ib_mad_agent_private *mad_agent_priv,
        local = kmalloc(sizeof *local, GFP_ATOMIC);
        if (!local) {
                ret = -ENOMEM;
-               dev_err(&device->dev, "No memory for ib_mad_local_private\n");
                goto out;
        }
        local->mad_priv = NULL;
@@ -824,7 +823,6 @@ static int handle_outgoing_dr_smp(struct ib_mad_agent_private *mad_agent_priv,
        mad_priv = alloc_mad_private(mad_size, GFP_ATOMIC);
        if (!mad_priv) {
                ret = -ENOMEM;
-               dev_err(&device->dev, "No memory for local response MAD\n");
                kfree(local);
                goto out;
        }
@@ -947,9 +945,6 @@ static int alloc_send_rmpp_list(struct ib_mad_send_wr_private *send_wr,
        for (left = send_buf->data_len + pad; left > 0; left -= seg_size) {
                seg = kmalloc(sizeof (*seg) + seg_size, gfp_mask);
                if (!seg) {
-                       dev_err(&send_buf->mad_agent->device->dev,
-                               "alloc_send_rmpp_segs: RMPP mem alloc failed for len %zd, gfp %#x\n",
-                               sizeof (*seg) + seg_size, gfp_mask);
                        free_send_rmpp_list(send_wr);
                        return -ENOMEM;
                }
@@ -1362,12 +1357,7 @@ static int allocate_method_table(struct ib_mad_mgmt_method_table **method)
 {
        /* Allocate management method table */
        *method = kzalloc(sizeof **method, GFP_ATOMIC);
-       if (!*method) {
-               pr_err("No memory for ib_mad_mgmt_method_table\n");
-               return -ENOMEM;
-       }
-
-       return 0;
+       return (*method) ? 0 : (-ENOMEM);
 }
 
 /*
@@ -1458,8 +1448,6 @@ static int add_nonoui_reg_req(struct ib_mad_reg_req *mad_reg_req,
                /* Allocate management class table for "new" class version */
                *class = kzalloc(sizeof **class, GFP_ATOMIC);
                if (!*class) {
-                       dev_err(&agent_priv->agent.device->dev,
-                               "No memory for ib_mad_mgmt_class_table\n");
                        ret = -ENOMEM;
                        goto error1;
                }
@@ -1524,22 +1512,16 @@ static int add_oui_reg_req(struct ib_mad_reg_req *mad_reg_req,
        if (!*vendor_table) {
                /* Allocate mgmt vendor class table for "new" class version */
                vendor = kzalloc(sizeof *vendor, GFP_ATOMIC);
-               if (!vendor) {
-                       dev_err(&agent_priv->agent.device->dev,
-                               "No memory for ib_mad_mgmt_vendor_class_table\n");
+               if (!vendor)
                        goto error1;
-               }
 
                *vendor_table = vendor;
        }
        if (!(*vendor_table)->vendor_class[vclass]) {
                /* Allocate table for this management vendor class */
                vendor_class = kzalloc(sizeof *vendor_class, GFP_ATOMIC);
-               if (!vendor_class) {
-                       dev_err(&agent_priv->agent.device->dev,
-                               "No memory for ib_mad_mgmt_vendor_class\n");
+               if (!vendor_class)
                        goto error2;
-               }
 
                (*vendor_table)->vendor_class[vclass] = vendor_class;
        }
@@ -2238,11 +2220,8 @@ static void ib_mad_recv_done(struct ib_cq *cq, struct ib_wc *wc)
 
        mad_size = recv->mad_size;
        response = alloc_mad_private(mad_size, GFP_KERNEL);
-       if (!response) {
-               dev_err(&port_priv->device->dev,
-                       "%s: no memory for response buffer\n", __func__);
+       if (!response)
                goto out;
-       }
 
        if (rdma_cap_ib_switch(port_priv->device))
                port_num = wc->port_num;
@@ -2869,8 +2848,6 @@ static int ib_mad_post_receive_mads(struct ib_mad_qp_info *qp_info,
                        mad_priv = alloc_mad_private(port_mad_size(qp_info->port_priv),
                                                     GFP_ATOMIC);
                        if (!mad_priv) {
-                               dev_err(&qp_info->port_priv->device->dev,
-                                       "No memory for receive buffer\n");
                                ret = -ENOMEM;
                                break;
                        }
@@ -2961,11 +2938,8 @@ static int ib_mad_port_start(struct ib_mad_port_private *port_priv)
        u16 pkey_index;
 
        attr = kmalloc(sizeof *attr, GFP_KERNEL);
-       if (!attr) {
-               dev_err(&port_priv->device->dev,
-                       "Couldn't kmalloc ib_qp_attr\n");
+       if (!attr)
                return -ENOMEM;
-       }
 
        ret = ib_find_pkey(port_priv->device, port_priv->port_num,
                           IB_DEFAULT_PKEY_FULL, &pkey_index);
@@ -3135,10 +3109,8 @@ static int ib_mad_port_open(struct ib_device *device,
 
        /* Create new device info */
        port_priv = kzalloc(sizeof *port_priv, GFP_KERNEL);
-       if (!port_priv) {
-               dev_err(&device->dev, "No memory for ib_mad_port_private\n");
+       if (!port_priv)
                return -ENOMEM;
-       }
 
        port_priv->device = device;
        port_priv->port_num = port_num;