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 <octavian.purdila@intel.com>

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

Signed-off-by: Octavian Purdila <octavian.purdila@intel.com>
Signed-off-by: Jun Tian <jun.j.tian@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/platform/goldfish/pdev_bus.c b/drivers/platform/goldfish/pdev_bus.c
index 92cc4cfafde581eb7fe56fb6a11c3c0000465755..4eb2bb34790d250a7054cc841adb2019eb892249 100644 (file)
--- 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;