rtc: Use devm_platform_ioremap_resource()
authorMarkus Elfring <elfring@users.sourceforge.net>
Sat, 21 Sep 2019 09:49:01 +0000 (11:49 +0200)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Sun, 6 Oct 2019 19:04:51 +0000 (21:04 +0200)
Simplify probe by using a known wrapper function.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Link: https://lore.kernel.org/r/4552ef52-f218-93b1-6dfa-668d137676f8@web.de
Link: https://lore.kernel.org/r/5ecfcf43-d6b2-1a38-dee8-b8806f30bc83@web.de
Link: https://lore.kernel.org/r/25448e11-c43f-9ae0-4c43-6f789accc026@web.de
Reviewed-by: Akinobu Mita <akinobu.mita@gmail.com>
Link: https://lore.kernel.org/r/8c17a59c-82ff-aa6b-5653-a38d786d3e83@web.de
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/rtc-fsl-ftm-alarm.c
drivers/rtc/rtc-goldfish.c
drivers/rtc/rtc-m48t86.c
drivers/rtc/rtc-r7301.c

index 8df2075..b83f7af 100644 (file)
@@ -248,7 +248,6 @@ static const struct rtc_class_ops ftm_rtc_ops = {
 static int ftm_rtc_probe(struct platform_device *pdev)
 {
        struct device_node *np = pdev->dev.of_node;
-       struct resource *r;
        int irq;
        int ret;
        struct ftm_rtc *rtc;
@@ -265,13 +264,7 @@ static int ftm_rtc_probe(struct platform_device *pdev)
        if (IS_ERR(rtc->rtc_dev))
                return PTR_ERR(rtc->rtc_dev);
 
-       r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!r) {
-               dev_err(&pdev->dev, "cannot get resource for rtc\n");
-               return -ENODEV;
-       }
-
-       rtc->base = devm_ioremap_resource(&pdev->dev, r);
+       rtc->base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(rtc->base)) {
                dev_err(&pdev->dev, "cannot ioremap resource for rtc\n");
                return PTR_ERR(rtc->base);
index 1a3420e..cb6b0ad 100644 (file)
@@ -165,7 +165,6 @@ static const struct rtc_class_ops goldfish_rtc_ops = {
 static int goldfish_rtc_probe(struct platform_device *pdev)
 {
        struct goldfish_rtc *rtcdrv;
-       struct resource *r;
        int err;
 
        rtcdrv = devm_kzalloc(&pdev->dev, sizeof(*rtcdrv), GFP_KERNEL);
@@ -173,12 +172,7 @@ static int goldfish_rtc_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        platform_set_drvdata(pdev, rtcdrv);
-
-       r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!r)
-               return -ENODEV;
-
-       rtcdrv->base = devm_ioremap_resource(&pdev->dev, r);
+       rtcdrv->base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(rtcdrv->base))
                return -ENODEV;
 
index 59b54ed..75a0e73 100644 (file)
@@ -218,7 +218,6 @@ static bool m48t86_verify_chip(struct platform_device *pdev)
 static int m48t86_rtc_probe(struct platform_device *pdev)
 {
        struct m48t86_rtc_info *info;
-       struct resource *res;
        unsigned char reg;
        int err;
        struct nvmem_config m48t86_nvmem_cfg = {
@@ -235,17 +234,11 @@ static int m48t86_rtc_probe(struct platform_device *pdev)
        if (!info)
                return -ENOMEM;
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!res)
-               return -ENODEV;
-       info->index_reg = devm_ioremap_resource(&pdev->dev, res);
+       info->index_reg = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(info->index_reg))
                return PTR_ERR(info->index_reg);
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-       if (!res)
-               return -ENODEV;
-       info->data_reg = devm_ioremap_resource(&pdev->dev, res);
+       info->data_reg = devm_platform_ioremap_resource(pdev, 1);
        if (IS_ERR(info->data_reg))
                return PTR_ERR(info->data_reg);
 
index 2498278..aaf1b95 100644 (file)
@@ -354,21 +354,16 @@ static void rtc7301_init(struct rtc7301_priv *priv)
 
 static int __init rtc7301_rtc_probe(struct platform_device *dev)
 {
-       struct resource *res;
        void __iomem *regs;
        struct rtc7301_priv *priv;
        struct rtc_device *rtc;
        int ret;
 
-       res = platform_get_resource(dev, IORESOURCE_MEM, 0);
-       if (!res)
-               return -ENODEV;
-
        priv = devm_kzalloc(&dev->dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;
 
-       regs = devm_ioremap_resource(&dev->dev, res);
+       regs = devm_platform_ioremap_resource(dev, 0);
        if (IS_ERR(regs))
                return PTR_ERR(regs);