24 files changed, 50 insertions, 55 deletions

diff --git a/drivers/clk/bcm/clk-bcm2835-aux.c b/drivers/clk/bcm/clk-bcm2835-aux.c
index 77e276d61702..f225ad29b110 100644
--- a/drivers/clk/bcm/clk-bcm2835-aux.c
+++ b/drivers/clk/bcm/clk-bcm2835-aux.c
@@ -40,8 +40,10 @@ static int bcm2835_aux_clk_probe(struct platform_device *pdev)
         if (IS_ERR(reg))
                 return PTR_ERR(reg);
 
-        onecell = devm_kmalloc(dev, sizeof(*onecell) + sizeof(*onecell->hws) *
-                               BCM2835_AUX_CLOCK_COUNT, GFP_KERNEL);
+        onecell = devm_kmalloc(dev,
+                               struct_size(onecell, hws,
+                                           BCM2835_AUX_CLOCK_COUNT),
+                               GFP_KERNEL);
         if (!onecell)
                 return -ENOMEM;
         onecell->num = BCM2835_AUX_CLOCK_COUNT;
diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
index fa0d5c8611a0..6d4e69edfb36 100644
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -2147,8 +2147,8 @@ static int bcm2835_clk_probe(struct platform_device *pdev)
         size_t i;
         int ret;
 
-        cprman = devm_kzalloc(dev, sizeof(*cprman) +
-                              sizeof(*cprman->onecell.hws) * asize,
+        cprman = devm_kzalloc(dev,
+                              struct_size(cprman, onecell.hws, asize),
                               GFP_KERNEL);
         if (!cprman)
                 return -ENOMEM;
diff --git a/drivers/clk/bcm/clk-iproc-asiu.c b/drivers/clk/bcm/clk-iproc-asiu.c
index 4360e481368b..6fb8af506777 100644
--- a/drivers/clk/bcm/clk-iproc-asiu.c
+++ b/drivers/clk/bcm/clk-iproc-asiu.c
@@ -197,8 +197,8 @@ void __init iproc_asiu_setup(struct device_node *node,
         if (WARN_ON(!asiu))
                 return;
 
-        asiu->clk_data = kzalloc(sizeof(*asiu->clk_data->hws) * num_clks +
-                                 sizeof(*asiu->clk_data), GFP_KERNEL);
+        asiu->clk_data = kzalloc(struct_size(asiu->clk_data, hws, num_clks),
+                                 GFP_KERNEL);
         if (WARN_ON(!asiu->clk_data))
                 goto err_clks;
         asiu->clk_data->num = num_clks;
diff --git a/drivers/clk/bcm/clk-iproc-pll.c b/drivers/clk/bcm/clk-iproc-pll.c
index 43a58ae5a89d..274441e2ddb2 100644
--- a/drivers/clk/bcm/clk-iproc-pll.c
+++ b/drivers/clk/bcm/clk-iproc-pll.c
@@ -744,8 +744,7 @@ void iproc_pll_clk_setup(struct device_node *node,
         if (WARN_ON(!pll))
                 return;
 
-        clk_data = kzalloc(sizeof(*clk_data->hws) * num_clks +
-                                sizeof(*clk_data), GFP_KERNEL);
+        clk_data = kzalloc(struct_size(clk_data, hws, num_clks), GFP_KERNEL);
         if (WARN_ON(!clk_data))
                 goto err_clk_data;
         clk_data->num = num_clks;
diff --git a/drivers/clk/berlin/bg2.c b/drivers/clk/berlin/bg2.c
index e7331ace0337..45fb888bf0a0 100644
--- a/drivers/clk/berlin/bg2.c
+++ b/drivers/clk/berlin/bg2.c
@@ -509,8 +509,7 @@ static void __init berlin2_clock_setup(struct device_node *np)
         u8 avpll_flags = 0;
         int n, ret;
 
-        clk_data = kzalloc(sizeof(*clk_data) +
-                           sizeof(*clk_data->hws) * MAX_CLKS, GFP_KERNEL);
+        clk_data = kzalloc(struct_size(clk_data, hws, MAX_CLKS), GFP_KERNEL);
         if (!clk_data)
                 return;
         clk_data->num = MAX_CLKS;
diff --git a/drivers/clk/berlin/bg2q.c b/drivers/clk/berlin/bg2q.c
index 67c270b143f7..db7364e15c8b 100644
--- a/drivers/clk/berlin/bg2q.c
+++ b/drivers/clk/berlin/bg2q.c
@@ -295,8 +295,7 @@ static void __init berlin2q_clock_setup(struct device_node *np)
         struct clk_hw **hws;
         int n, ret;
 
-        clk_data = kzalloc(sizeof(*clk_data) +
-                           sizeof(*clk_data->hws) * MAX_CLKS, GFP_KERNEL);
+        clk_data = kzalloc(struct_size(clk_data, hws, MAX_CLKS), GFP_KERNEL);
         if (!clk_data)
                 return;
         clk_data->num = MAX_CLKS;
diff --git a/drivers/clk/clk-asm9260.c b/drivers/clk/clk-asm9260.c
index bf0582cbbf38..44b544157121 100644
--- a/drivers/clk/clk-asm9260.c
+++ b/drivers/clk/clk-asm9260.c
@@ -273,8 +273,7 @@ static void __init asm9260_acc_init(struct device_node *np)
         int n;
         u32 accuracy = 0;
 
-        clk_data = kzalloc(sizeof(*clk_data) +
-                           sizeof(*clk_data->hws) * MAX_CLKS, GFP_KERNEL);
+        clk_data = kzalloc(struct_size(clk_data, hws, MAX_CLKS), GFP_KERNEL);
         if (!clk_data)
                 return;
         clk_data->num = MAX_CLKS;
diff --git a/drivers/clk/clk-aspeed.c b/drivers/clk/clk-aspeed.c
index 5eb50c31e455..7abe4232d282 100644
--- a/drivers/clk/clk-aspeed.c
+++ b/drivers/clk/clk-aspeed.c
@@ -627,9 +627,9 @@ static void __init aspeed_cc_init(struct device_node *np)
         if (!scu_base)
                 return;
 
-        aspeed_clk_data = kzalloc(sizeof(*aspeed_clk_data) +
-                        sizeof(*aspeed_clk_data->hws) * ASPEED_NUM_CLKS,
-                        GFP_KERNEL);
+        aspeed_clk_data = kzalloc(struct_size(aspeed_clk_data, hws,
+                                              ASPEED_NUM_CLKS),
+                                  GFP_KERNEL);
         if (!aspeed_clk_data)
                 return;
 
diff --git a/drivers/clk/clk-clps711x.c b/drivers/clk/clk-clps711x.c
index 9193f64561f6..2c04396402ab 100644
--- a/drivers/clk/clk-clps711x.c
+++ b/drivers/clk/clk-clps711x.c
@@ -54,9 +54,9 @@ static struct clps711x_clk * __init _clps711x_clk_init(void __iomem *base,
         if (!base)
                 return ERR_PTR(-ENOMEM);
 
-        clps711x_clk = kzalloc(sizeof(*clps711x_clk) +
-                        sizeof(*clps711x_clk->clk_data.hws) * CLPS711X_CLK_MAX,
-                        GFP_KERNEL);
+        clps711x_clk = kzalloc(struct_size(clps711x_clk, clk_data.hws,
+                                           CLPS711X_CLK_MAX),
+                               GFP_KERNEL);
         if (!clps711x_clk)
                 return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/clk/clk-efm32gg.c b/drivers/clk/clk-efm32gg.c
index f674778fb3ac..f37cf08ff7aa 100644
--- a/drivers/clk/clk-efm32gg.c
+++ b/drivers/clk/clk-efm32gg.c
@@ -25,8 +25,8 @@ static void __init efm32gg_cmu_init(struct device_node *np)
         void __iomem *base;
         struct clk_hw **hws;
 
-        clk_data = kzalloc(sizeof(*clk_data) +
-                           sizeof(*clk_data->hws) * CMU_MAX_CLKS, GFP_KERNEL);
+        clk_data = kzalloc(struct_size(clk_data, hws, CMU_MAX_CLKS),
+                           GFP_KERNEL);
 
         if (!clk_data)
                 return;
diff --git a/drivers/clk/clk-gemini.c b/drivers/clk/clk-gemini.c
index 5e66e6c0205e..b51069e794ff 100644
--- a/drivers/clk/clk-gemini.c
+++ b/drivers/clk/clk-gemini.c
@@ -399,9 +399,9 @@ static void __init gemini_cc_init(struct device_node *np)
         int ret;
         int i;
 
-        gemini_clk_data = kzalloc(sizeof(*gemini_clk_data) +
-                        sizeof(*gemini_clk_data->hws) * GEMINI_NUM_CLKS,
-                        GFP_KERNEL);
+        gemini_clk_data = kzalloc(struct_size(gemini_clk_data, hws,
+                                              GEMINI_NUM_CLKS),
+                                  GFP_KERNEL);
         if (!gemini_clk_data)
                 return;
 
diff --git a/drivers/clk/clk-s2mps11.c b/drivers/clk/clk-s2mps11.c
index fbaa84a33c46..d44e0eea31ec 100644
--- a/drivers/clk/clk-s2mps11.c
+++ b/drivers/clk/clk-s2mps11.c
@@ -147,8 +147,8 @@ static int s2mps11_clk_probe(struct platform_device *pdev)
         if (!s2mps11_clks)
                 return -ENOMEM;
 
-        clk_data = devm_kzalloc(&pdev->dev, sizeof(*clk_data) +
-                                sizeof(*clk_data->hws) * S2MPS11_CLKS_NUM,
+        clk_data = devm_kzalloc(&pdev->dev,
+                                struct_size(clk_data, hws, S2MPS11_CLKS_NUM),
                                 GFP_KERNEL);
         if (!clk_data)
                 return -ENOMEM;
diff --git a/drivers/clk/clk-scmi.c b/drivers/clk/clk-scmi.c
index 488c21376b55..bb2a6f2f5516 100644
--- a/drivers/clk/clk-scmi.c
+++ b/drivers/clk/clk-scmi.c
@@ -137,8 +137,8 @@ static int scmi_clocks_probe(struct scmi_device *sdev)
                 return -EINVAL;
         }
 
-        clk_data = devm_kzalloc(dev, sizeof(*clk_data) +
-                                sizeof(*clk_data->hws) * count, GFP_KERNEL);
+        clk_data = devm_kzalloc(dev, struct_size(clk_data, hws, count),
+                                GFP_KERNEL);
         if (!clk_data)
                 return -ENOMEM;
 
diff --git a/drivers/clk/clk-stm32h7.c b/drivers/clk/clk-stm32h7.c
index db2b162c0d4c..d3271eca3779 100644
--- a/drivers/clk/clk-stm32h7.c
+++ b/drivers/clk/clk-stm32h7.c
@@ -1201,9 +1201,8 @@ static void __init stm32h7_rcc_init(struct device_node *np)
         const char *hse_clk, *lse_clk, *i2s_clk;
         struct regmap *pdrm;
 
-        clk_data = kzalloc(sizeof(*clk_data) +
-                        sizeof(*clk_data->hws) * STM32H7_MAX_CLKS,
-                        GFP_KERNEL);
+        clk_data = kzalloc(struct_size(clk_data, hws, STM32H7_MAX_CLKS),
+                           GFP_KERNEL);
         if (!clk_data)
                 return;
 
diff --git a/drivers/clk/clk-stm32mp1.c b/drivers/clk/clk-stm32mp1.c
index edd3cf451401..83e8cd81674f 100644
--- a/drivers/clk/clk-stm32mp1.c
+++ b/drivers/clk/clk-stm32mp1.c
@@ -2060,9 +2060,8 @@ static int stm32_rcc_init(struct device_node *np,
 
         max_binding =  data->maxbinding;
 
-        clk_data = kzalloc(sizeof(*clk_data) +
-                                  sizeof(*clk_data->hws) * max_binding,
-                                  GFP_KERNEL);
+        clk_data = kzalloc(struct_size(clk_data, hws, max_binding),
+                           GFP_KERNEL);
         if (!clk_data)
                 return -ENOMEM;
 
diff --git a/drivers/clk/davinci/da8xx-cfgchip.c b/drivers/clk/davinci/da8xx-cfgchip.c
index c971111d2601..aae62a5b8734 100644
--- a/drivers/clk/davinci/da8xx-cfgchip.c
+++ b/drivers/clk/davinci/da8xx-cfgchip.c
@@ -650,8 +650,8 @@ static int of_da8xx_usb_phy_clk_init(struct device *dev, struct regmap *regmap)
         struct da8xx_usb0_clk48 *usb0;
         struct da8xx_usb1_clk48 *usb1;
 
-        clk_data = devm_kzalloc(dev, sizeof(*clk_data) + 2 *
-                                sizeof(*clk_data->hws), GFP_KERNEL);
+        clk_data = devm_kzalloc(dev, struct_size(clk_data, hws, 2),
+                                GFP_KERNEL);
         if (!clk_data)
                 return -ENOMEM;
 
diff --git a/drivers/clk/mvebu/armada-37xx-periph.c b/drivers/clk/mvebu/armada-37xx-periph.c
index 87213ea7fc84..6860bd5a37c5 100644
--- a/drivers/clk/mvebu/armada-37xx-periph.c
+++ b/drivers/clk/mvebu/armada-37xx-periph.c
@@ -667,9 +667,10 @@ static int armada_3700_periph_clock_probe(struct platform_device *pdev)
         if (!driver_data)
                 return -ENOMEM;
 
-        driver_data->hw_data = devm_kzalloc(dev, sizeof(*driver_data->hw_data) +
-                            sizeof(*driver_data->hw_data->hws) * num_periph,
-                            GFP_KERNEL);
+        driver_data->hw_data = devm_kzalloc(dev,
+                                            struct_size(driver_data->hw_data,
+                                                        hws, num_periph),
+                                            GFP_KERNEL);
         if (!driver_data->hw_data)
                 return -ENOMEM;
         driver_data->hw_data->num = num_periph;
diff --git a/drivers/clk/mvebu/armada-37xx-tbg.c b/drivers/clk/mvebu/armada-37xx-tbg.c
index aa80db11f543..7ff041f73b55 100644
--- a/drivers/clk/mvebu/armada-37xx-tbg.c
+++ b/drivers/clk/mvebu/armada-37xx-tbg.c
@@ -91,8 +91,8 @@ static int armada_3700_tbg_clock_probe(struct platform_device *pdev)
         void __iomem *reg;
         int i, ret;
 
-        hw_tbg_data = devm_kzalloc(&pdev->dev, sizeof(*hw_tbg_data)
-                                   + sizeof(*hw_tbg_data->hws) * NUM_TBG,
+        hw_tbg_data = devm_kzalloc(&pdev->dev,
+                                   struct_size(hw_tbg_data, hws, NUM_TBG),
                                    GFP_KERNEL);
         if (!hw_tbg_data)
                 return -ENOMEM;
diff --git a/drivers/clk/qcom/clk-spmi-pmic-div.c b/drivers/clk/qcom/clk-spmi-pmic-div.c
index 8672ab84746f..c90dfdd6c147 100644
--- a/drivers/clk/qcom/clk-spmi-pmic-div.c
+++ b/drivers/clk/qcom/clk-spmi-pmic-div.c
@@ -239,8 +239,7 @@ static int spmi_pmic_clkdiv_probe(struct platform_device *pdev)
         if (!nclks)
                 return -EINVAL;
 
-        cc = devm_kzalloc(dev, sizeof(*cc) + sizeof(*cc->clks) * nclks,
-                          GFP_KERNEL);
+        cc = devm_kzalloc(dev, struct_size(cc, clks, nclks), GFP_KERNEL);
         if (!cc)
                 return -ENOMEM;
         cc->nclks = nclks;
diff --git a/drivers/clk/samsung/clk-exynos-audss.c b/drivers/clk/samsung/clk-exynos-audss.c
index b4b057c7301c..f659c5cbf1d5 100644
--- a/drivers/clk/samsung/clk-exynos-audss.c
+++ b/drivers/clk/samsung/clk-exynos-audss.c
@@ -149,8 +149,8 @@ static int exynos_audss_clk_probe(struct platform_device *pdev)
         epll = ERR_PTR(-ENODEV);
 
         clk_data = devm_kzalloc(dev,
-                                sizeof(*clk_data) +
-                                sizeof(*clk_data->hws) * EXYNOS_AUDSS_MAX_CLKS,
+                                struct_size(clk_data, hws,
+                                            EXYNOS_AUDSS_MAX_CLKS),
                                 GFP_KERNEL);
         if (!clk_data)
                 return -ENOMEM;
diff --git a/drivers/clk/samsung/clk-exynos-clkout.c b/drivers/clk/samsung/clk-exynos-clkout.c
index f29fb5824005..9c95390d2d77 100644
--- a/drivers/clk/samsung/clk-exynos-clkout.c
+++ b/drivers/clk/samsung/clk-exynos-clkout.c
@@ -61,8 +61,7 @@ static void __init exynos_clkout_init(struct device_node *node, u32 mux_mask)
         int ret;
         int i;
 
-        clkout = kzalloc(sizeof(*clkout) +
-                         sizeof(*clkout->data.hws) * EXYNOS_CLKOUT_NR_CLKS,
+        clkout = kzalloc(struct_size(clkout, data.hws, EXYNOS_CLKOUT_NR_CLKS),
                          GFP_KERNEL);
         if (!clkout)
                 return;
diff --git a/drivers/clk/samsung/clk-exynos5433.c b/drivers/clk/samsung/clk-exynos5433.c
index 5305ace514b2..162de44df099 100644
--- a/drivers/clk/samsung/clk-exynos5433.c
+++ b/drivers/clk/samsung/clk-exynos5433.c
@@ -5505,8 +5505,8 @@ static int __init exynos5433_cmu_probe(struct platform_device *pdev)
 
         info = of_device_get_match_data(dev);
 
-        data = devm_kzalloc(dev, sizeof(*data) +
-                            sizeof(*data->ctx.clk_data.hws) * info->nr_clk_ids,
+        data = devm_kzalloc(dev,
+                            struct_size(data, ctx.clk_data.hws, info->nr_clk_ids),
                             GFP_KERNEL);
         if (!data)
                 return -ENOMEM;
diff --git a/drivers/clk/samsung/clk-s3c2410-dclk.c b/drivers/clk/samsung/clk-s3c2410-dclk.c
index 077df3e539a7..66a904758761 100644
--- a/drivers/clk/samsung/clk-s3c2410-dclk.c
+++ b/drivers/clk/samsung/clk-s3c2410-dclk.c
@@ -247,9 +247,10 @@ static int s3c24xx_dclk_probe(struct platform_device *pdev)
         struct clk_hw **clk_table;
         int ret, i;
 
-        s3c24xx_dclk = devm_kzalloc(&pdev->dev, sizeof(*s3c24xx_dclk) +
-                            sizeof(*s3c24xx_dclk->clk_data.hws) * DCLK_MAX_CLKS,
-                            GFP_KERNEL);
+        s3c24xx_dclk = devm_kzalloc(&pdev->dev,
+                                    struct_size(s3c24xx_dclk, clk_data.hws,
+                                                DCLK_MAX_CLKS),
+                                    GFP_KERNEL);
         if (!s3c24xx_dclk)
                 return -ENOMEM;
 
diff --git a/drivers/clk/samsung/clk-s5pv210-audss.c b/drivers/clk/samsung/clk-s5pv210-audss.c
index b9641414ddc6..22b18e728b88 100644
--- a/drivers/clk/samsung/clk-s5pv210-audss.c
+++ b/drivers/clk/samsung/clk-s5pv210-audss.c
@@ -81,8 +81,7 @@ static int s5pv210_audss_clk_probe(struct platform_device *pdev)
         }
 
         clk_data = devm_kzalloc(&pdev->dev,
-                                sizeof(*clk_data) +
-                                sizeof(*clk_data->hws) * AUDSS_MAX_CLKS,
+                                struct_size(clk_data, hws, AUDSS_MAX_CLKS),
                                 GFP_KERNEL);
 
         if (!clk_data)