Merge tag 'alloc-args-v4.19-rc8' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

Kees writes:
  "Fix open-coded multiplication arguments to allocators

   - Fixes several new open-coded multiplications added in the 4.19
     merge window."

* tag 'alloc-args-v4.19-rc8' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  treewide: Replace more open-coded allocation size multiplications

10 files changed, 22 insertions, 19 deletions

diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index e182f6019f68..2fee65886d50 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -1322,7 +1322,7 @@ static int qca_init_regulators(struct qca_power *qca,
 {
         int i;
 
-        qca->vreg_bulk = devm_kzalloc(qca->dev, num_vregs *
+        qca->vreg_bulk = devm_kcalloc(qca->dev, num_vregs,
                                       sizeof(struct regulator_bulk_data),
                                       GFP_KERNEL);
         if (!qca->vreg_bulk)
diff --git a/drivers/crypto/inside-secure/safexcel.c b/drivers/crypto/inside-secure/safexcel.c
index 7e71043457a6..86c699c14f84 100644
--- a/drivers/crypto/inside-secure/safexcel.c
+++ b/drivers/crypto/inside-secure/safexcel.c
@@ -1044,7 +1044,8 @@ static int safexcel_probe(struct platform_device *pdev)
 
         safexcel_configure(priv);
 
-        priv->ring = devm_kzalloc(dev, priv->config.rings * sizeof(*priv->ring),
+        priv->ring = devm_kcalloc(dev, priv->config.rings,
+                                  sizeof(*priv->ring),
                                   GFP_KERNEL);
         if (!priv->ring) {
                 ret = -ENOMEM;
@@ -1063,8 +1064,9 @@ static int safexcel_probe(struct platform_device *pdev)
                 if (ret)
                         goto err_reg_clk;
 
-                priv->ring[i].rdr_req = devm_kzalloc(dev,
-                        sizeof(priv->ring[i].rdr_req) * EIP197_DEFAULT_RING_SIZE,
+                priv->ring[i].rdr_req = devm_kcalloc(dev,
+                        EIP197_DEFAULT_RING_SIZE,
+                        sizeof(priv->ring[i].rdr_req),
                         GFP_KERNEL);
                 if (!priv->ring[i].rdr_req) {
                         ret = -ENOMEM;
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index 0b976dfd04df..92ecb9bf982c 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -600,7 +600,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
         }
 
         mtk_crtc->layer_nr = mtk_ddp_comp_layer_nr(mtk_crtc->ddp_comp[0]);
-        mtk_crtc->planes = devm_kzalloc(dev, mtk_crtc->layer_nr *
+        mtk_crtc->planes = devm_kcalloc(dev, mtk_crtc->layer_nr,
                                         sizeof(struct drm_plane),
                                         GFP_KERNEL);
 
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c
index 790d39f816dc..b557687b1964 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c
@@ -153,8 +153,8 @@ int msm_dss_parse_clock(struct platform_device *pdev,
                 return 0;
         }
 
-        mp->clk_config = devm_kzalloc(&pdev->dev,
-                                      sizeof(struct dss_clk) * num_clk,
+        mp->clk_config = devm_kcalloc(&pdev->dev,
+                                      num_clk, sizeof(struct dss_clk),
                                       GFP_KERNEL);
         if (!mp->clk_config)
                 return -ENOMEM;
diff --git a/drivers/hwmon/npcm750-pwm-fan.c b/drivers/hwmon/npcm750-pwm-fan.c
index 8474d601aa63..b998f9fbed41 100644
--- a/drivers/hwmon/npcm750-pwm-fan.c
+++ b/drivers/hwmon/npcm750-pwm-fan.c
@@ -908,7 +908,7 @@ static int npcm7xx_en_pwm_fan(struct device *dev,
         if (fan_cnt < 1)
                 return -EINVAL;
 
-        fan_ch = devm_kzalloc(dev, sizeof(*fan_ch) * fan_cnt, GFP_KERNEL);
+        fan_ch = devm_kcalloc(dev, fan_cnt, sizeof(*fan_ch), GFP_KERNEL);
         if (!fan_ch)
                 return -ENOMEM;
 
diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c
index 89ccb64342de..e1fa6baf4e8e 100644
--- a/drivers/md/dm-integrity.c
+++ b/drivers/md/dm-integrity.c
@@ -3462,7 +3462,8 @@ try_smaller_buffer:
                         r = -ENOMEM;
                         goto bad;
                 }
-                ic->recalc_tags = kvmalloc((RECALC_SECTORS >> ic->sb->log2_sectors_per_block) * ic->tag_size, GFP_KERNEL);
+                ic->recalc_tags = kvmalloc_array(RECALC_SECTORS >> ic->sb->log2_sectors_per_block,
+                                                 ic->tag_size, GFP_KERNEL);
                 if (!ic->recalc_tags) {
                         ti->error = "Cannot allocate tags for recalculating";
                         r = -ENOMEM;
diff --git a/drivers/net/wireless/mediatek/mt76/usb.c b/drivers/net/wireless/mediatek/mt76/usb.c
index 7780b07543bb..79e59f2379a2 100644
--- a/drivers/net/wireless/mediatek/mt76/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/usb.c
@@ -258,7 +258,7 @@ int mt76u_buf_alloc(struct mt76_dev *dev, struct mt76u_buf *buf,
         if (!buf->urb)
                 return -ENOMEM;
 
-        buf->urb->sg = devm_kzalloc(dev->dev, nsgs * sizeof(*buf->urb->sg),
+        buf->urb->sg = devm_kcalloc(dev->dev, nsgs, sizeof(*buf->urb->sg),
                                     gfp);
         if (!buf->urb->sg)
                 return -ENOMEM;
@@ -464,8 +464,8 @@ static int mt76u_alloc_rx(struct mt76_dev *dev)
         int i, err, nsgs;
 
         spin_lock_init(&q->lock);
-        q->entry = devm_kzalloc(dev->dev,
-                                MT_NUM_RX_ENTRIES * sizeof(*q->entry),
+        q->entry = devm_kcalloc(dev->dev,
+                                MT_NUM_RX_ENTRIES, sizeof(*q->entry),
                                 GFP_KERNEL);
         if (!q->entry)
                 return -ENOMEM;
@@ -717,8 +717,8 @@ static int mt76u_alloc_tx(struct mt76_dev *dev)
                 INIT_LIST_HEAD(&q->swq);
                 q->hw_idx = q2hwq(i);
 
-                q->entry = devm_kzalloc(dev->dev,
-                                        MT_NUM_TX_ENTRIES * sizeof(*q->entry),
+                q->entry = devm_kcalloc(dev->dev,
+                                        MT_NUM_TX_ENTRIES, sizeof(*q->entry),
                                         GFP_KERNEL);
                 if (!q->entry)
                         return -ENOMEM;
diff --git a/drivers/pci/controller/pcie-cadence.c b/drivers/pci/controller/pcie-cadence.c
index 86f1b002c846..975bcdd6b5c0 100644
--- a/drivers/pci/controller/pcie-cadence.c
+++ b/drivers/pci/controller/pcie-cadence.c
@@ -180,11 +180,11 @@ int cdns_pcie_init_phy(struct device *dev, struct cdns_pcie *pcie)
                 return 0;
         }
 
-        phy = devm_kzalloc(dev, sizeof(*phy) * phy_count, GFP_KERNEL);
+        phy = devm_kcalloc(dev, phy_count, sizeof(*phy), GFP_KERNEL);
         if (!phy)
                 return -ENOMEM;
 
-        link = devm_kzalloc(dev, sizeof(*link) * phy_count, GFP_KERNEL);
+        link = devm_kcalloc(dev, phy_count, sizeof(*link), GFP_KERNEL);
         if (!link)
                 return -ENOMEM;
 
diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c
index 29ec34387246..1515074e18fb 100644
--- a/drivers/tty/serial/qcom_geni_serial.c
+++ b/drivers/tty/serial/qcom_geni_serial.c
@@ -868,8 +868,8 @@ static int qcom_geni_serial_port_setup(struct uart_port *uport)
         geni_se_init(&port->se, port->rx_wm, port->rx_rfr);
         geni_se_select_mode(&port->se, port->xfer_mode);
         if (!uart_console(uport)) {
-                port->rx_fifo = devm_kzalloc(uport->dev,
-                        port->rx_fifo_depth * sizeof(u32), GFP_KERNEL);
+                port->rx_fifo = devm_kcalloc(uport->dev,
+                        port->rx_fifo_depth, sizeof(u32), GFP_KERNEL);
                 if (!port->rx_fifo)
                         return -ENOMEM;
         }
diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c
index c07c30b916d5..793016d722ec 100644
--- a/net/sched/sch_cake.c
+++ b/net/sched/sch_cake.c
@@ -2644,7 +2644,7 @@ static int cake_init(struct Qdisc *sch, struct nlattr *opt,
         for (i = 1; i <= CAKE_QUEUES; i++)
                 quantum_div[i] = 65535 / i;
 
-        q->tins = kvzalloc(CAKE_MAX_TINS * sizeof(struct cake_tin_data),
+        q->tins = kvcalloc(CAKE_MAX_TINS, sizeof(struct cake_tin_data),
                            GFP_KERNEL);
         if (!q->tins)
                 goto nomem;