| Message ID | 20200309123514.15543-1-tsbogend@alpha.franken.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | rtc: m48t35: remove SGI-IP27 kludge | expand |
On 09/03/2020 13:35:14+0100, Thomas Bogendoerfer wrote: > With the IOC3 MFD driver it's no longer necessary to special case SGI-IP27. > > Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> > --- > drivers/rtc/rtc-m48t35.c | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > Applied, thanks.
diff --git a/drivers/rtc/rtc-m48t35.c b/drivers/rtc/rtc-m48t35.c index e8194f1f01a8..92f19bf997b2 100644 --- a/drivers/rtc/rtc-m48t35.c +++ b/drivers/rtc/rtc-m48t35.c @@ -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)
With the IOC3 MFD driver it's no longer necessary to special case SGI-IP27. Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> --- drivers/rtc/rtc-m48t35.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)