diff mbox

cpufreq: Add dummy cpufreq_cpu_get/put for CONFIG_CPU_FREQ=n

Message ID 1381222571-20317-1-git-send-email-daniel.vetter@ffwll.ch (mailing list archive)
State Accepted, archived
Headers show

Commit Message

Daniel Vetter Oct. 8, 2013, 8:56 a.m. UTC
The drm/i915 driver wants to adjust it's own power policies using the
cpu policies as a guideline (we can implicitly boost the cpus through
the gpus on some platforms). To avoid a dreaded select (since a
depends will leave users wondering where where their driver has gone
too) add dummy functions.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Cc: kbuild test robot <fengguang.wu@intel.com>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: cpufreq@vger.kernel.org
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
A quick ack for merging this this through the drm-intel tree is
probably the simplest way forward.
-Daniel
---
 include/linux/cpufreq.h | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Rafael Wysocki Oct. 16, 2013, 11 p.m. UTC | #1
On Tuesday, October 08, 2013 10:56:11 AM Daniel Vetter wrote:
> The drm/i915 driver wants to adjust it's own power policies using the
> cpu policies as a guideline (we can implicitly boost the cpus through
> the gpus on some platforms). To avoid a dreaded select (since a
> depends will leave users wondering where where their driver has gone
> too) add dummy functions.
> 
> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> Cc: kbuild test robot <fengguang.wu@intel.com>
> Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
> Cc: Viresh Kumar <viresh.kumar@linaro.org>
> Cc: cpufreq@vger.kernel.org
> Cc: linux-pm@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> A quick ack for merging this this through the drm-intel tree is
> probably the simplest way forward.

Well, ACK, or please let me know if you want me to take this.

Thanks!

> ---
>  include/linux/cpufreq.h | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
> index fcabc42..5ad9a4e 100644
> --- a/include/linux/cpufreq.h
> +++ b/include/linux/cpufreq.h
> @@ -93,8 +93,16 @@ struct cpufreq_policy {
>  #define CPUFREQ_SHARED_TYPE_ALL	 (2) /* All dependent CPUs should set freq */
>  #define CPUFREQ_SHARED_TYPE_ANY	 (3) /* Freq can be set from any dependent CPU*/
>  
> +#ifdef CONFIG_CPU_FREQ
>  struct cpufreq_policy *cpufreq_cpu_get(unsigned int cpu);
>  void cpufreq_cpu_put(struct cpufreq_policy *policy);
> +#else
> +static inline struct cpufreq_policy *cpufreq_cpu_get(unsigned int cpu)
> +{
> +	return NULL;
> +}
> +static inline void cpufreq_cpu_put(struct cpufreq_policy *policy) { }
> +#endif
>  
>  static inline bool policy_is_shared(struct cpufreq_policy *policy)
>  {
>
Daniel Vetter Oct. 17, 2013, 7:08 a.m. UTC | #2
On Thu, Oct 17, 2013 at 01:00:42AM +0200, Rafael J. Wysocki wrote:
> On Tuesday, October 08, 2013 10:56:11 AM Daniel Vetter wrote:
> > The drm/i915 driver wants to adjust it's own power policies using the
> > cpu policies as a guideline (we can implicitly boost the cpus through
> > the gpus on some platforms). To avoid a dreaded select (since a
> > depends will leave users wondering where where their driver has gone
> > too) add dummy functions.
> > 
> > Reported-by: kbuild test robot <fengguang.wu@intel.com>
> > Cc: kbuild test robot <fengguang.wu@intel.com>
> > Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
> > Cc: Viresh Kumar <viresh.kumar@linaro.org>
> > Cc: cpufreq@vger.kernel.org
> > Cc: linux-pm@vger.kernel.org
> > Cc: linux-kernel@vger.kernel.org
> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> > ---
> > A quick ack for merging this this through the drm-intel tree is
> > probably the simplest way forward.
> 
> Well, ACK, or please let me know if you want me to take this.

I've merged it, thanks for tacking a quick look.
-Daniel
diff mbox

Patch

diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index fcabc42..5ad9a4e 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -93,8 +93,16 @@  struct cpufreq_policy {
 #define CPUFREQ_SHARED_TYPE_ALL	 (2) /* All dependent CPUs should set freq */
 #define CPUFREQ_SHARED_TYPE_ANY	 (3) /* Freq can be set from any dependent CPU*/
 
+#ifdef CONFIG_CPU_FREQ
 struct cpufreq_policy *cpufreq_cpu_get(unsigned int cpu);
 void cpufreq_cpu_put(struct cpufreq_policy *policy);
+#else
+static inline struct cpufreq_policy *cpufreq_cpu_get(unsigned int cpu)
+{
+	return NULL;
+}
+static inline void cpufreq_cpu_put(struct cpufreq_policy *policy) { }
+#endif
 
 static inline bool policy_is_shared(struct cpufreq_policy *policy)
 {