* PM / OPP: Fix build when CONFIG_PM_OPP is not set
@ 2011-11-02 17:00 Tony Lindgren
2011-11-03 0:21 ` Rafael J. Wysocki
0 siblings, 1 reply; 2+ messages in thread
From: Tony Lindgren @ 2011-11-02 17:00 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Kevin Hilman, linux-kernel, Kyungmin Park, MyungJoo Ham, linux-pm,
linux-omap
Commit 03ca370fbf7b76d6d002380dbdc2cdc2319f9c80 (PM / OPP: Add
OPP availability change notifier) does not compile if CONFIG_PM_OPP
is not set:
arch/arm/plat-omap/omap-pm-noop.o: In function `opp_get_notifier':
include/linux/opp.h:103: multiple definition of `opp_get_notifier'
include/linux/opp.h:103: first defined here
Also fix incorrect comment.
Cc: MyungJoo Ham <myungjoo.ham@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Mike Turquette <mturquette@ti.com>
Cc: Kevin Hilman <khilman@ti.com>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
I'm seeing this with omap1_defconfig at least.
--- a/include/linux/opp.h
+++ b/include/linux/opp.h
@@ -97,11 +97,11 @@ static inline int opp_disable(struct device *dev, unsigned long freq)
return 0;
}
-struct srcu_notifier_head *opp_get_notifier(struct device *dev)
+static inline struct srcu_notifier_head *opp_get_notifier(struct device *dev)
{
return ERR_PTR(-EINVAL);
}
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM_OPP */
#if defined(CONFIG_CPU_FREQ) && defined(CONFIG_PM_OPP)
int opp_init_cpufreq_table(struct device *dev,
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: PM / OPP: Fix build when CONFIG_PM_OPP is not set
2011-11-02 17:00 PM / OPP: Fix build when CONFIG_PM_OPP is not set Tony Lindgren
@ 2011-11-03 0:21 ` Rafael J. Wysocki
0 siblings, 0 replies; 2+ messages in thread
From: Rafael J. Wysocki @ 2011-11-03 0:21 UTC (permalink / raw)
To: Tony Lindgren
Cc: Kevin Hilman, linux-kernel, Kyungmin Park, MyungJoo Ham, linux-pm,
linux-omap
On Wednesday, November 02, 2011, Tony Lindgren wrote:
> Commit 03ca370fbf7b76d6d002380dbdc2cdc2319f9c80 (PM / OPP: Add
> OPP availability change notifier) does not compile if CONFIG_PM_OPP
> is not set:
>
> arch/arm/plat-omap/omap-pm-noop.o: In function `opp_get_notifier':
> include/linux/opp.h:103: multiple definition of `opp_get_notifier'
> include/linux/opp.h:103: first defined here
>
> Also fix incorrect comment.
>
> Cc: MyungJoo Ham <myungjoo.ham@samsung.com>
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: Mike Turquette <mturquette@ti.com>
> Cc: Kevin Hilman <khilman@ti.com>
> Cc: Rafael J. Wysocki <rjw@sisk.pl>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
Applied to linux-pm/linux-next.
Thanks,
Rafael
> ---
>
> I'm seeing this with omap1_defconfig at least.
>
> --- a/include/linux/opp.h
> +++ b/include/linux/opp.h
> @@ -97,11 +97,11 @@ static inline int opp_disable(struct device *dev, unsigned long freq)
> return 0;
> }
>
> -struct srcu_notifier_head *opp_get_notifier(struct device *dev)
> +static inline struct srcu_notifier_head *opp_get_notifier(struct device *dev)
> {
> return ERR_PTR(-EINVAL);
> }
> -#endif /* CONFIG_PM */
> +#endif /* CONFIG_PM_OPP */
>
> #if defined(CONFIG_CPU_FREQ) && defined(CONFIG_PM_OPP)
> int opp_init_cpufreq_table(struct device *dev,
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-11-03 0:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-02 17:00 PM / OPP: Fix build when CONFIG_PM_OPP is not set Tony Lindgren
2011-11-03 0:21 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).