IB/ipoib: Remove and fix 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/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 4ad297d3de897789141c87847d26d6fdf91a062e..44f152e431cbeb02fb6bd34dbd8fb30fa1f03224 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -355,11 +355,8 @@ static int ipoib_cm_nonsrq_init_rx(struct net_device *dev, struct ib_cm_id *cm_i
        int i;
 
        rx->rx_ring = vzalloc(ipoib_recvq_size * sizeof *rx->rx_ring);
-       if (!rx->rx_ring) {
-               printk(KERN_WARNING "%s: failed to allocate CM non-SRQ ring (%d entries)\n",
-                      priv->ca->name, ipoib_recvq_size);
+       if (!rx->rx_ring)
                return -ENOMEM;
-       }
 
        t = kmalloc(sizeof *t, GFP_KERNEL);
        if (!t) {
@@ -1133,7 +1130,6 @@ static int ipoib_cm_tx_init(struct ipoib_cm_tx *p, u32 qpn,
        p->tx_ring = __vmalloc(ipoib_sendq_size * sizeof *p->tx_ring,
                               GFP_NOIO, PAGE_KERNEL);
        if (!p->tx_ring) {
-               ipoib_warn(priv, "failed to allocate tx ring\n");
                ret = -ENOMEM;
                goto err_tx;
        }
@@ -1549,8 +1545,6 @@ static void ipoib_cm_create_srq(struct net_device *dev, int max_sge)
 
        priv->cm.srq_ring = vzalloc(ipoib_recvq_size * sizeof *priv->cm.srq_ring);
        if (!priv->cm.srq_ring) {
-               printk(KERN_WARNING "%s: failed to allocate CM SRQ ring (%d entries)\n",
-                      priv->ca->name, ipoib_recvq_size);
                ib_destroy_srq(priv->cm.srq);
                priv->cm.srq = NULL;
                return;

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index be11d5d5b8c1d9ca84ab884bac32000e018c4c60..43cf8b8a8d2e858f7d3978d688b53879e873e8cc 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -418,11 +418,8 @@ static void ipoib_ib_handle_tx_wc(struct net_device *dev, struct ib_wc *wc)
                           "(status=%d, wrid=%d vend_err %x)\n",
                           wc->status, wr_id, wc->vendor_err);
                qp_work = kzalloc(sizeof(*qp_work), GFP_ATOMIC);
-               if (!qp_work) {
-                       ipoib_warn(priv, "%s Failed alloc ipoib_qp_state_validate for qp: 0x%x\n",
-                                  __func__, priv->qp->qp_num);
+               if (!qp_work)
                        return;
-               }
 
                INIT_WORK(&qp_work->work, ipoib_qp_state_validate_work);
                qp_work->priv = priv;

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 5636fc3da6b867aaabe5c1ff7f197d3f0077df76..423b30dfe2d8235afa40540a2ee4f7ce56a185fd 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -1594,11 +1594,8 @@ int ipoib_dev_init(struct net_device *dev, struct ib_device *ca, int port)
        /* Allocate RX/TX "rings" to hold queued skbs */
        priv->rx_ring = kzalloc(ipoib_recvq_size * sizeof *priv->rx_ring,
                                GFP_KERNEL);
-       if (!priv->rx_ring) {
-               printk(KERN_WARNING "%s: failed to allocate RX ring (%d entries)\n",
-                      ca->name, ipoib_recvq_size);
+       if (!priv->rx_ring)
                goto out;
-       }
 
        priv->tx_ring = vzalloc(ipoib_sendq_size * sizeof *priv->tx_ring);
        if (!priv->tx_ring) {