diff options
author | Ulf Hansson <ulf.hansson@linaro.org> | 2016-09-21 09:38:53 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-09-23 19:54:29 -0400 |
commit | eefdee07074db61764408583a23e96cf60d5a0a7 (patch) | |
tree | 0b25e41deafa808cde49c18556376e6943208864 | |
parent | adb560b3ee395ac9688a93582d805edec4c3d3e7 (diff) |
PM / Domains: Rename pm_genpd_sync_poweron|poweroff()
These are internal static functions to genpd. Let's conform to the naming
rules, by dropping the "pm_" prefix from these.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r-- | drivers/base/power/domain.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index d52709e40817..e023066e4215 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c | |||
@@ -617,7 +617,7 @@ static bool genpd_dev_active_wakeup(struct generic_pm_domain *genpd, | |||
617 | } | 617 | } |
618 | 618 | ||
619 | /** | 619 | /** |
620 | * pm_genpd_sync_poweroff - Synchronously power off a PM domain and its masters. | 620 | * genpd_sync_poweroff - Synchronously power off a PM domain and its masters. |
621 | * @genpd: PM domain to power off, if possible. | 621 | * @genpd: PM domain to power off, if possible. |
622 | * | 622 | * |
623 | * Check if the given PM domain can be powered off (during system suspend or | 623 | * Check if the given PM domain can be powered off (during system suspend or |
@@ -628,7 +628,7 @@ static bool genpd_dev_active_wakeup(struct generic_pm_domain *genpd, | |||
628 | * executed sequentially, so it is guaranteed that it will never run twice in | 628 | * executed sequentially, so it is guaranteed that it will never run twice in |
629 | * parallel). | 629 | * parallel). |
630 | */ | 630 | */ |
631 | static void pm_genpd_sync_poweroff(struct generic_pm_domain *genpd) | 631 | static void genpd_sync_poweroff(struct generic_pm_domain *genpd) |
632 | { | 632 | { |
633 | struct gpd_link *link; | 633 | struct gpd_link *link; |
634 | 634 | ||
@@ -647,12 +647,12 @@ static void pm_genpd_sync_poweroff(struct generic_pm_domain *genpd) | |||
647 | 647 | ||
648 | list_for_each_entry(link, &genpd->slave_links, slave_node) { | 648 | list_for_each_entry(link, &genpd->slave_links, slave_node) { |
649 | genpd_sd_counter_dec(link->master); | 649 | genpd_sd_counter_dec(link->master); |
650 | pm_genpd_sync_poweroff(link->master); | 650 | genpd_sync_poweroff(link->master); |
651 | } | 651 | } |
652 | } | 652 | } |
653 | 653 | ||
654 | /** | 654 | /** |
655 | * pm_genpd_sync_poweron - Synchronously power on a PM domain and its masters. | 655 | * genpd_sync_poweron - Synchronously power on a PM domain and its masters. |
656 | * @genpd: PM domain to power on. | 656 | * @genpd: PM domain to power on. |
657 | * | 657 | * |
658 | * This function is only called in "noirq" and "syscore" stages of system power | 658 | * This function is only called in "noirq" and "syscore" stages of system power |
@@ -660,7 +660,7 @@ static void pm_genpd_sync_poweroff(struct generic_pm_domain *genpd) | |||
660 | * executed sequentially, so it is guaranteed that it will never run twice in | 660 | * executed sequentially, so it is guaranteed that it will never run twice in |
661 | * parallel). | 661 | * parallel). |
662 | */ | 662 | */ |
663 | static void pm_genpd_sync_poweron(struct generic_pm_domain *genpd) | 663 | static void genpd_sync_poweron(struct generic_pm_domain *genpd) |
664 | { | 664 | { |
665 | struct gpd_link *link; | 665 | struct gpd_link *link; |
666 | 666 | ||
@@ -668,7 +668,7 @@ static void pm_genpd_sync_poweron(struct generic_pm_domain *genpd) | |||
668 | return; | 668 | return; |
669 | 669 | ||
670 | list_for_each_entry(link, &genpd->slave_links, slave_node) { | 670 | list_for_each_entry(link, &genpd->slave_links, slave_node) { |
671 | pm_genpd_sync_poweron(link->master); | 671 | genpd_sync_poweron(link->master); |
672 | genpd_sd_counter_inc(link->master); | 672 | genpd_sd_counter_inc(link->master); |
673 | } | 673 | } |
674 | 674 | ||
@@ -784,7 +784,7 @@ static int pm_genpd_suspend_noirq(struct device *dev) | |||
784 | * the same PM domain, so it is not necessary to use locking here. | 784 | * the same PM domain, so it is not necessary to use locking here. |
785 | */ | 785 | */ |
786 | genpd->suspended_count++; | 786 | genpd->suspended_count++; |
787 | pm_genpd_sync_poweroff(genpd); | 787 | genpd_sync_poweroff(genpd); |
788 | 788 | ||
789 | return 0; | 789 | return 0; |
790 | } | 790 | } |
@@ -814,7 +814,7 @@ static int pm_genpd_resume_noirq(struct device *dev) | |||
814 | * guaranteed that this function will never run twice in parallel for | 814 | * guaranteed that this function will never run twice in parallel for |
815 | * the same PM domain, so it is not necessary to use locking here. | 815 | * the same PM domain, so it is not necessary to use locking here. |
816 | */ | 816 | */ |
817 | pm_genpd_sync_poweron(genpd); | 817 | genpd_sync_poweron(genpd); |
818 | genpd->suspended_count--; | 818 | genpd->suspended_count--; |
819 | 819 | ||
820 | if (genpd->dev_ops.stop && genpd->dev_ops.start) | 820 | if (genpd->dev_ops.stop && genpd->dev_ops.start) |
@@ -902,12 +902,12 @@ static int pm_genpd_restore_noirq(struct device *dev) | |||
902 | if (genpd->suspended_count++ == 0) | 902 | if (genpd->suspended_count++ == 0) |
903 | /* | 903 | /* |
904 | * The boot kernel might put the domain into arbitrary state, | 904 | * The boot kernel might put the domain into arbitrary state, |
905 | * so make it appear as powered off to pm_genpd_sync_poweron(), | 905 | * so make it appear as powered off to genpd_sync_poweron(), |
906 | * so that it tries to power it on in case it was really off. | 906 | * so that it tries to power it on in case it was really off. |
907 | */ | 907 | */ |
908 | genpd->status = GPD_STATE_POWER_OFF; | 908 | genpd->status = GPD_STATE_POWER_OFF; |
909 | 909 | ||
910 | pm_genpd_sync_poweron(genpd); | 910 | genpd_sync_poweron(genpd); |
911 | 911 | ||
912 | if (genpd->dev_ops.stop && genpd->dev_ops.start) | 912 | if (genpd->dev_ops.stop && genpd->dev_ops.start) |
913 | ret = pm_runtime_force_resume(dev); | 913 | ret = pm_runtime_force_resume(dev); |
@@ -962,9 +962,9 @@ static void genpd_syscore_switch(struct device *dev, bool suspend) | |||
962 | 962 | ||
963 | if (suspend) { | 963 | if (suspend) { |
964 | genpd->suspended_count++; | 964 | genpd->suspended_count++; |
965 | pm_genpd_sync_poweroff(genpd); | 965 | genpd_sync_poweroff(genpd); |
966 | } else { | 966 | } else { |
967 | pm_genpd_sync_poweron(genpd); | 967 | genpd_sync_poweron(genpd); |
968 | genpd->suspended_count--; | 968 | genpd->suspended_count--; |
969 | } | 969 | } |
970 | } | 970 | } |