Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c55359a2 authored by Yuval Shaia's avatar Yuval Shaia Committed by Jason Gunthorpe
Browse files

IB/ipoib: Replace printk with pr_warn 



pr_* is the preferred way to print messages, replace all
printk(KERN_WARN, ...) with pr_warn.

Signed-off-by: default avatarYuval Shaia <yuval.shaia@oracle.com>
Reviewed-by: default avatarZhu Yanjun <yanjun.zhu@oracle.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Reviewed-by: default avatarSantosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent f4cd9d58

drivers/infiniband/ulp/ipoib/ipoib_cm.c

+4 −4
Original line number Diff line number Diff line
@@ -876,7 +876,7 @@ int ipoib_cm_dev_open(struct net_device *dev) 


	priv->cm.id = ib_create_cm_id(priv->ca, ipoib_cm_rx_handler, dev);

	if (IS_ERR(priv->cm.id)) {

		printk(KERN_WARNING "%s: failed to create CM ID\n", priv->ca->name);

		pr_warn("%s: failed to create CM ID\n", priv->ca->name);

		ret = PTR_ERR(priv->cm.id);

		goto err_cm;

	}
@@ -884,7 +884,7 @@ int ipoib_cm_dev_open(struct net_device *dev) 
	ret = ib_cm_listen(priv->cm.id, cpu_to_be64(IPOIB_CM_IETF_ID | priv->qp->qp_num),

			   0);

	if (ret) {

		printk(KERN_WARNING "%s: failed to listen on ID 0x%llx\n", priv->ca->name,

		pr_warn("%s: failed to listen on ID 0x%llx\n", priv->ca->name,

			IPOIB_CM_IETF_ID | priv->qp->qp_num);

		goto err_listen;

	}
@@ -1562,7 +1562,7 @@ static void ipoib_cm_create_srq(struct net_device *dev, int max_sge) 
	priv->cm.srq = ib_create_srq(priv->pd, &srq_init_attr);

	if (IS_ERR(priv->cm.srq)) {

		if (PTR_ERR(priv->cm.srq) != -ENOSYS)

			printk(KERN_WARNING "%s: failed to allocate SRQ, error %ld\n",

			pr_warn("%s: failed to allocate SRQ, error %ld\n",

			       priv->ca->name, PTR_ERR(priv->cm.srq));

		priv->cm.srq = NULL;

		return;

drivers/infiniband/ulp/ipoib/ipoib_main.c

+11 −12
Original line number Diff line number Diff line
@@ -1663,7 +1663,7 @@ static int ipoib_dev_init_default(struct net_device *dev) 


	priv->tx_ring = vzalloc(ipoib_sendq_size * sizeof *priv->tx_ring);

	if (!priv->tx_ring) {

		printk(KERN_WARNING "%s: failed to allocate TX ring (%d entries)\n",

		pr_warn("%s: failed to allocate TX ring (%d entries)\n",

			priv->ca->name, ipoib_sendq_size);

		goto out_rx_ring_cleanup;

	}
@@ -2204,8 +2204,7 @@ static struct net_device *ipoib_add_port(const char *format, 


	result = ib_query_port(hca, port, &attr);

	if (result) {

		printk(KERN_WARNING "%s: ib_query_port %d failed\n",

		       hca->name, port);

		pr_warn("%s: ib_query_port %d failed\n", hca->name, port);

		goto device_init_failed;

	}
@@ -2220,7 +2219,7 @@ static struct net_device *ipoib_add_port(const char *format, 


	result = ib_query_pkey(hca, port, 0, &priv->pkey);

	if (result) {

		printk(KERN_WARNING "%s: ib_query_pkey port %d failed (ret = %d)\n",

		pr_warn("%s: ib_query_pkey port %d failed (ret = %d)\n",

			hca->name, port, result);

		goto device_init_failed;

	}
@@ -2238,7 +2237,7 @@ static struct net_device *ipoib_add_port(const char *format, 


	result = ib_query_gid(hca, port, 0, &priv->local_gid, NULL);

	if (result) {

		printk(KERN_WARNING "%s: ib_query_gid port %d failed (ret = %d)\n",

		pr_warn("%s: ib_query_gid port %d failed (ret = %d)\n",

			hca->name, port, result);

		goto device_init_failed;

	}
@@ -2249,7 +2248,7 @@ static struct net_device *ipoib_add_port(const char *format, 


	result = ipoib_dev_init(priv->dev, hca, port);

	if (result) {

		printk(KERN_WARNING "%s: failed to initialize port %d (ret = %d)\n",

		pr_warn("%s: failed to initialize port %d (ret = %d)\n",

			hca->name, port, result);

		goto device_init_failed;

	}
@@ -2260,7 +2259,7 @@ static struct net_device *ipoib_add_port(const char *format, 


	result = register_netdev(priv->dev);

	if (result) {

		printk(KERN_WARNING "%s: couldn't register ipoib port %d; error %d\n",

		pr_warn("%s: couldn't register ipoib port %d; error %d\n",

			hca->name, port, result);

		goto register_failed;

	}

drivers/infiniband/ulp/ipoib/ipoib_verbs.c

+3 −3
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ int ipoib_transport_dev_init(struct net_device *dev, struct ib_device *ca) 
	priv->recv_cq = ib_create_cq(priv->ca, ipoib_ib_rx_completion, NULL,

				     priv, &cq_attr);

	if (IS_ERR(priv->recv_cq)) {

		printk(KERN_WARNING "%s: failed to create receive CQ\n", ca->name);

		pr_warn("%s: failed to create receive CQ\n", ca->name);

		goto out_cm_dev_cleanup;

	}
@@ -187,7 +187,7 @@ int ipoib_transport_dev_init(struct net_device *dev, struct ib_device *ca) 
	priv->send_cq = ib_create_cq(priv->ca, ipoib_ib_tx_completion, NULL,

				     priv, &cq_attr);

	if (IS_ERR(priv->send_cq)) {

		printk(KERN_WARNING "%s: failed to create send CQ\n", ca->name);

		pr_warn("%s: failed to create send CQ\n", ca->name);

		goto out_free_recv_cq;

	}
@@ -208,7 +208,7 @@ int ipoib_transport_dev_init(struct net_device *dev, struct ib_device *ca) 


	priv->qp = ib_create_qp(priv->pd, &init_attr);

	if (IS_ERR(priv->qp)) {

		printk(KERN_WARNING "%s: failed to create QP\n", ca->name);

		pr_warn("%s: failed to create QP\n", ca->name);

		goto out_free_send_cq;

	}