Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1250436 > unrolled thread

[PATCH] PM / clk: Fix broken build due to non-matching code and header #ifdefs

Started byGeert Uytterhoeven <geert@linux-m68k.org>
First post2015-10-19 10:20 +0200
Last post2015-10-19 10:50 +0200
Articles 2 — 2 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH] PM / clk: Fix broken build due to non-matching code and header #ifdefs Geert Uytterhoeven <geert@linux-m68k.org> - 2015-10-19 10:20 +0200
    Re: [PATCH] PM / clk: Fix broken build due to non-matching code and  header #ifdefs Pavel Machek <pavel@ucw.cz> - 2015-10-19 10:50 +0200

#1250436 — [PATCH] PM / clk: Fix broken build due to non-matching code and header #ifdefs

FromGeert Uytterhoeven <geert@linux-m68k.org>
Date2015-10-19 10:20 +0200
Subject[PATCH] PM / clk: Fix broken build due to non-matching code and header #ifdefs
Message-ID<qldPI-74y-17@gated-at.bofh.it>
If an architecture's main Kconfig file doesn't include
kernel/power/Kconfig, but CONFIG_PM=y and HAVE_CLK=y (e.g. m68knommu
allmodconfig):

    drivers/base/power/clock_ops.c: In function ‘__pm_clk_add’:
    drivers/base/power/clock_ops.c:106: error: ‘struct pm_subsys_data’ has no member named ‘clock_list’
    drivers/base/power/clock_ops.c: At top level:
    drivers/base/power/clock_ops.c:120: error: redefinition of ‘pm_clk_add’
    include/linux/pm_clock.h:64: error: previous definition of ‘pm_clk_add’ was here
    drivers/base/power/clock_ops.c:135: error: redefinition of ‘pm_clk_add_clk’
    include/linux/pm_clock.h:69: error: previous definition of ‘pm_clk_add_clk’ was here
    drivers/base/power/clock_ops.c:171: error: redefinition of ‘pm_clk_remove’
    include/linux/pm_clock.h:73: error: previous definition of ‘pm_clk_remove’ was here
    drivers/base/power/clock_ops.c: In function ‘pm_clk_remove’:
    drivers/base/power/clock_ops.c:180: error: ‘struct pm_subsys_data’ has no member named ‘clock_list’
    drivers/base/power/clock_ops.c:180: error: ‘struct pm_subsys_data’ has no member named ‘clock_list’
    drivers/base/power/clock_ops.c: At top level:
    drivers/base/power/clock_ops.c:207: error: redefinition of ‘pm_clk_init’
    include/linux/pm_clock.h:54: error: previous definition of ‘pm_clk_init’ was here
    drivers/base/power/clock_ops.c: In function ‘pm_clk_init’:
    drivers/base/power/clock_ops.c:210: error: ‘struct pm_subsys_data’ has no member named ‘clock_list’
    drivers/base/power/clock_ops.c: At top level:
    drivers/base/power/clock_ops.c:221: error: redefinition of ‘pm_clk_create’
    include/linux/pm_clock.h:57: error: previous definition of ‘pm_clk_create’ was here
    drivers/base/power/clock_ops.c:234: error: redefinition of ‘pm_clk_destroy’
    include/linux/pm_clock.h:61: error: previous definition of ‘pm_clk_destroy’ was here
    drivers/base/power/clock_ops.c: In function ‘pm_clk_destroy’:
    drivers/base/power/clock_ops.c:246: error: ‘struct pm_subsys_data’ has no member named ‘clock_list’
    drivers/base/power/clock_ops.c:246: error: ‘struct pm_subsys_data’ has no member named ‘clock_list’
    drivers/base/power/clock_ops.c: At top level:
    drivers/base/power/clock_ops.c:263: error: expected identifier or ‘(’ before ‘void’
    drivers/base/power/clock_ops.c:263: error: expected ‘)’ before numeric constant
    drivers/base/power/clock_ops.c:293: error: expected identifier or ‘(’ before ‘void’
    drivers/base/power/clock_ops.c:293: error: expected ‘)’ before numeric constant
    drivers/base/power/clock_ops.c: In function ‘pm_clk_runtime_suspend’:
    drivers/base/power/clock_ops.c:384: error: called object ‘0u’ is not a function
    drivers/base/power/clock_ops.c: In function ‘pm_clk_runtime_resume’:
    drivers/base/power/clock_ops.c:400: error: called object ‘0u’ is not a function

This happens because:
  - drivers/base/power/clock_ops.c depends on CONFIG_HAVE_CLK,
  - the failing code inside clock_ops.c additionally depends on
    CONFIG_PM,
  - the forward declarations and other definitions in <linux/pm_clock.h>
    depend on CONFIG_PM_CLK,
  - CONFIG_PM_CLK is defined as PM && HAVE_CLK in kernel/power/Kconfig,
    but it is not included on all architectures.

Fix this by protecting the failing code inside clock_ops.c by
CONFIG_PM_CLK instead of CONFIG_PM, so it matches <linux/pm_clock.h>.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
Probably m68knommu should start including kernel/power/Kconfig, but
this patch fixes an inconsistency anyway.

 drivers/base/power/clock_ops.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c
index 652b5a367c1f37fd..fd0973b922a75086 100644
--- a/drivers/base/power/clock_ops.c
+++ b/drivers/base/power/clock_ops.c
@@ -17,7 +17,7 @@
 #include <linux/err.h>
 #include <linux/pm_runtime.h>
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_CLK
 
 enum pce_status {
 	PCE_STATUS_NONE = 0,
@@ -404,7 +404,7 @@ int pm_clk_runtime_resume(struct device *dev)
 	return pm_generic_runtime_resume(dev);
 }
 
-#else /* !CONFIG_PM */
+#else /* !CONFIG_PM_CLK */
 
 /**
  * enable_clock - Enable a device clock.
@@ -484,7 +484,7 @@ static int pm_clk_notify(struct notifier_block *nb,
 	return 0;
 }
 
-#endif /* !CONFIG_PM */
+#endif /* !CONFIG_PM_CLK */
 
 /**
  * pm_clk_add_notifier - Add bus type notifier for power management clocks.
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1250460 — Re: [PATCH] PM / clk: Fix broken build due to non-matching code and header #ifdefs

FromPavel Machek <pavel@ucw.cz>
Date2015-10-19 10:50 +0200
SubjectRe: [PATCH] PM / clk: Fix broken build due to non-matching code and header #ifdefs
Message-ID<qleiK-7D6-9@gated-at.bofh.it>
In reply to#1250436
On Mon 2015-10-19 10:16:07, Geert Uytterhoeven wrote:
> If an architecture's main Kconfig file doesn't include
> kernel/power/Kconfig, but CONFIG_PM=y and HAVE_CLK=y (e.g. m68knommu
> allmodconfig):
> 
>     drivers/base/power/clock_ops.c: In function ‘__pm_clk_add’:
>     drivers/base/power/clock_ops.c:106: error: ‘struct pm_subsys_data’ has no member named ‘clock_list’
>     drivers/base/power/clock_ops.c: At top level:
>     drivers/base/power/clock_ops.c:120: error: redefinition of ‘pm_clk_add’
>     include/linux/pm_clock.h:64: error: previous definition of ‘pm_clk_add’ was here
>     drivers/base/power/clock_ops.c:135: error: redefinition of ‘pm_clk_add_clk’
>     include/linux/pm_clock.h:69: error: previous definition of ‘pm_clk_add_clk’ was here
>     drivers/base/power/clock_ops.c:171: error: redefinition of ‘pm_clk_remove’
>     include/linux/pm_clock.h:73: error: previous definition of ‘pm_clk_remove’ was here
>     drivers/base/power/clock_ops.c: In function ‘pm_clk_remove’:
>     drivers/base/power/clock_ops.c:180: error: ‘struct pm_subsys_data’ has no member named ‘clock_list’
>     drivers/base/power/clock_ops.c:180: error: ‘struct pm_subsys_data’ has no member named ‘clock_list’
>     drivers/base/power/clock_ops.c: At top level:
>     drivers/base/power/clock_ops.c:207: error: redefinition of ‘pm_clk_init’
>     include/linux/pm_clock.h:54: error: previous definition of ‘pm_clk_init’ was here
>     drivers/base/power/clock_ops.c: In function ‘pm_clk_init’:
>     drivers/base/power/clock_ops.c:210: error: ‘struct pm_subsys_data’ has no member named ‘clock_list’
>     drivers/base/power/clock_ops.c: At top level:
>     drivers/base/power/clock_ops.c:221: error: redefinition of ‘pm_clk_create’
>     include/linux/pm_clock.h:57: error: previous definition of ‘pm_clk_create’ was here
>     drivers/base/power/clock_ops.c:234: error: redefinition of ‘pm_clk_destroy’
>     include/linux/pm_clock.h:61: error: previous definition of ‘pm_clk_destroy’ was here
>     drivers/base/power/clock_ops.c: In function ‘pm_clk_destroy’:
>     drivers/base/power/clock_ops.c:246: error: ‘struct pm_subsys_data’ has no member named ‘clock_list’
>     drivers/base/power/clock_ops.c:246: error: ‘struct pm_subsys_data’ has no member named ‘clock_list’
>     drivers/base/power/clock_ops.c: At top level:
>     drivers/base/power/clock_ops.c:263: error: expected identifier or ‘(’ before ‘void’
>     drivers/base/power/clock_ops.c:263: error: expected ‘)’ before numeric constant
>     drivers/base/power/clock_ops.c:293: error: expected identifier or ‘(’ before ‘void’
>     drivers/base/power/clock_ops.c:293: error: expected ‘)’ before numeric constant
>     drivers/base/power/clock_ops.c: In function ‘pm_clk_runtime_suspend’:
>     drivers/base/power/clock_ops.c:384: error: called object ‘0u’ is not a function
>     drivers/base/power/clock_ops.c: In function ‘pm_clk_runtime_resume’:
>     drivers/base/power/clock_ops.c:400: error: called object ‘0u’ is not a function
> 
> This happens because:
>   - drivers/base/power/clock_ops.c depends on CONFIG_HAVE_CLK,
>   - the failing code inside clock_ops.c additionally depends on
>     CONFIG_PM,
>   - the forward declarations and other definitions in <linux/pm_clock.h>
>     depend on CONFIG_PM_CLK,
>   - CONFIG_PM_CLK is defined as PM && HAVE_CLK in kernel/power/Kconfig,
>     but it is not included on all architectures.
> 
> Fix this by protecting the failing code inside clock_ops.c by
> CONFIG_PM_CLK instead of CONFIG_PM, so it matches <linux/pm_clock.h>.
> 
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

Acked-by: Pavel Machek <pavel@ucw.cz>

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web