Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / base / platform.c

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 5a29387e5ff63a6cce4a2761dd0c69557e0310d6..063f0ab152590dfeea4488d2686b8ff13b99a7bf 100644 (file)
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -332,7 +332,7 @@ int platform_device_add(struct platform_device *pdev)
                 */
                ret = ida_simple_get(&platform_devid_ida, 0, 0, GFP_KERNEL);
                if (ret < 0)
-                       return ret;
+                       goto err_out;
                pdev->id = ret;
                pdev->id_auto = true;
                dev_set_name(&pdev->dev, "%s.%d.auto", pdev->name, pdev->id);
@@ -340,31 +340,24 @@ int platform_device_add(struct platform_device *pdev)
        }
 
        for (i = 0; i < pdev->num_resources; i++) {
-               struct resource *conflict, *p, *r = &pdev->resource[i];
-               unsigned long type = resource_type(r);
+               struct resource *p, *r = &pdev->resource[i];
 
                if (r->name == NULL)
                        r->name = dev_name(&pdev->dev);
 
-               if (!(type == IORESOURCE_MEM || type == IORESOURCE_IO))
-                       continue;
-
                p = r->parent;
                if (!p) {
-                       if (type == IORESOURCE_MEM)
+                       if (resource_type(r) == IORESOURCE_MEM)
                                p = &iomem_resource;
-                       else if (type == IORESOURCE_IO)
+                       else if (resource_type(r) == IORESOURCE_IO)
                                p = &ioport_resource;
                }
 
-               conflict = insert_resource_conflict(p, r);
-               if (!conflict)
-                       continue;
-
-               dev_err(&pdev->dev,
-                       "ignoring resource %pR (conflicts with %s %pR)\n",
-                       r, conflict->name, conflict);
-               p->parent = NULL;
+               if (p && insert_resource(p, r)) {
+                       dev_err(&pdev->dev, "failed to claim resource %d\n", i);
+                       ret = -EBUSY;
+                       goto failed;
+               }
        }
 
        pr_debug("Registering platform device '%s'. Parent at %s\n",
@@ -374,7 +367,7 @@ int platform_device_add(struct platform_device *pdev)
        if (ret == 0)
                return ret;
 
-       /* Failure path */
+ failed:
        if (pdev->id_auto) {
                ida_simple_remove(&platform_devid_ida, pdev->id);
                pdev->id = PLATFORM_DEVID_AUTO;
@@ -384,11 +377,11 @@ int platform_device_add(struct platform_device *pdev)
                struct resource *r = &pdev->resource[i];
                unsigned long type = resource_type(r);
 
-               if ((type == IORESOURCE_MEM || type == IORESOURCE_IO) &&
-                               r->parent)
+               if (type == IORESOURCE_MEM || type == IORESOURCE_IO)
                        release_resource(r);
        }
 
+ err_out:
        return ret;
 }
 EXPORT_SYMBOL_GPL(platform_device_add);
@@ -417,8 +410,7 @@ void platform_device_del(struct platform_device *pdev)
                        struct resource *r = &pdev->resource[i];
                        unsigned long type = resource_type(r);
 
-                       if ((type == IORESOURCE_MEM || type == IORESOURCE_IO) &&
-                                       r->parent)
+                       if (type == IORESOURCE_MEM || type == IORESOURCE_IO)
                                release_resource(r);
                }
        }