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

Commit 2064af91 authored by Kevin Hilman's avatar Kevin Hilman Committed by Rafael J. Wysocki
Browse files

PM: Revert "driver core: platform_bus: allow runtime override of dev_pm_ops" 



The platform_bus_set_pm_ops() operation is deprecated in favor of the
new device power domain infrastructre implemented in commit
7538e3db (PM: add support for device
power domains)

Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 600b776e

drivers/base/platform.c

+0 −35
Original line number Diff line number Diff line
@@ -916,41 +916,6 @@ struct bus_type platform_bus_type = { 
};

EXPORT_SYMBOL_GPL(platform_bus_type);



/**

 * platform_bus_get_pm_ops() - return pointer to busses dev_pm_ops

 *

 * This function can be used by platform code to get the current

 * set of dev_pm_ops functions used by the platform_bus_type.

 */

const struct dev_pm_ops * __init platform_bus_get_pm_ops(void)

{

	return platform_bus_type.pm;

}



/**

 * platform_bus_set_pm_ops() - update dev_pm_ops for the platform_bus_type

 *

 * @pm: pointer to new dev_pm_ops struct to be used for platform_bus_type

 *

 * Platform code can override the dev_pm_ops methods of

 * platform_bus_type by using this function.  It is expected that

 * platform code will first do a platform_bus_get_pm_ops(), then

 * kmemdup it, then customize selected methods and pass a pointer to

 * the new struct dev_pm_ops to this function.

 *

 * Since platform-specific code is customizing methods for *all*

 * devices (not just platform-specific devices) it is expected that

 * any custom overrides of these functions will keep existing behavior

 * and simply extend it.  For example, any customization of the

 * runtime PM methods should continue to call the pm_generic_*

 * functions as the default ones do in addition to the

 * platform-specific behavior.

 */

void __init platform_bus_set_pm_ops(const struct dev_pm_ops *pm)

{

	platform_bus_type.pm = pm;

}



int __init platform_bus_init(void)

{

	int error;

include/linux/platform_device.h

+0 −3
Original line number Diff line number Diff line
@@ -150,9 +150,6 @@ extern struct platform_device *platform_create_bundle(struct platform_driver *dr 
					struct resource *res, unsigned int n_res,

					const void *data, size_t size);



extern const struct dev_pm_ops * platform_bus_get_pm_ops(void);

extern void platform_bus_set_pm_ops(const struct dev_pm_ops *pm);



/* early platform driver interface */

struct early_platform_driver {

	const char *class_str;