3 files changed, 18 insertions, 28 deletions

diff --git a/drivers/infiniband/hw/ionic/ionic_admin.c b/drivers/infiniband/hw/ionic/ionic_admin.c
index 2537aa55d12d..37e24450d129 100644
--- a/drivers/infiniband/hw/ionic/ionic_admin.c
+++ b/drivers/infiniband/hw/ionic/ionic_admin.c
@@ -520,7 +520,7 @@ static struct ionic_vcq *ionic_create_rdma_admincq(struct ionic_ibdev *dev,
 	struct ionic_cq *cq;
 	int rc;
 
-	vcq = kzalloc(sizeof(*vcq), GFP_KERNEL);
+	vcq = kzalloc_obj(*vcq);
 	if (!vcq)
 		return ERR_PTR(-ENOMEM);
 
@@ -558,7 +558,7 @@ static struct ionic_aq *__ionic_create_rdma_adminq(struct ionic_ibdev *dev,
 	struct ionic_aq *aq;
 	int rc;
 
-	aq = kzalloc(sizeof(*aq), GFP_KERNEL);
+	aq = kzalloc_obj(*aq);
 	if (!aq)
 		return ERR_PTR(-ENOMEM);
 
@@ -575,7 +575,7 @@ static struct ionic_aq *__ionic_create_rdma_adminq(struct ionic_ibdev *dev,
 
 	ionic_queue_dbell_init(&aq->q, aq->aqid);
 
-	aq->q_wr = kcalloc((u32)aq->q.mask + 1, sizeof(*aq->q_wr), GFP_KERNEL);
+	aq->q_wr = kzalloc_objs(*aq->q_wr, (u32)aq->q.mask + 1);
 	if (!aq->q_wr) {
 		rc = -ENOMEM;
 		goto err_wr;
@@ -983,7 +983,7 @@ static struct ionic_eq *ionic_create_eq(struct ionic_ibdev *dev, int eqid)
 	struct ionic_eq *eq;
 	int rc;
 
-	eq = kzalloc(sizeof(*eq), GFP_KERNEL);
+	eq = kzalloc_obj(*eq);
 	if (!eq)
 		return ERR_PTR(-ENOMEM);
 
@@ -1095,8 +1095,7 @@ int ionic_create_rdma_admin(struct ionic_ibdev *dev)
 		goto out;
 	}
 
-	dev->eq_vec = kmalloc_array(dev->lif_cfg.eq_count, sizeof(*dev->eq_vec),
-				    GFP_KERNEL);
+	dev->eq_vec = kmalloc_objs(*dev->eq_vec, dev->lif_cfg.eq_count);
 	if (!dev->eq_vec) {
 		rc = -ENOMEM;
 		goto out;
@@ -1126,8 +1125,7 @@ int ionic_create_rdma_admin(struct ionic_ibdev *dev)
 
 	dev->lif_cfg.eq_count = eq_i;
 
-	dev->aq_vec = kmalloc_array(dev->lif_cfg.aq_count, sizeof(*dev->aq_vec),
-				    GFP_KERNEL);
+	dev->aq_vec = kmalloc_objs(*dev->aq_vec, dev->lif_cfg.aq_count);
 	if (!dev->aq_vec) {
 		rc = -ENOMEM;
 		goto out;
diff --git a/drivers/infiniband/hw/ionic/ionic_controlpath.c b/drivers/infiniband/hw/ionic/ionic_controlpath.c
index ea12d9b8e125..5b3f40bd98d8 100644
--- a/drivers/infiniband/hw/ionic/ionic_controlpath.c
+++ b/drivers/infiniband/hw/ionic/ionic_controlpath.c
@@ -343,7 +343,7 @@ ionic_mmap_entry_insert(struct ionic_ctx *ctx, unsigned long size,
 	struct ionic_mmap_entry *entry;
 	int rc;
 
-	entry = kzalloc(sizeof(*entry), GFP_KERNEL);
+	entry = kzalloc_obj(*entry);
 	if (!entry)
 		return NULL;
 
@@ -852,7 +852,7 @@ struct ib_mr *ionic_get_dma_mr(struct ib_pd *ibpd, int access)
 	struct ionic_pd *pd = to_ionic_pd(ibpd);
 	struct ionic_mr *mr;
 
-	mr = kzalloc(sizeof(*mr), GFP_KERNEL);
+	mr = kzalloc_obj(*mr);
 	if (!mr)
 		return ERR_PTR(-ENOMEM);
 
@@ -878,7 +878,7 @@ struct ib_mr *ionic_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 length,
 	if (dmah)
 		return ERR_PTR(-EOPNOTSUPP);
 
-	mr = kzalloc(sizeof(*mr), GFP_KERNEL);
+	mr = kzalloc_obj(*mr);
 	if (!mr)
 		return ERR_PTR(-ENOMEM);
 
@@ -945,7 +945,7 @@ struct ib_mr *ionic_reg_user_mr_dmabuf(struct ib_pd *ibpd, u64 offset,
 	if (dmah)
 		return ERR_PTR(-EOPNOTSUPP);
 
-	mr = kzalloc(sizeof(*mr), GFP_KERNEL);
+	mr = kzalloc_obj(*mr);
 	if (!mr)
 		return ERR_PTR(-ENOMEM);
 
@@ -1039,7 +1039,7 @@ struct ib_mr *ionic_alloc_mr(struct ib_pd *ibpd, enum ib_mr_type type,
 	if (type != IB_MR_TYPE_MEM_REG)
 		return ERR_PTR(-EINVAL);
 
-	mr = kzalloc(sizeof(*mr), GFP_KERNEL);
+	mr = kzalloc_obj(*mr);
 	if (!mr)
 		return ERR_PTR(-ENOMEM);
 
@@ -1868,9 +1868,7 @@ static int ionic_qp_sq_init(struct ionic_ibdev *dev, struct ionic_ctx *ctx,
 
 		ionic_queue_dbell_init(&qp->sq, qp->qpid);
 
-		qp->sq_meta = kmalloc_array((u32)qp->sq.mask + 1,
-					    sizeof(*qp->sq_meta),
-					    GFP_KERNEL);
+		qp->sq_meta = kmalloc_objs(*qp->sq_meta, (u32)qp->sq.mask + 1);
 		if (!qp->sq_meta) {
 			rc = -ENOMEM;
 			goto err_sq_meta;
@@ -2083,9 +2081,7 @@ static int ionic_qp_rq_init(struct ionic_ibdev *dev, struct ionic_ctx *ctx,
 
 		ionic_queue_dbell_init(&qp->rq, qp->qpid);
 
-		qp->rq_meta = kmalloc_array((u32)qp->rq.mask + 1,
-					    sizeof(*qp->rq_meta),
-					    GFP_KERNEL);
+		qp->rq_meta = kmalloc_objs(*qp->rq_meta, (u32)qp->rq.mask + 1);
 		if (!qp->rq_meta) {
 			rc = -ENOMEM;
 			goto err_rq_meta;
@@ -2205,7 +2201,7 @@ int ionic_create_qp(struct ib_qp *ibqp, struct ib_qp_init_attr *attr,
 	qp->has_ah = attr->qp_type == IB_QPT_RC;
 
 	if (qp->has_ah) {
-		qp->hdr = kzalloc(sizeof(*qp->hdr), GFP_KERNEL);
+		qp->hdr = kzalloc_obj(*qp->hdr);
 		if (!qp->hdr) {
 			rc = -ENOMEM;
 			goto err_ah_alloc;
diff --git a/drivers/infiniband/hw/ionic/ionic_hw_stats.c b/drivers/infiniband/hw/ionic/ionic_hw_stats.c
index 244a80dde08f..f72c9837e135 100644
--- a/drivers/infiniband/hw/ionic/ionic_hw_stats.c
+++ b/drivers/infiniband/hw/ionic/ionic_hw_stats.c
@@ -155,9 +155,7 @@ static int ionic_init_hw_stats(struct ionic_ibdev *dev)
 	dev->hw_stats_count = hw_stats_count;
 
 	/* alloc and init array of names, for alloc_hw_stats */
-	dev->hw_stats_hdrs = kcalloc(hw_stats_count,
-				     sizeof(*dev->hw_stats_hdrs),
-				     GFP_KERNEL);
+	dev->hw_stats_hdrs = kzalloc_objs(*dev->hw_stats_hdrs, hw_stats_count);
 	if (!dev->hw_stats_hdrs) {
 		rc = -ENOMEM;
 		goto err_dma;
@@ -241,7 +239,7 @@ ionic_counter_alloc_stats(struct rdma_counter *counter)
 	struct ionic_counter *cntr;
 	int err;
 
-	cntr = kzalloc(sizeof(*cntr), GFP_KERNEL);
+	cntr = kzalloc_obj(*cntr);
 	if (!cntr)
 		return NULL;
 
@@ -402,8 +400,7 @@ static int ionic_alloc_counters(struct ionic_ibdev *dev)
 	cs->queue_stats_count = hw_stats_count;
 
 	/* alloc and init array of names */
-	cs->stats_hdrs = kcalloc(hw_stats_count, sizeof(*cs->stats_hdrs),
-				 GFP_KERNEL);
+	cs->stats_hdrs = kzalloc_objs(*cs->stats_hdrs, hw_stats_count);
 	if (!cs->stats_hdrs) {
 		rc = -ENOMEM;
 		goto err_dma;
@@ -449,8 +446,7 @@ void ionic_stats_init(struct ionic_ibdev *dev)
 	}
 
 	if (stats_type & IONIC_LIF_RDMA_STAT_QP) {
-		dev->counter_stats = kzalloc(sizeof(*dev->counter_stats),
-					     GFP_KERNEL);
+		dev->counter_stats = kzalloc_obj(*dev->counter_stats);
 		if (!dev->counter_stats)
 			return;