summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-06-10 08:36:50 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-06-10 08:36:50 -0700
commit8b2dcebae330fb6dffc7717b740aa4b2c4d00451 (patch)
treeb06e50612a08248dccfcfc7f3d08906ba4771333 /drivers/base
parent987aec39a74373c55c3bedd5c3c83896d78fd0a2 (diff)
Revert "base/platform: Remove code duplication"
This reverts commit 6d9d4b1469b0d9748145e168fc9ec585e1f3f4b0 as it breaks working machines. Cc: Rob Herring <robh@kernel.org> Cc: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/platform.c60
1 files changed, 35 insertions, 25 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index cba8e0e83bfc..5a29387e5ff6 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -298,25 +298,6 @@ int platform_device_add_data(struct platform_device *pdev, const void *data,
}
EXPORT_SYMBOL_GPL(platform_device_add_data);
-static void platform_device_cleanout(struct platform_device *pdev, int n_res)
-{
- int i;
-
- if (pdev->id_auto) {
- ida_simple_remove(&platform_devid_ida, pdev->id);
- pdev->id = PLATFORM_DEVID_AUTO;
- }
-
- for (i = 0; i < n_res; i++) {
- struct resource *r = &pdev->resource[i];
- unsigned long type = resource_type(r);
-
- if ((type == IORESOURCE_MEM || type == IORESOURCE_IO) &&
- r->parent)
- release_resource(r);
- }
-}
-
/**
* platform_device_add - add a platform device to device hierarchy
* @pdev: platform device we're adding
@@ -390,8 +371,23 @@ int platform_device_add(struct platform_device *pdev)
dev_name(&pdev->dev), dev_name(pdev->dev.parent));
ret = device_add(&pdev->dev);
- if (ret)
- platform_device_cleanout(pdev, i);
+ if (ret == 0)
+ return ret;
+
+ /* Failure path */
+ if (pdev->id_auto) {
+ ida_simple_remove(&platform_devid_ida, pdev->id);
+ pdev->id = PLATFORM_DEVID_AUTO;
+ }
+
+ while (--i >= 0) {
+ struct resource *r = &pdev->resource[i];
+ unsigned long type = resource_type(r);
+
+ if ((type == IORESOURCE_MEM || type == IORESOURCE_IO) &&
+ r->parent)
+ release_resource(r);
+ }
return ret;
}
@@ -407,11 +403,25 @@ EXPORT_SYMBOL_GPL(platform_device_add);
*/
void platform_device_del(struct platform_device *pdev)
{
- if (!pdev)
- return;
+ int i;
+
+ if (pdev) {
+ device_del(&pdev->dev);
- device_del(&pdev->dev);
- platform_device_cleanout(pdev, pdev->num_resources);
+ if (pdev->id_auto) {
+ ida_simple_remove(&platform_devid_ida, pdev->id);
+ pdev->id = PLATFORM_DEVID_AUTO;
+ }
+
+ for (i = 0; i < pdev->num_resources; i++) {
+ struct resource *r = &pdev->resource[i];
+ unsigned long type = resource_type(r);
+
+ if ((type == IORESOURCE_MEM || type == IORESOURCE_IO) &&
+ r->parent)
+ release_resource(r);
+ }
+ }
}
EXPORT_SYMBOL_GPL(platform_device_del);