Commit dc890c2d authored by Linus Walleij's avatar Linus Walleij Committed by Russell King
Browse files

[ARM] 5544/1: Trust PrimeCell resource sizes 



I found the PrimeCell/AMBA Bus drivers distrusting the resource
passed in as part of the struct amba_device abstraction. This
patch removes all hard coded resource sizes found in the PrimeCell
drivers and move the responsibility of this definition back to
the platform/board device definition, which already exist and
appear to be correct for all in-tree users of these drivers.
We do this using the resource_size() inline function which was
also replicated in the only driver using the resource size, so
that has been changed too. The KMI_SIZE was left in kmi.h in case
someone likes it. Test-compiled against Versatile and Integrator
defconfigs, seems to work but I don't posess these boards and
cannot test them.

Signed-off-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 42578c82

drivers/input/serio/ambakmi.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static int amba_kmi_probe(struct amba_device *dev, struct amba_id *id) 
	io->dev.parent	= &dev->dev;



	kmi->io 	= io;

	kmi->base	= ioremap(dev->res.start, KMI_SIZE);

	kmi->base	= ioremap(dev->res.start, resource_size(&dev->res));

	if (!kmi->base) {

		ret = -ENOMEM;

		goto out;

drivers/mmc/host/mmci.c

+1 −1
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id) 
		host->mclk = clk_get_rate(host->clk);

		DBG(host, "eventual mclk rate: %u Hz\n", host->mclk);

	}

	host->base = ioremap(dev->res.start, SZ_4K);

	host->base = ioremap(dev->res.start, resource_size(&dev->res));

	if (!host->base) {

		ret = -ENOMEM;

		goto clk_disable;

drivers/rtc/rtc-pl030.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static int pl030_probe(struct amba_device *dev, struct amba_id *id) 
		goto err_rtc;

	}



	rtc->base = ioremap(dev->res.start, SZ_4K);

	rtc->base = ioremap(dev->res.start, resource_size(&dev->res));

	if (!rtc->base) {

		ret = -ENOMEM;

		goto err_map;

drivers/rtc/rtc-pl031.c

+1 −2
Original line number Diff line number Diff line
@@ -142,8 +142,7 @@ static int pl031_probe(struct amba_device *adev, struct amba_id *id) 
		goto out;

	}



	ldata->base = ioremap(adev->res.start,

			      adev->res.end - adev->res.start + 1);

	ldata->base = ioremap(adev->res.start, resource_size(&adev->res));

	if (!ldata->base) {

		ret = -ENOMEM;

		goto out_no_remap;

drivers/serial/amba-pl010.c

+1 −1
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ static int pl010_probe(struct amba_device *dev, struct amba_id *id) 
		goto out;

	}



	base = ioremap(dev->res.start, PAGE_SIZE);

	base = ioremap(dev->res.start, resource_size(&dev->res));

	if (!base) {

		ret = -ENOMEM;

		goto free;

CRA Git | Maintained and supported by SUSTech CRA and CCSE