Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93ce3061 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Greg Kroah-Hartman
Browse files

[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: default avatarDmitry Torokhov <dtor@mail.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e39b8433

drivers/base/platform.c

+30 −15
Original line number Diff line number Diff line
@@ -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

include/linux/platform_device.h

+1 −0
Original line number Diff line number Diff line
@@ -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 {