[PATCH] Driver Core: Add platform_device_del()

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 <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Dmitry Torokhov 2005-12-10 01:36:27 -05:00 committed by Greg Kroah-Hartman
parent e39b84337b
commit 93ce3061be
2 changed files with 32 additions and 16 deletions

View File

@ -168,7 +168,7 @@ struct platform_device *platform_device_alloc(const char *name, unsigned int id)
pa->pdev.dev.release = platform_device_release; pa->pdev.dev.release = platform_device_release;
} }
return pa ? &pa->pdev : NULL; return pa ? &pa->pdev : NULL;
} }
EXPORT_SYMBOL_GPL(platform_device_alloc); EXPORT_SYMBOL_GPL(platform_device_alloc);
@ -281,6 +281,29 @@ int platform_device_add(struct platform_device *pdev)
} }
EXPORT_SYMBOL_GPL(platform_device_add); EXPORT_SYMBOL_GPL(platform_device_add);
/**
* 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_del(struct platform_device *pdev)
{
int i;
if (pdev) {
for (i = 0; i < pdev->num_resources; i++) {
struct resource *r = &pdev->resource[i];
if (r->flags & (IORESOURCE_MEM|IORESOURCE_IO))
release_resource(r);
}
device_del(&pdev->dev);
}
}
EXPORT_SYMBOL_GPL(platform_device_del);
/** /**
* platform_device_register - add a platform-level device * platform_device_register - add a platform-level device
* @pdev: platform device we're adding * @pdev: platform device we're adding
@ -293,25 +316,17 @@ int platform_device_register(struct platform_device * pdev)
} }
/** /**
* platform_device_unregister - remove a platform-level device * platform_device_unregister - unregister a platform-level device
* @pdev: platform device we're removing * @pdev: platform device we're unregistering
* *
* Note that this function will also release all memory- and port-based * Unregistration is done in 2 steps. Fisrt we release all resources
* resources owned by the device (@dev->resource). * and remove it from the sybsystem, then we drop reference count by
* calling platform_device_put().
*/ */
void platform_device_unregister(struct platform_device * pdev) void platform_device_unregister(struct platform_device * pdev)
{ {
int i; platform_device_del(pdev);
platform_device_put(pdev);
if (pdev) {
for (i = 0; i < pdev->num_resources; i++) {
struct resource *r = &pdev->resource[i];
if (r->flags & (IORESOURCE_MEM|IORESOURCE_IO))
release_resource(r);
}
device_unregister(&pdev->dev);
}
} }
/** /**

View File

@ -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_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_data(struct platform_device *pdev, void *data, size_t size);
extern int platform_device_add(struct platform_device *pdev); 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); extern void platform_device_put(struct platform_device *pdev);
struct platform_driver { struct platform_driver {