2014-04-28 19:51:01

by Alan

[permalink] [raw]
Subject: [PATCH] goldfish bus: don't call request_mem_region

This is a bug fix that has been lurking in the Google tree but not pushed
upstream.

From: Octavian Purdila <[email protected]>

The memory region is already reserved in goldfish_init() during
platform init.

Signed-off-by: Octavian Purdila <[email protected]>
Signed-off-by: Jun Tian <[email protected]>
Signed-off-by: Alan Cox <[email protected]>
---
drivers/platform/goldfish/pdev_bus.c | 5 -----
1 file changed, 5 deletions(-)

diff --git a/drivers/platform/goldfish/pdev_bus.c b/drivers/platform/goldfish/pdev_bus.c
index 92cc4cf..4eb2bb3 100644
--- a/drivers/platform/goldfish/pdev_bus.c
+++ b/drivers/platform/goldfish/pdev_bus.c
@@ -184,11 +184,6 @@ static int goldfish_pdev_bus_probe(struct platform_device *pdev)
pdev_bus_addr = r->start;
pdev_bus_len = resource_size(r);

- if (request_mem_region(pdev_bus_addr, pdev_bus_len, "goldfish")) {
- dev_err(&pdev->dev, "unable to reserve Goldfish MMIO.\n");
- return -EBUSY;
- }
-
pdev_bus_base = ioremap(pdev_bus_addr, pdev_bus_len);
if (pdev_bus_base == NULL) {
ret = -ENOMEM;