| Message ID | 1595926999-14934-1-git-send-email-peng.fan@nxp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/2] clk: imx: imx8m: avoid memory leak | expand |
Quoting peng.fan@nxp.com (2020-07-28 02:03:18) > From: Peng Fan <peng.fan@nxp.com> > > Use devm_kzalloc() to avoid memory leak when probe fail. > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > --- Reviewed-by: Stephen Boyd <sboyd@kernel.org>
On Tue, Jul 28, 2020 at 05:03:18PM +0800, peng.fan@nxp.com wrote: > From: Peng Fan <peng.fan@nxp.com> > > Use devm_kzalloc() to avoid memory leak when probe fail. > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > --- > > V2: > Add () to functions in commit log > > drivers/clk/imx/clk-imx8mm.c | 3 +-- > drivers/clk/imx/clk-imx8mn.c | 15 +++++---------- > drivers/clk/imx/clk-imx8mp.c | 2 +- > drivers/clk/imx/clk-imx8mq.c | 3 +-- > 4 files changed, 8 insertions(+), 15 deletions(-) > > diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c > index b793264c21c6..b43dbe305e7a 100644 > --- a/drivers/clk/imx/clk-imx8mm.c > +++ b/drivers/clk/imx/clk-imx8mm.c > @@ -306,8 +306,7 @@ static int imx8mm_clocks_probe(struct platform_device *pdev) > void __iomem *base; > int ret, i; > > - clk_hw_data = kzalloc(struct_size(clk_hw_data, hws, > - IMX8MM_CLK_END), GFP_KERNEL); > + clk_hw_data = devm_kzalloc(dev, struct_size(clk_hw_data, hws, IMX8MM_CLK_END), GFP_KERNEL); > if (WARN_ON(!clk_hw_data)) > return -ENOMEM; > > diff --git a/drivers/clk/imx/clk-imx8mn.c b/drivers/clk/imx/clk-imx8mn.c > index 213cc37b3173..4189f7f6980e 100644 > --- a/drivers/clk/imx/clk-imx8mn.c > +++ b/drivers/clk/imx/clk-imx8mn.c > @@ -299,8 +299,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) > void __iomem *base; > int ret, i; > > - clk_hw_data = kzalloc(struct_size(clk_hw_data, hws, > - IMX8MN_CLK_END), GFP_KERNEL); > + clk_hw_data = devm_kzalloc(dev, struct_size(clk_hw_data, hws, IMX8MN_CLK_END), GFP_KERNEL); > if (WARN_ON(!clk_hw_data)) > return -ENOMEM; > > @@ -318,10 +317,8 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) > np = of_find_compatible_node(NULL, NULL, "fsl,imx8mn-anatop"); > base = of_iomap(np, 0); > of_node_put(np); > - if (WARN_ON(!base)) { > - ret = -ENOMEM; > - goto unregister_hws; > - } > + if (WARN_ON(!base)) > + return -ENOMEM; > > hws[IMX8MN_AUDIO_PLL1_REF_SEL] = imx_clk_hw_mux("audio_pll1_ref_sel", base + 0x0, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); > hws[IMX8MN_AUDIO_PLL2_REF_SEL] = imx_clk_hw_mux("audio_pll2_ref_sel", base + 0x14, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); > @@ -407,10 +404,8 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) > > np = dev->of_node; > base = devm_platform_ioremap_resource(pdev, 0); > - if (WARN_ON(IS_ERR(base))) { > - ret = PTR_ERR(base); > - goto unregister_hws; > - } > + if (WARN_ON(IS_ERR(base))) > + return PTR_ERR(base); How is this related to devm_kzalloc() change? Shawn > > /* CORE */ > hws[IMX8MN_CLK_A53_DIV] = imx8m_clk_hw_composite_core("arm_a53_div", imx8mn_a53_sels, base + 0x8000); > diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c > index ca747712400f..f6ec7b2b8038 100644 > --- a/drivers/clk/imx/clk-imx8mp.c > +++ b/drivers/clk/imx/clk-imx8mp.c > @@ -447,7 +447,7 @@ static int imx8mp_clocks_probe(struct platform_device *pdev) > return PTR_ERR(ccm_base); > } > > - clk_hw_data = kzalloc(struct_size(clk_hw_data, hws, IMX8MP_CLK_END), GFP_KERNEL); > + clk_hw_data = devm_kzalloc(dev, struct_size(clk_hw_data, hws, IMX8MP_CLK_END), GFP_KERNEL); > if (WARN_ON(!clk_hw_data)) { > iounmap(anatop_base); > return -ENOMEM; > diff --git a/drivers/clk/imx/clk-imx8mq.c b/drivers/clk/imx/clk-imx8mq.c > index a64aace213c2..0106a33c24a4 100644 > --- a/drivers/clk/imx/clk-imx8mq.c > +++ b/drivers/clk/imx/clk-imx8mq.c > @@ -288,8 +288,7 @@ static int imx8mq_clocks_probe(struct platform_device *pdev) > void __iomem *base; > int err, i; > > - clk_hw_data = kzalloc(struct_size(clk_hw_data, hws, > - IMX8MQ_CLK_END), GFP_KERNEL); > + clk_hw_data = devm_kzalloc(dev, struct_size(clk_hw_data, hws, IMX8MQ_CLK_END), GFP_KERNEL); > if (WARN_ON(!clk_hw_data)) > return -ENOMEM; > > -- > 2.16.4 >
diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c index b793264c21c6..b43dbe305e7a 100644 --- a/drivers/clk/imx/clk-imx8mm.c +++ b/drivers/clk/imx/clk-imx8mm.c @@ -306,8 +306,7 @@ static int imx8mm_clocks_probe(struct platform_device *pdev) void __iomem *base; int ret, i; - clk_hw_data = kzalloc(struct_size(clk_hw_data, hws, - IMX8MM_CLK_END), GFP_KERNEL); + clk_hw_data = devm_kzalloc(dev, struct_size(clk_hw_data, hws, IMX8MM_CLK_END), GFP_KERNEL); if (WARN_ON(!clk_hw_data)) return -ENOMEM; diff --git a/drivers/clk/imx/clk-imx8mn.c b/drivers/clk/imx/clk-imx8mn.c index 213cc37b3173..4189f7f6980e 100644 --- a/drivers/clk/imx/clk-imx8mn.c +++ b/drivers/clk/imx/clk-imx8mn.c @@ -299,8 +299,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) void __iomem *base; int ret, i; - clk_hw_data = kzalloc(struct_size(clk_hw_data, hws, - IMX8MN_CLK_END), GFP_KERNEL); + clk_hw_data = devm_kzalloc(dev, struct_size(clk_hw_data, hws, IMX8MN_CLK_END), GFP_KERNEL); if (WARN_ON(!clk_hw_data)) return -ENOMEM; @@ -318,10 +317,8 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) np = of_find_compatible_node(NULL, NULL, "fsl,imx8mn-anatop"); base = of_iomap(np, 0); of_node_put(np); - if (WARN_ON(!base)) { - ret = -ENOMEM; - goto unregister_hws; - } + if (WARN_ON(!base)) + return -ENOMEM; hws[IMX8MN_AUDIO_PLL1_REF_SEL] = imx_clk_hw_mux("audio_pll1_ref_sel", base + 0x0, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); hws[IMX8MN_AUDIO_PLL2_REF_SEL] = imx_clk_hw_mux("audio_pll2_ref_sel", base + 0x14, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); @@ -407,10 +404,8 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) np = dev->of_node; base = devm_platform_ioremap_resource(pdev, 0); - if (WARN_ON(IS_ERR(base))) { - ret = PTR_ERR(base); - goto unregister_hws; - } + if (WARN_ON(IS_ERR(base))) + return PTR_ERR(base); /* CORE */ hws[IMX8MN_CLK_A53_DIV] = imx8m_clk_hw_composite_core("arm_a53_div", imx8mn_a53_sels, base + 0x8000); diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c index ca747712400f..f6ec7b2b8038 100644 --- a/drivers/clk/imx/clk-imx8mp.c +++ b/drivers/clk/imx/clk-imx8mp.c @@ -447,7 +447,7 @@ static int imx8mp_clocks_probe(struct platform_device *pdev) return PTR_ERR(ccm_base); } - clk_hw_data = kzalloc(struct_size(clk_hw_data, hws, IMX8MP_CLK_END), GFP_KERNEL); + clk_hw_data = devm_kzalloc(dev, struct_size(clk_hw_data, hws, IMX8MP_CLK_END), GFP_KERNEL); if (WARN_ON(!clk_hw_data)) { iounmap(anatop_base); return -ENOMEM; diff --git a/drivers/clk/imx/clk-imx8mq.c b/drivers/clk/imx/clk-imx8mq.c index a64aace213c2..0106a33c24a4 100644 --- a/drivers/clk/imx/clk-imx8mq.c +++ b/drivers/clk/imx/clk-imx8mq.c @@ -288,8 +288,7 @@ static int imx8mq_clocks_probe(struct platform_device *pdev) void __iomem *base; int err, i; - clk_hw_data = kzalloc(struct_size(clk_hw_data, hws, - IMX8MQ_CLK_END), GFP_KERNEL); + clk_hw_data = devm_kzalloc(dev, struct_size(clk_hw_data, hws, IMX8MQ_CLK_END), GFP_KERNEL); if (WARN_ON(!clk_hw_data)) return -ENOMEM;