rtc: m48t35: remove SGI-IP27 kludge
authorThomas Bogendoerfer <tsbogend@alpha.franken.de>
Mon, 9 Mar 2020 12:35:14 +0000 (13:35 +0100)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Mon, 16 Mar 2020 10:12:11 +0000 (11:12 +0100)
With the IOC3 MFD driver it's no longer necessary to special case SGI-IP27.

Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Link: https://lore.kernel.org/r/20200309123514.15543-1-tsbogend@alpha.franken.de
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/rtc-m48t35.c

index e8194f1f01a8ba88dc8501d286720cb5ea52e69b..92f19bf997b2f8fd46027d43162dae26f89645da 100644 (file)
@@ -160,15 +160,10 @@ static int m48t35_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        priv->size = resource_size(res);
-       /*
-        * kludge: remove the #ifndef after ioc3 resource
-        * conflicts are resolved
-        */
-#ifndef CONFIG_SGI_IP27
        if (!devm_request_mem_region(&pdev->dev, res->start, priv->size,
                                     pdev->name))
                return -EBUSY;
-#endif
+
        priv->baseaddr = res->start;
        priv->reg = devm_ioremap(&pdev->dev, priv->baseaddr, priv->size);
        if (!priv->reg)