nvmem: rockchip-otp: alloc clks with main struct
Subsystems (2)
PATCH 1/1 nvmem: rockchip-otp: alloc clks with main struct
Use a flexible array member to simplify allocation slightly. No need for a separate calloc.
Signed-off-by Rosen Penev <[email protected]>
--- drivers/nvmem/rockchip-otp.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/nvmem/rockchip-otp.c +2 -7
@@ -78,9 +78,9 @@ struct rockchip_data {struct rockchip_otp {struct device *dev;void __iomem *base; -struct clk_bulk_data *clks;struct reset_control *rst;const struct rockchip_data *data; +struct clk_bulk_data clks[]; };static int rockchip_otp_reset (struct rockchip_otp *otp)
@@ -424,7 +424,7 @@ static int rockchip_otp_probe(struct platform_device *pdev)if (!data)return dev_err_probe (dev, -EINVAL ,"failed to get match data\n" ); - otp =devm_kzalloc (&pdev->dev,sizeof (struct rockchip_otp ), + otp =devm_kzalloc (&pdev->dev,struct_size (otp, clks, data->num_clks),GFP_KERNEL );if (!otp)return -ENOMEM ;
@@ -436,11 +436,6 @@ static int rockchip_otp_probe(struct platform_device *pdev)return dev_err_probe (dev,PTR_ERR (otp->base),"failed to ioremap resource\n" ); - otp->clks =devm_kcalloc (dev, data->num_clks,sizeof (*otp->clks), -GFP_KERNEL ); -if (!otp->clks) -return -ENOMEM ; -for (i =0 ; i < data->num_clks; ++i) otp->clks[i].id = data->clks[i];
Signature · 1 line
2.53.0
Quoted 4 lines · Rosen Penev
Use a flexible array member to simplify allocation slightly. No need for a separate calloc.
Applied, thanks!
[1/1] nvmem: rockchip-otp: alloc clks with main struct
commit: 44cf48f1f7c5061e65c48c782b79df6e7f8e0668
Best regards,
Signature · 1 line
Srinivas Kandagatla <[email protected]>