Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c1d69ee authored by Julia Lawall's avatar Julia Lawall Committed by Linus Torvalds
Browse files

rtc: simplify devm_request_mem_region/devm_ioremap 



Convert the composition of devm_request_mem_region and devm_ioremap to a
single call to devm_ioremap_resource.  The associated call to
platform_get_resource is also simplified and moved next to the new call
to devm_ioremap_resource.

This was done using a combination of the semantic patches
devm_ioremap_resource.cocci and devm_request_and_ioremap.cocci, found in
the scripts/coccinelle/api directory.

In rtc-lpc32xx.c and rtc-mv.c, the local variable size is no longer needed.

In rtc-ds1511.c the size field of the local structure is not useful any
more, and is deleted.

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1735be4b

drivers/rtc/rtc-ds1511.c

+5 −12
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ enum ds1511reg { 
struct rtc_plat_data {

	struct rtc_device *rtc;

	void __iomem *ioaddr;		/* virtual base address */

	int size;				/* amount of memory mapped */

	int irq;

	unsigned int irqen;

	int alrm_sec;
@@ -479,20 +478,14 @@ static int ds1511_rtc_probe(struct platform_device *pdev) 
	struct rtc_plat_data *pdata;

	int ret = 0;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res)

		return -ENODEV;



	pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);

	if (!pdata)

		return -ENOMEM;

	pdata->size = resource_size(res);

	if (!devm_request_mem_region(&pdev->dev, res->start, pdata->size,

			pdev->name))

		return -EBUSY;

	ds1511_base = devm_ioremap(&pdev->dev, res->start, pdata->size);

	if (!ds1511_base)

		return -ENOMEM;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	ds1511_base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(ds1511_base))

		return PTR_ERR(ds1511_base);

	pdata->ioaddr = ds1511_base;

	pdata->irq = platform_get_irq(pdev, 0);

drivers/rtc/rtc-ds1553.c

+4 −9
Original line number Diff line number Diff line
@@ -285,19 +285,14 @@ static int ds1553_rtc_probe(struct platform_device *pdev) 
	void __iomem *ioaddr;

	int ret = 0;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res)

		return -ENODEV;

	pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);

	if (!pdata)

		return -ENOMEM;

	if (!devm_request_mem_region(&pdev->dev, res->start, RTC_REG_SIZE,

			pdev->name))

		return -EBUSY;



	ioaddr = devm_ioremap(&pdev->dev, res->start, RTC_REG_SIZE);

	if (!ioaddr)

		return -ENOMEM;

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	ioaddr = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(ioaddr))

		return PTR_ERR(ioaddr);

	pdata->ioaddr = ioaddr;

	pdata->irq = platform_get_irq(pdev, 0);

drivers/rtc/rtc-ep93xx.c

+3 −11
Original line number Diff line number Diff line
@@ -138,17 +138,9 @@ static int ep93xx_rtc_probe(struct platform_device *pdev) 
		return -ENOMEM;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res)

		return -ENXIO;



	if (!devm_request_mem_region(&pdev->dev, res->start,

				     resource_size(res), pdev->name))

		return -EBUSY;



	ep93xx_rtc->mmio_base = devm_ioremap(&pdev->dev, res->start,

					     resource_size(res));

	if (!ep93xx_rtc->mmio_base)

		return -ENXIO;

	ep93xx_rtc->mmio_base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(ep93xx_rtc->mmio_base))

		return PTR_ERR(ep93xx_rtc->mmio_base);



	pdev->dev.platform_data = ep93xx_rtc;

	platform_set_drvdata(pdev, ep93xx_rtc);

drivers/rtc/rtc-imxdi.c

+4 −12
Original line number Diff line number Diff line
@@ -375,24 +375,16 @@ static int __init dryice_rtc_probe(struct platform_device *pdev) 
	struct imxdi_dev *imxdi;

	int rc;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res)

		return -ENODEV;



	imxdi = devm_kzalloc(&pdev->dev, sizeof(*imxdi), GFP_KERNEL);

	if (!imxdi)

		return -ENOMEM;



	imxdi->pdev = pdev;



	if (!devm_request_mem_region(&pdev->dev, res->start, resource_size(res),

				pdev->name))

		return -EBUSY;



	imxdi->ioaddr = devm_ioremap(&pdev->dev, res->start,

			resource_size(res));

	if (imxdi->ioaddr == NULL)

		return -ENOMEM;

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	imxdi->ioaddr = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(imxdi->ioaddr))

		return PTR_ERR(imxdi->ioaddr);



	spin_lock_init(&imxdi->irq_lock);

drivers/rtc/rtc-lpc32xx.c

+4 −20
Original line number Diff line number Diff line
@@ -201,16 +201,9 @@ static int lpc32xx_rtc_probe(struct platform_device *pdev) 
{

	struct resource *res;

	struct lpc32xx_rtc *rtc;

	resource_size_t size;

	int rtcirq;

	u32 tmp;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(&pdev->dev, "Can't get memory resource\n");

		return -ENOENT;

	}



	rtcirq = platform_get_irq(pdev, 0);

	if (rtcirq < 0 || rtcirq >= NR_IRQS) {

		dev_warn(&pdev->dev, "Can't get interrupt resource\n");
@@ -224,19 +217,10 @@ static int lpc32xx_rtc_probe(struct platform_device *pdev) 
	}

	rtc->irq = rtcirq;



	size = resource_size(res);



	if (!devm_request_mem_region(&pdev->dev, res->start, size,

				     pdev->name)) {

		dev_err(&pdev->dev, "RTC registers are not free\n");

		return -EBUSY;

	}



	rtc->rtc_base = devm_ioremap(&pdev->dev, res->start, size);

	if (!rtc->rtc_base) {

		dev_err(&pdev->dev, "Can't map memory\n");

		return -ENOMEM;

	}

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	rtc->rtc_base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(rtc->rtc_base))

		return PTR_ERR(rtc->rtc_base);



	spin_lock_init(&rtc->lock);