| From 2693f3ae83d1066e9b83faafa2a92c933aee9667 Mon Sep 17 00:00:00 2001 |
| From: "Rafael J. Wysocki" <rjw@sisk.pl> |
| Date: Thu, 23 Jun 2011 01:52:55 +0200 |
| Subject: PM / Domains: Rename struct dev_power_domain to struct dev_pm_domain |
| |
| The naming convention used by commit 7538e3db6e015e890825fbd9f86599b |
| (PM: Add support for device power domains), which introduced the |
| struct dev_power_domain type for representing device power domains, |
| evidently confuses some developers who tend to think that objects |
| of this type must correspond to "power domains" as defined by |
| hardware, which is not the case. Namely, at the kernel level, a |
| struct dev_power_domain object can represent arbitrary set of devices |
| that are mutually dependent power management-wise and need not belong |
| to one hardware power domain. To avoid that confusion, rename struct |
| dev_power_domain to struct dev_pm_domain and rename the related |
| pointers in struct device and struct pm_clk_notifier_block from |
| pwr_domain to pm_domain. |
| |
| Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> |
| Acked-by: Kevin Hilman <khilman@ti.com> |
| (cherry picked from commit 564b905ab10d17fb42f86aa8b7b9b796276d1336) |
| |
| Signed-off-by: Simon Horman <horms@verge.net.au> |
| --- |
| Documentation/power/devices.txt | 8 ++++---- |
| arch/arm/mach-omap1/pm_bus.c | 8 ++++---- |
| arch/arm/mach-shmobile/pm_runtime.c | 8 ++++---- |
| arch/arm/plat-omap/omap_device.c | 4 ++-- |
| arch/sh/kernel/cpu/shmobile/pm_runtime.c | 6 +++--- |
| drivers/base/power/clock_ops.c | 14 +++++++------- |
| drivers/base/power/main.c | 30 +++++++++++++++--------------- |
| drivers/base/power/runtime.c | 12 ++++++------ |
| include/linux/device.h | 4 ++-- |
| include/linux/pm.h | 2 +- |
| include/linux/pm_runtime.h | 2 +- |
| 11 files changed, 49 insertions(+), 49 deletions(-) |
| |
| --- a/Documentation/power/devices.txt |
| +++ b/Documentation/power/devices.txt |
| @@ -506,8 +506,8 @@ routines. Nevertheless, different callb |
| situation where it actually matters. |
| |
| |
| -Device Power Domains |
| --------------------- |
| +Device Power Management Domains |
| +------------------------------- |
| Sometimes devices share reference clocks or other power resources. In those |
| cases it generally is not possible to put devices into low-power states |
| individually. Instead, a set of devices sharing a power resource can be put |
| @@ -516,8 +516,8 @@ power resource. Of course, they also ne |
| together, by turning the shared power resource on. A set of devices with this |
| property is often referred to as a power domain. |
| |
| -Support for power domains is provided through the pwr_domain field of struct |
| -device. This field is a pointer to an object of type struct dev_power_domain, |
| +Support for power domains is provided through the pm_domain field of struct |
| +device. This field is a pointer to an object of type struct dev_pm_domain, |
| defined in include/linux/pm.h, providing a set of power management callbacks |
| analogous to the subsystem-level and device driver callbacks that are executed |
| for the given device during all power transitions, instead of the respective |
| --- a/arch/arm/mach-omap1/pm_bus.c |
| +++ b/arch/arm/mach-omap1/pm_bus.c |
| @@ -49,20 +49,20 @@ static int omap1_pm_runtime_resume(struc |
| return pm_generic_runtime_resume(dev); |
| } |
| |
| -static struct dev_power_domain default_power_domain = { |
| +static struct dev_pm_domain default_pm_domain = { |
| .ops = { |
| .runtime_suspend = omap1_pm_runtime_suspend, |
| .runtime_resume = omap1_pm_runtime_resume, |
| USE_PLATFORM_PM_SLEEP_OPS |
| }, |
| }; |
| -#define OMAP1_PWR_DOMAIN (&default_power_domain) |
| +#define OMAP1_PM_DOMAIN (&default_pm_domain) |
| #else |
| -#define OMAP1_PWR_DOMAIN NULL |
| +#define OMAP1_PM_DOMAIN NULL |
| #endif /* CONFIG_PM_RUNTIME */ |
| |
| static struct pm_clk_notifier_block platform_bus_notifier = { |
| - .pwr_domain = OMAP1_PWR_DOMAIN, |
| + .pm_domain = OMAP1_PM_DOMAIN, |
| .con_ids = { "ick", "fck", NULL, }, |
| }; |
| |
| --- a/arch/arm/mach-shmobile/pm_runtime.c |
| +++ b/arch/arm/mach-shmobile/pm_runtime.c |
| @@ -28,7 +28,7 @@ static int default_platform_runtime_idle |
| return pm_runtime_suspend(dev); |
| } |
| |
| -static struct dev_power_domain default_power_domain = { |
| +static struct dev_pm_domain default_pm_domain = { |
| .ops = { |
| .runtime_suspend = pm_runtime_clk_suspend, |
| .runtime_resume = pm_runtime_clk_resume, |
| @@ -37,16 +37,16 @@ static struct dev_power_domain default_p |
| }, |
| }; |
| |
| -#define DEFAULT_PWR_DOMAIN_PTR (&default_power_domain) |
| +#define DEFAULT_PM_DOMAIN_PTR (&default_pm_domain) |
| |
| #else |
| |
| -#define DEFAULT_PWR_DOMAIN_PTR NULL |
| +#define DEFAULT_PM_DOMAIN_PTR NULL |
| |
| #endif /* CONFIG_PM_RUNTIME */ |
| |
| static struct pm_clk_notifier_block platform_bus_notifier = { |
| - .pwr_domain = DEFAULT_PWR_DOMAIN_PTR, |
| + .pm_domain = DEFAULT_PM_DOMAIN_PTR, |
| .con_ids = { NULL, }, |
| }; |
| |
| --- a/arch/arm/plat-omap/omap_device.c |
| +++ b/arch/arm/plat-omap/omap_device.c |
| @@ -564,7 +564,7 @@ static int _od_runtime_resume(struct dev |
| return pm_generic_runtime_resume(dev); |
| } |
| |
| -static struct dev_power_domain omap_device_power_domain = { |
| +static struct dev_pm_domain omap_device_pm_domain = { |
| .ops = { |
| .runtime_suspend = _od_runtime_suspend, |
| .runtime_idle = _od_runtime_idle, |
| @@ -586,7 +586,7 @@ int omap_device_register(struct omap_dev |
| pr_debug("omap_device: %s: registering\n", od->pdev.name); |
| |
| od->pdev.dev.parent = &omap_device_parent; |
| - od->pdev.dev.pwr_domain = &omap_device_power_domain; |
| + od->pdev.dev.pm_domain = &omap_device_pm_domain; |
| return platform_device_register(&od->pdev); |
| } |
| |
| --- a/arch/sh/kernel/cpu/shmobile/pm_runtime.c |
| +++ b/arch/sh/kernel/cpu/shmobile/pm_runtime.c |
| @@ -256,7 +256,7 @@ out: |
| return ret; |
| } |
| |
| -static struct dev_power_domain default_power_domain = { |
| +static struct dev_pm_domain default_pm_domain = { |
| .ops = { |
| .runtime_suspend = default_platform_runtime_suspend, |
| .runtime_resume = default_platform_runtime_resume, |
| @@ -285,7 +285,7 @@ static int platform_bus_notify(struct no |
| hwblk_disable(hwblk_info, hwblk); |
| /* make sure driver re-inits itself once */ |
| __set_bit(PDEV_ARCHDATA_FLAG_INIT, &pdev->archdata.flags); |
| - dev->pwr_domain = &default_power_domain; |
| + dev->pm_domain = &default_pm_domain; |
| break; |
| /* TODO: add BUS_NOTIFY_BIND_DRIVER and increase idle count */ |
| case BUS_NOTIFY_BOUND_DRIVER: |
| @@ -299,7 +299,7 @@ static int platform_bus_notify(struct no |
| __set_bit(PDEV_ARCHDATA_FLAG_INIT, &pdev->archdata.flags); |
| break; |
| case BUS_NOTIFY_DEL_DEVICE: |
| - dev->pwr_domain = NULL; |
| + dev->pm_domain = NULL; |
| break; |
| } |
| return 0; |
| --- a/drivers/base/power/clock_ops.c |
| +++ b/drivers/base/power/clock_ops.c |
| @@ -278,11 +278,11 @@ int pm_runtime_clk_resume(struct device |
| * |
| * For this function to work, @nb must be a member of an object of type |
| * struct pm_clk_notifier_block containing all of the requisite data. |
| - * Specifically, the pwr_domain member of that object is copied to the device's |
| - * pwr_domain field and its con_ids member is used to populate the device's list |
| + * Specifically, the pm_domain member of that object is copied to the device's |
| + * pm_domain field and its con_ids member is used to populate the device's list |
| * of runtime PM clocks, depending on @action. |
| * |
| - * If the device's pwr_domain field is already populated with a value different |
| + * If the device's pm_domain field is already populated with a value different |
| * from the one stored in the struct pm_clk_notifier_block object, the function |
| * does nothing. |
| */ |
| @@ -300,14 +300,14 @@ static int pm_runtime_clk_notify(struct |
| |
| switch (action) { |
| case BUS_NOTIFY_ADD_DEVICE: |
| - if (dev->pwr_domain) |
| + if (dev->pm_domain) |
| break; |
| |
| error = pm_runtime_clk_init(dev); |
| if (error) |
| break; |
| |
| - dev->pwr_domain = clknb->pwr_domain; |
| + dev->pm_domain = clknb->pm_domain; |
| if (clknb->con_ids[0]) { |
| for (con_id = clknb->con_ids; *con_id; con_id++) |
| pm_runtime_clk_add(dev, *con_id); |
| @@ -317,10 +317,10 @@ static int pm_runtime_clk_notify(struct |
| |
| break; |
| case BUS_NOTIFY_DEL_DEVICE: |
| - if (dev->pwr_domain != clknb->pwr_domain) |
| + if (dev->pm_domain != clknb->pm_domain) |
| break; |
| |
| - dev->pwr_domain = NULL; |
| + dev->pm_domain = NULL; |
| pm_runtime_clk_destroy(dev); |
| break; |
| } |
| --- a/drivers/base/power/main.c |
| +++ b/drivers/base/power/main.c |
| @@ -425,9 +425,9 @@ static int device_resume_noirq(struct de |
| TRACE_DEVICE(dev); |
| TRACE_RESUME(0); |
| |
| - if (dev->pwr_domain) { |
| + if (dev->pm_domain) { |
| pm_dev_dbg(dev, state, "EARLY power domain "); |
| - error = pm_noirq_op(dev, &dev->pwr_domain->ops, state); |
| + error = pm_noirq_op(dev, &dev->pm_domain->ops, state); |
| } else if (dev->type && dev->type->pm) { |
| pm_dev_dbg(dev, state, "EARLY type "); |
| error = pm_noirq_op(dev, dev->type->pm, state); |
| @@ -521,9 +521,9 @@ static int device_resume(struct device * |
| if (!dev->power.is_suspended) |
| goto Unlock; |
| |
| - if (dev->pwr_domain) { |
| + if (dev->pm_domain) { |
| pm_dev_dbg(dev, state, "power domain "); |
| - error = pm_op(dev, &dev->pwr_domain->ops, state); |
| + error = pm_op(dev, &dev->pm_domain->ops, state); |
| goto End; |
| } |
| |
| @@ -641,10 +641,10 @@ static void device_complete(struct devic |
| { |
| device_lock(dev); |
| |
| - if (dev->pwr_domain) { |
| + if (dev->pm_domain) { |
| pm_dev_dbg(dev, state, "completing power domain "); |
| - if (dev->pwr_domain->ops.complete) |
| - dev->pwr_domain->ops.complete(dev); |
| + if (dev->pm_domain->ops.complete) |
| + dev->pm_domain->ops.complete(dev); |
| } else if (dev->type && dev->type->pm) { |
| pm_dev_dbg(dev, state, "completing type "); |
| if (dev->type->pm->complete) |
| @@ -744,9 +744,9 @@ static int device_suspend_noirq(struct d |
| { |
| int error; |
| |
| - if (dev->pwr_domain) { |
| + if (dev->pm_domain) { |
| pm_dev_dbg(dev, state, "LATE power domain "); |
| - error = pm_noirq_op(dev, &dev->pwr_domain->ops, state); |
| + error = pm_noirq_op(dev, &dev->pm_domain->ops, state); |
| if (error) |
| return error; |
| } else if (dev->type && dev->type->pm) { |
| @@ -853,9 +853,9 @@ static int __device_suspend(struct devic |
| goto Unlock; |
| } |
| |
| - if (dev->pwr_domain) { |
| + if (dev->pm_domain) { |
| pm_dev_dbg(dev, state, "power domain "); |
| - error = pm_op(dev, &dev->pwr_domain->ops, state); |
| + error = pm_op(dev, &dev->pm_domain->ops, state); |
| goto End; |
| } |
| |
| @@ -982,11 +982,11 @@ static int device_prepare(struct device |
| |
| device_lock(dev); |
| |
| - if (dev->pwr_domain) { |
| + if (dev->pm_domain) { |
| pm_dev_dbg(dev, state, "preparing power domain "); |
| - if (dev->pwr_domain->ops.prepare) |
| - error = dev->pwr_domain->ops.prepare(dev); |
| - suspend_report_result(dev->pwr_domain->ops.prepare, error); |
| + if (dev->pm_domain->ops.prepare) |
| + error = dev->pm_domain->ops.prepare(dev); |
| + suspend_report_result(dev->pm_domain->ops.prepare, error); |
| if (error) |
| goto End; |
| } else if (dev->type && dev->type->pm) { |
| --- a/drivers/base/power/runtime.c |
| +++ b/drivers/base/power/runtime.c |
| @@ -213,8 +213,8 @@ static int rpm_idle(struct device *dev, |
| |
| dev->power.idle_notification = true; |
| |
| - if (dev->pwr_domain) |
| - callback = dev->pwr_domain->ops.runtime_idle; |
| + if (dev->pm_domain) |
| + callback = dev->pm_domain->ops.runtime_idle; |
| else if (dev->type && dev->type->pm) |
| callback = dev->type->pm->runtime_idle; |
| else if (dev->class && dev->class->pm) |
| @@ -373,8 +373,8 @@ static int rpm_suspend(struct device *de |
| |
| __update_runtime_status(dev, RPM_SUSPENDING); |
| |
| - if (dev->pwr_domain) |
| - callback = dev->pwr_domain->ops.runtime_suspend; |
| + if (dev->pm_domain) |
| + callback = dev->pm_domain->ops.runtime_suspend; |
| else if (dev->type && dev->type->pm) |
| callback = dev->type->pm->runtime_suspend; |
| else if (dev->class && dev->class->pm) |
| @@ -574,8 +574,8 @@ static int rpm_resume(struct device *dev |
| |
| __update_runtime_status(dev, RPM_RESUMING); |
| |
| - if (dev->pwr_domain) |
| - callback = dev->pwr_domain->ops.runtime_resume; |
| + if (dev->pm_domain) |
| + callback = dev->pm_domain->ops.runtime_resume; |
| else if (dev->type && dev->type->pm) |
| callback = dev->type->pm->runtime_resume; |
| else if (dev->class && dev->class->pm) |
| --- a/include/linux/device.h |
| +++ b/include/linux/device.h |
| @@ -585,7 +585,7 @@ struct device_dma_parameters { |
| * minimizes board-specific #ifdefs in drivers. |
| * @power: For device power management. |
| * See Documentation/power/devices.txt for details. |
| - * @pwr_domain: Provide callbacks that are executed during system suspend, |
| + * @pm_domain: Provide callbacks that are executed during system suspend, |
| * hibernation, system resume and during runtime PM transitions |
| * along with subsystem-level and driver-level callbacks. |
| * @numa_node: NUMA node this device is close to. |
| @@ -636,7 +636,7 @@ struct device { |
| void *platform_data; /* Platform specific data, device |
| core doesn't touch it */ |
| struct dev_pm_info power; |
| - struct dev_power_domain *pwr_domain; |
| + struct dev_pm_domain *pm_domain; |
| |
| #ifdef CONFIG_NUMA |
| int numa_node; /* NUMA node this device is close to */ |
| --- a/include/linux/pm.h |
| +++ b/include/linux/pm.h |
| @@ -472,7 +472,7 @@ extern void update_pm_runtime_accounting |
| * hibernation, system resume and during runtime PM transitions along with |
| * subsystem-level and driver-level callbacks. |
| */ |
| -struct dev_power_domain { |
| +struct dev_pm_domain { |
| struct dev_pm_ops ops; |
| }; |
| |
| --- a/include/linux/pm_runtime.h |
| +++ b/include/linux/pm_runtime.h |
| @@ -247,7 +247,7 @@ static inline void pm_runtime_dont_use_a |
| |
| struct pm_clk_notifier_block { |
| struct notifier_block nb; |
| - struct dev_power_domain *pwr_domain; |
| + struct dev_pm_domain *pm_domain; |
| char *con_ids[]; |
| }; |
| |