Driver core: add platform_device_del function
Having platform_device_del90 allows more straightforward error
handling code in drivers registering platform devices.
Signed-off-by: Dmitry Torokhov <[email protected]>
---
drivers/base/platform.c | 45 ++++++++++++++++++++++++++--------------
include/linux/platform_device.h | 1
2 files changed, 31 insertions(+), 15 deletions(-)
Index: work/drivers/base/platform.c
===================================================================
--- work.orig/drivers/base/platform.c
+++ work/drivers/base/platform.c
@@ -168,7 +168,7 @@ struct platform_device *platform_device_
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_
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 p
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
Index: work/include/linux/platform_device.h
===================================================================
--- work.orig/include/linux/platform_device.h
+++ work/include/linux/platform_device.h
@@ -41,6 +41,7 @@ extern struct platform_device *platform_
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 {
Hi Dmirty,
> Driver core: add platform_device_del function
>
> Having platform_device_del90 allows more straightforward error
> handling code in drivers registering platform devices.
> (...)
> +/**
> + * 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
Typo: subsystem.
> + * calling platform_device_put().
> + */
Other than that, and let alone the fact that I prefer code cleanups as
separate patches, and the fact that I don't think moving
platform_device_register() around adds much value, this patch looks
good to me.
Thanks,
--
Jean Delvare
Hi Jean,
On Saturday 10 December 2005 11:58, Jean Delvare wrote:
> Hi Dmirty,
>
> > Driver core: add platform_device_del function
> >
> > Having platform_device_del90 allows more straightforward error
> > handling code in drivers registering platform devices.
> > (...)
> > +/**
> > + * 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
>
> Typo: subsystem.
Will fix, thank you for noticing.
>
> > + * calling platform_device_put().
> > + */
>
> Other than that, and let alone the fact that I prefer code cleanups as
> separate patches, and the fact that I don't think moving
> platform_device_register() around adds much value, this patch looks
> good to me.
>
It was not moved ;) platform_device_register() is and was in front of
platform_device_unregister. But because the new platform_device_del()
reused most of the platform_device_unregister() body patch plays a trick
on you making you believe that some code was moved around.
--
Dmitry