rtc: armada38x: zalloc + calloc to single allocation

Use a flexible array member to simplify allocation.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Reviewed-by: Gregory CLEMENT <gregory.clement@bootlin.com>
Link: https://patch.msgid.link/20260304225329.24510-1-rosenp@gmail.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/drivers/rtc/rtc-armada38x.c b/drivers/rtc/rtc-armada38x.c
index 713fa0d077cde3a21bd41d5746f052ee5515a011..245290ae1a8de6c8c1ad360b1d39e066cb4c74c7 100644 (file)
--- a/drivers/rtc/rtc-armada38x.c
+++ b/drivers/rtc/rtc-armada38x.c
@@ -72,8 +72,8 @@ struct armada38x_rtc {
        spinlock_t          lock;
        int                 irq;
        bool                initialized;
-       struct value_to_freq *val_to_freq;
        const struct armada38x_rtc_data *data;
+       struct value_to_freq val_to_freq[];
 };
 
 #define ALARM1 0
@@ -490,18 +490,13 @@ static __init int armada38x_rtc_probe(struct platform_device *pdev)
 {
        struct armada38x_rtc *rtc;
 
-       rtc = devm_kzalloc(&pdev->dev, sizeof(struct armada38x_rtc),
+       rtc = devm_kzalloc(&pdev->dev, struct_size(rtc, val_to_freq, SAMPLE_NR),
                            GFP_KERNEL);
        if (!rtc)
                return -ENOMEM;
 
        rtc->data = of_device_get_match_data(&pdev->dev);
 
-       rtc->val_to_freq = devm_kcalloc(&pdev->dev, SAMPLE_NR,
-                               sizeof(struct value_to_freq), GFP_KERNEL);
-       if (!rtc->val_to_freq)
-               return -ENOMEM;
-
        spin_lock_init(&rtc->lock);
 
        rtc->regs = devm_platform_ioremap_resource_byname(pdev, "rtc");