2 files changed, 31 insertions, 15 deletions

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 1091af1cbb58..95ecfc490d54 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -168,7 +168,7 @@ struct platform_device *platform_device_alloc(const char *name, unsigned int id)
                 pa->pdev.dev.release = platform_device_release;
         }
 
-        return pa ? &pa->pdev : NULL;   
+        return pa ? &pa->pdev : NULL;
 }
 EXPORT_SYMBOL_GPL(platform_device_alloc);
 
@@ -282,24 +282,13 @@ int platform_device_add(struct platform_device *pdev)
 EXPORT_SYMBOL_GPL(platform_device_add);
 
 /**
- *      platform_device_register - add a platform-level device
- *      @pdev:  platform device we're adding
- *
- */
-int platform_device_register(struct platform_device * pdev)
-{
-        device_initialize(&pdev->dev);
-        return platform_device_add(pdev);
-}
-
-/**
- *      platform_device_unregister - remove a platform-level device
+ *      platform_device_del - remove a platform-level device
  *      @pdev:  platform device we're removing
  *
  *      Note that this function will also release all memory- and port-based
  *      resources owned by the device (@dev->resource).
  */
-void platform_device_unregister(struct platform_device * pdev)
+void platform_device_del(struct platform_device *pdev)
 {
         int i;
 
@@ -310,9 +299,35 @@ void platform_device_unregister(struct platform_device * pdev)
                                 release_resource(r);
                 }
 
-                device_unregister(&pdev->dev);
+                device_del(&pdev->dev);
         }
 }
+EXPORT_SYMBOL_GPL(platform_device_del);
+
+/**
+ *      platform_device_register - add a platform-level device
+ *      @pdev:  platform device we're adding
+ *
+ */
+int platform_device_register(struct platform_device * pdev)
+{
+        device_initialize(&pdev->dev);
+        return platform_device_add(pdev);
+}
+
+/**
+ *      platform_device_unregister - unregister a platform-level device
+ *      @pdev:  platform device we're unregistering
+ *
+ *      Unregistration is done in 2 steps. Fisrt we release all resources
+ *      and remove it from the sybsystem, then we drop reference count by
+ *      calling platform_device_put().
+ */
+void platform_device_unregister(struct platform_device * pdev)
+{
+        platform_device_del(pdev);
+        platform_device_put(pdev);
+}
 
 /**
  *      platform_device_register_simple
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index 17e336f40b47..782090c68932 100644
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -41,6 +41,7 @@ extern struct platform_device *platform_device_alloc(const char *name, unsigned
 extern int platform_device_add_resources(struct platform_device *pdev, struct resource *res, unsigned int num);
 extern int platform_device_add_data(struct platform_device *pdev, void *data, size_t size);
 extern int platform_device_add(struct platform_device *pdev);
+extern void platform_device_del(struct platform_device *pdev);
 extern void platform_device_put(struct platform_device *pdev);
 
 struct platform_driver {