Skip to content

Commit 5a738b5

Browse files
jgunthorpejgunthorpe
committed
RDMA/drivers: Use dev_err/dbg/etc instead of pr_* + ibdev->name
Kernel convention is that a driver for a subsystem will print using dev_* on the subsystem's struct device, or with dev_* on the physical device. Drivers should rarely use a pr_* function. Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
1 parent 43c7c85 commit 5a738b5

File tree

6 files changed

+22
-19
lines changed

6 files changed

+22
-19
lines changed

‎drivers/infiniband/hw/mlx5/mlx5_ib.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,17 @@
5050
#include <rdma/uverbs_ioctl.h>
5151
#include <rdma/mlx5_user_ioctl_cmds.h>
5252

53-
#define mlx5_ib_dbg(dev, format, arg...) \
54-
pr_debug("%s:%s:%d:(pid %d): " format, (dev)->ib_dev.name, __func__, \
55-
__LINE__, current->pid, ##arg)
53+
#define mlx5_ib_dbg(_dev, format, arg...) \
54+
dev_dbg(&(_dev)->ib_dev.dev, "%s:%d:(pid %d): " format, __func__, \
55+
__LINE__, current->pid, ##arg)
5656

57-
#define mlx5_ib_err(dev, format, arg...) \
58-
pr_err("%s:%s:%d:(pid %d): " format, (dev)->ib_dev.name, __func__, \
59-
__LINE__, current->pid, ##arg)
57+
#define mlx5_ib_err(_dev, format, arg...) \
58+
dev_err(&(_dev)->ib_dev.dev, "%s:%d:(pid %d): " format, __func__, \
59+
__LINE__, current->pid, ##arg)
6060

61-
#define mlx5_ib_warn(dev, format, arg...) \
62-
pr_warn("%s:%s:%d:(pid %d): " format, (dev)->ib_dev.name, __func__, \
63-
__LINE__, current->pid, ##arg)
61+
#define mlx5_ib_warn(_dev, format, arg...) \
62+
dev_warn(&(_dev)->ib_dev.dev, "%s:%d:(pid %d): " format, __func__, \
63+
__LINE__, current->pid, ##arg)
6464

6565
#define field_avail(type, fld, sz) (offsetof(type, fld) + \
6666
sizeof(((type *)0)->fld) <= (sz))

‎drivers/infiniband/hw/mlx5/qp.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2826,8 +2826,9 @@ static int modify_raw_packet_qp_rq(
28262826
MLX5_MODIFY_RQ_IN_MODIFY_BITMASK_RQ_COUNTER_SET_ID);
28272827
MLX5_SET(rqc, rqc, counter_set_id, raw_qp_param->rq_q_ctr_id);
28282828
} else
2829-
pr_info_once("%s: RAW PACKET QP counters are not supported on current FW\n",
2830-
dev->ib_dev.name);
2829+
dev_info_once(
2830+
&dev->ib_dev.dev,
2831+
"RAW PACKET QP counters are not supported on current FW\n");
28312832
}
28322833

28332834
err = mlx5_core_modify_rq(dev->mdev, rq->base.mqp.qpn, in, inlen);
@@ -5798,8 +5799,9 @@ int mlx5_ib_modify_wq(struct ib_wq *wq, struct ib_wq_attr *wq_attr,
57985799
MLX5_SET(rqc, rqc, counter_set_id,
57995800
dev->port->cnts.set_id);
58005801
} else
5801-
pr_info_once("%s: Receive WQ counters are not supported on current FW\n",
5802-
dev->ib_dev.name);
5802+
dev_info_once(
5803+
&dev->ib_dev.dev,
5804+
"Receive WQ counters are not supported on current FW\n");
58035805
}
58045806

58055807
err = mlx5_core_modify_rq(dev->mdev, rwq->core_qp.qpn, in, inlen);

‎drivers/infiniband/hw/mthca/mthca_mad.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,9 @@ static int mthca_update_rate(struct mthca_dev *dev, u8 port_num)
5858

5959
ret = ib_query_port(&dev->ib_dev, port_num, tprops);
6060
if (ret) {
61-
printk(KERN_WARNING "ib_query_port failed (%d) for %s port %d\n",
62-
ret, dev->ib_dev.name, port_num);
61+
dev_warn(&dev->ib_dev.dev,
62+
"ib_query_port failed (%d) forport %d\n", ret,
63+
port_num);
6364
goto out;
6465
}
6566

‎drivers/infiniband/hw/ocrdma/ocrdma_hw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -792,7 +792,7 @@ static void ocrdma_dispatch_ibevent(struct ocrdma_dev *dev,
792792
qp->srq->ibsrq.
793793
srq_context);
794794
} else if (dev_event) {
795-
pr_err("%s: Fatal event received\n", dev->ibdev.name);
795+
dev_err(&dev->ibdev.dev, "Fatal event received\n");
796796
ib_dispatch_event(&ib_evt);
797797
}
798798

‎drivers/infiniband/sw/rxe/rxe_net.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ void rxe_port_up(struct rxe_dev *rxe)
615615
port->attr.phys_state = IB_PHYS_STATE_LINK_UP;
616616

617617
rxe_port_event(rxe, IB_EVENT_PORT_ACTIVE);
618-
pr_info("set %s active\n", rxe->ib_dev.name);
618+
dev_info(&rxe->ib_dev.dev, "set active\n");
619619
}
620620

621621
/* Caller must hold net_info_lock */
@@ -628,7 +628,7 @@ void rxe_port_down(struct rxe_dev *rxe)
628628
port->attr.phys_state = IB_PHYS_STATE_LINK_DOWN;
629629

630630
rxe_port_event(rxe, IB_EVENT_PORT_ERR);
631-
pr_info("set %s down\n", rxe->ib_dev.name);
631+
dev_info(&rxe->ib_dev.dev, "set down\n");
632632
}
633633

634634
static int rxe_notify(struct notifier_block *not_blk,

‎drivers/infiniband/sw/rxe/rxe_sysfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ static int rxe_param_set_add(const char *val, const struct kernel_param *kp)
105105
}
106106

107107
rxe_set_port_state(ndev);
108-
pr_info("added %s to %s\n", rxe->ib_dev.name, intf);
108+
dev_info(&rxe->ib_dev.dev, "added %s\n", intf);
109109
err:
110110
if (ndev)
111111
dev_put(ndev);

0 commit comments

Comments
 (0)