This is an automated email from the ASF dual-hosted git repository. pkarashchenko pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 5cc4f22b436f865974fdaf1cfd9b311727001971 Author: zhuyanlin <[email protected]> AuthorDate: Mon Feb 14 14:42:02 2022 +0800 power/governor: Remove the duplicated function prototype since they are declared include/nuttx/power/pm.h by: commit 5ce181e6b702cedbd79790fbe40aab7d29dae7c0 Author: zhuyanlin <[email protected]> Date: Mon Feb 14 15:32:40 2022 +0800 power:govorner: add govorner to per domain. For mult domains scene,, activity and greety can be used at same time. Let user to select domain governor. Signed-off-by: zhuyanlin <[email protected]> and add static const to g_pmgovernor Signed-off-by: zhuyanlin <[email protected]> --- drivers/power/activity_governor.c | 4 ++-- drivers/power/activity_governor.h | 6 ------ drivers/power/greedy_governor.c | 2 +- drivers/power/greedy_governor.h | 17 ----------------- drivers/power/pm_initialize.c | 6 ------ 5 files changed, 3 insertions(+), 32 deletions(-) diff --git a/drivers/power/activity_governor.c b/drivers/power/activity_governor.c index dcd44c1bfc..c124e52b9b 100644 --- a/drivers/power/activity_governor.c +++ b/drivers/power/activity_governor.c @@ -188,7 +188,7 @@ struct pm_activity_governor_s g_pm_activity_governor = #endif }; -static struct pm_governor_s g_pmgovernor = +static const struct pm_governor_s g_pmgovernor = { governor_initialize, /* initialize */ NULL, /* deinitialize */ @@ -594,7 +594,7 @@ static void governor_timer(int domain) * Public Functions ****************************************************************************/ -FAR struct pm_governor_s *pm_activity_governor_initialize(void) +FAR const struct pm_governor_s *pm_activity_governor_initialize(void) { return &g_pmgovernor; } diff --git a/drivers/power/activity_governor.h b/drivers/power/activity_governor.h index b997834b92..9478d99c57 100644 --- a/drivers/power/activity_governor.h +++ b/drivers/power/activity_governor.h @@ -176,12 +176,6 @@ extern "C" #define EXTERN extern #endif -/**************************************************************************** - * Public Function Prototypes - ****************************************************************************/ - -FAR struct pm_governor_s *pm_activity_governor_initialize(void); - #undef EXTERN #ifdef __cplusplus } diff --git a/drivers/power/greedy_governor.c b/drivers/power/greedy_governor.c index 43c839db05..1ba7000114 100644 --- a/drivers/power/greedy_governor.c +++ b/drivers/power/greedy_governor.c @@ -62,7 +62,7 @@ static enum pm_state_e greedy_governor_checkstate(int domain); * Private Data ****************************************************************************/ -static struct pm_governor_s g_greedy_governor_ops = +static const struct pm_governor_s g_greedy_governor_ops = { greedy_governor_initialize, /* initialize */ NULL, /* deinitialize */ diff --git a/drivers/power/greedy_governor.h b/drivers/power/greedy_governor.h index 96bac1b239..9694cc4b80 100644 --- a/drivers/power/greedy_governor.h +++ b/drivers/power/greedy_governor.h @@ -41,23 +41,6 @@ extern "C" #define EXTERN extern #endif -/**************************************************************************** - * Public Function Prototypes - ****************************************************************************/ - -/**************************************************************************** - * Name: pm_greedy_governor_register - * - * Description: - * Return the greedy governor instance. - * - * Returned Value: - * A pointer to the governor struct. Otherwise NULL is returned on error. - * - ****************************************************************************/ - -FAR const struct pm_governor_s *pm_greedy_governor_initialize(void); - #undef EXTERN #ifdef __cplusplus } diff --git a/drivers/power/pm_initialize.c b/drivers/power/pm_initialize.c index fc458eb148..0207bb79ff 100644 --- a/drivers/power/pm_initialize.c +++ b/drivers/power/pm_initialize.c @@ -28,12 +28,6 @@ #include "pm.h" -#if defined(CONFIG_PM_GOVERNOR_ACTIVITY) -# include "activity_governor.h" -#elif defined(CONFIG_PM_GOVERNOR_GREEDY) -# include "greedy_governor.h" -#endif - #ifdef CONFIG_PM /****************************************************************************
