[15/16] cpufreq: interactive: Move definition of cpufreq_gov_interactive downwards

Message ID b39aca3d3ad339ad34602fd3a92d4101b933316d.1368696171.git.viresh.kumar@linaro.org
State Accepted
Headers show

Commit Message

Viresh Kumar May 16, 2013, 9:28 a.m.
This moves definition of cpufreq_gov_interactive towards the bottom of file, so
that we don't have to add prototype of cpufreq_governor_interactive() in the
beginning of file.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
 drivers/cpufreq/cpufreq_interactive.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

Comments

Todd Poynor June 2, 2013, 7 p.m. | #1
Will merge, thanks.

On Thu, May 16, 2013 at 2:28 AM, Viresh Kumar <viresh.kumar@linaro.org> wrote:
> This moves definition of cpufreq_gov_interactive towards the bottom of file, so
> that we don't have to add prototype of cpufreq_governor_interactive() in the
> beginning of file.
>
> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
> ---
>  drivers/cpufreq/cpufreq_interactive.c | 23 ++++++++++-------------
>  1 file changed, 10 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/cpufreq/cpufreq_interactive.c b/drivers/cpufreq/cpufreq_interactive.c
> index baa5638..8821873 100644
> --- a/drivers/cpufreq/cpufreq_interactive.c
> +++ b/drivers/cpufreq/cpufreq_interactive.c
> @@ -115,19 +115,6 @@ static int timer_slack_val = DEFAULT_TIMER_SLACK;
>
>  static bool io_is_busy;
>
> -static int cpufreq_governor_interactive(struct cpufreq_policy *policy,
> -               unsigned int event);
> -
> -#ifndef CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE
> -static
> -#endif
> -struct cpufreq_governor cpufreq_gov_interactive = {
> -       .name = "interactive",
> -       .governor = cpufreq_governor_interactive,
> -       .max_transition_latency = 10000000,
> -       .owner = THIS_MODULE,
> -};
> -
>  static void cpufreq_interactive_timer_resched(
>         struct cpufreq_interactive_cpuinfo *pcpu)
>  {
> @@ -1083,6 +1070,16 @@ static int cpufreq_governor_interactive(struct cpufreq_policy *policy,
>         return 0;
>  }
>
> +#ifndef CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE
> +static
> +#endif
> +struct cpufreq_governor cpufreq_gov_interactive = {
> +       .name = "interactive",
> +       .governor = cpufreq_governor_interactive,
> +       .max_transition_latency = 10000000,
> +       .owner = THIS_MODULE,
> +};
> +
>  static void cpufreq_interactive_nop_timer(unsigned long data)
>  {
>  }
> --
> 1.7.12.rc2.18.g61b472e
>
Viresh Kumar June 12, 2013, 8:25 a.m. | #2
On 3 June 2013 00:30, Todd Poynor <toddpoynor@google.com> wrote:
> Will merge, thanks.

Hi Todd,

What about the last patch? and first 12 patches too :)

Patch

diff --git a/drivers/cpufreq/cpufreq_interactive.c b/drivers/cpufreq/cpufreq_interactive.c
index baa5638..8821873 100644
--- a/drivers/cpufreq/cpufreq_interactive.c
+++ b/drivers/cpufreq/cpufreq_interactive.c
@@ -115,19 +115,6 @@  static int timer_slack_val = DEFAULT_TIMER_SLACK;
 
 static bool io_is_busy;
 
-static int cpufreq_governor_interactive(struct cpufreq_policy *policy,
-		unsigned int event);
-
-#ifndef CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE
-static
-#endif
-struct cpufreq_governor cpufreq_gov_interactive = {
-	.name = "interactive",
-	.governor = cpufreq_governor_interactive,
-	.max_transition_latency = 10000000,
-	.owner = THIS_MODULE,
-};
-
 static void cpufreq_interactive_timer_resched(
 	struct cpufreq_interactive_cpuinfo *pcpu)
 {
@@ -1083,6 +1070,16 @@  static int cpufreq_governor_interactive(struct cpufreq_policy *policy,
 	return 0;
 }
 
+#ifndef CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE
+static
+#endif
+struct cpufreq_governor cpufreq_gov_interactive = {
+	.name = "interactive",
+	.governor = cpufreq_governor_interactive,
+	.max_transition_latency = 10000000,
+	.owner = THIS_MODULE,
+};
+
 static void cpufreq_interactive_nop_timer(unsigned long data)
 {
 }