rtc: sh: use local variables in probe() for mapping IO

No need to store the resource for the registers in the per-device struct
because we only need it during probe. Remove some unneeded unlikely()
while here and correct the type of 'regsize'.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20250227134256.9167-17-wsa+renesas@sang-engineering.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
index 033bdfc83e427713760ee21fec7e888eec9987b1..3bafb2a0659db3e1c3f5e1540c3a954df343de57 100644 (file)
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
@@ -86,8 +86,6 @@
 
 struct sh_rtc {
        void __iomem            *regbase;
-       unsigned long           regsize;
-       struct resource         *res;
        int                     alarm_irq;
        struct clk              *clk;
        struct rtc_device       *rtc_dev;
@@ -328,10 +326,11 @@ static const struct rtc_class_ops sh_rtc_ops = {
 static int __init sh_rtc_probe(struct platform_device *pdev)
 {
        struct sh_rtc *rtc;
-       struct resource *res;
+       struct resource *res, *req_res;
        char clk_name[14];
        int clk_id, ret;
        unsigned int tmp;
+       resource_size_t regsize;
 
        rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL);
        if (unlikely(!rtc))
@@ -353,20 +352,18 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
        if (!res)
                res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (unlikely(res == NULL)) {
+       if (!res) {
                dev_err(&pdev->dev, "No IO resource\n");
                return -ENOENT;
        }
 
-       rtc->regsize = resource_size(res);
-
-       rtc->res = devm_request_mem_region(&pdev->dev, res->start,
-                                       rtc->regsize, pdev->name);
-       if (unlikely(!rtc->res))
+       regsize = resource_size(res);
+       req_res = devm_request_mem_region(&pdev->dev, res->start, regsize, pdev->name);
+       if (!req_res)
                return -EBUSY;
 
-       rtc->regbase = devm_ioremap(&pdev->dev, rtc->res->start, rtc->regsize);
-       if (unlikely(!rtc->regbase))
+       rtc->regbase = devm_ioremap(&pdev->dev, req_res->start, regsize);
+       if (!rtc->regbase)
                return -EINVAL;
 
        if (!pdev->dev.of_node) {