From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758058Ab2CSKAr (ORCPT ); Mon, 19 Mar 2012 06:00:47 -0400 Received: from moutng.kundenserver.de ([212.227.17.9]:56541 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752605Ab2CSKAp (ORCPT ); Mon, 19 Mar 2012 06:00:45 -0400 From: Arnd Bergmann To: Stephen Rothwell Subject: Re: linux-next: build warning after merge of the arm-soc tree Date: Mon, 19 Mar 2012 09:40:01 +0000 User-Agent: KMail/1.12.2 (Linux/3.3.0-rc1; KDE/4.3.2; x86_64; ; ) Cc: Olof Johansson , linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Turquette, Mike" References: <20120319183911.0cd46df560c714ee71184242@canb.auug.org.au> In-Reply-To: <20120319183911.0cd46df560c714ee71184242@canb.auug.org.au> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201203190940.02329.arnd@arndb.de> X-Provags-ID: V02:K0:dhO/mbJPO7Dk2P6RpAwROX26KxGOKjhS9miGWh97lmf Fa/YGnY+wETTbb9knXSPFJZmKncTHZzbXxVw1hAKCHodQLzeAD WdItNGAK121zqJsti5/i8bvB7DBz/XgK3KDiS1i0zc3TGF/UbL MhVtAiAel7BhzzaCCtTxjh/9lZ3h+z6GpIpUbV6cnhAf78cBso fEepkKnh86R2YnaIDVxxI3FVyX4YRXk+JbtlxuvEAPaLCSPAFd NyUZjPUFJnlW1dNw5Y/FtYtMKwRPKnc8Lgj06r+AbEaKUlgnOf L9T/0rrCkV9MjDOubBYKN13ETAerr7t1dJ4yTJHaGXzz6OOXZy RsnwSenUSnGt2sliWRns= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Monday 19 March 2012, Stephen Rothwell wrote: > Hi all, > > After merging the arm-soc tree, today's linux-next build (all) > produced this warning: > > drivers/clk/Kconfig:22: warning: menuconfig statement without prompt > > Introduced by commit c173033d154e ("clk: make CONFIG_COMMON_CLK invisible"). Thanks for the report. This is clearly my fault for not testing the last minute patch. I have now replaced it with the one below and tested that it works as intended. Arnd commit 8fb61e33507e5d76b69467b4f96290338e96b733 Author: Arnd Bergmann Date: Sat Mar 17 21:10:51 2012 +0000 clk: make CONFIG_COMMON_CLK invisible All platforms that use the common clk infrastructure should select COMMON_CLK from platform code, and on all other platforms, it must not be enabled, so there is no point making the option visible to users, and when it is visible, we break randconfig builds. Signed-off-by: Arnd Bergmann diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index 2eaf17e..165e1fe 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -9,21 +9,18 @@ config HAVE_CLK_PREPARE config HAVE_MACH_CLKDEV bool -menuconfig COMMON_CLK - bool "Common Clock Framework" +config COMMON_CLK + bool select HAVE_CLK_PREPARE ---help--- The common clock framework is a single definition of struct clk, useful across many platforms, as well as an implementation of the clock API in include/linux/clk.h. Architectures utilizing the common struct clk should select - this automatically, but it may be necessary to manually select - this option for loadable modules requiring the common clock - framework. - - If in doubt, say "N". + this option. -if COMMON_CLK +menu "Common Clock Framework" + depends on COMMON_CLK config COMMON_CLK_DISABLE_UNUSED bool "Disabled unused clocks at boot" @@ -47,4 +44,4 @@ config COMMON_CLK_DEBUG clk_flags, clk_prepare_count, clk_enable_count & clk_notifier_count. -endif +endmenu From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd@arndb.de (Arnd Bergmann) Date: Mon, 19 Mar 2012 09:40:01 +0000 Subject: linux-next: build warning after merge of the arm-soc tree In-Reply-To: <20120319183911.0cd46df560c714ee71184242@canb.auug.org.au> References: <20120319183911.0cd46df560c714ee71184242@canb.auug.org.au> Message-ID: <201203190940.02329.arnd@arndb.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Monday 19 March 2012, Stephen Rothwell wrote: > Hi all, > > After merging the arm-soc tree, today's linux-next build (all) > produced this warning: > > drivers/clk/Kconfig:22: warning: menuconfig statement without prompt > > Introduced by commit c173033d154e ("clk: make CONFIG_COMMON_CLK invisible"). Thanks for the report. This is clearly my fault for not testing the last minute patch. I have now replaced it with the one below and tested that it works as intended. Arnd commit 8fb61e33507e5d76b69467b4f96290338e96b733 Author: Arnd Bergmann Date: Sat Mar 17 21:10:51 2012 +0000 clk: make CONFIG_COMMON_CLK invisible All platforms that use the common clk infrastructure should select COMMON_CLK from platform code, and on all other platforms, it must not be enabled, so there is no point making the option visible to users, and when it is visible, we break randconfig builds. Signed-off-by: Arnd Bergmann diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index 2eaf17e..165e1fe 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -9,21 +9,18 @@ config HAVE_CLK_PREPARE config HAVE_MACH_CLKDEV bool -menuconfig COMMON_CLK - bool "Common Clock Framework" +config COMMON_CLK + bool select HAVE_CLK_PREPARE ---help--- The common clock framework is a single definition of struct clk, useful across many platforms, as well as an implementation of the clock API in include/linux/clk.h. Architectures utilizing the common struct clk should select - this automatically, but it may be necessary to manually select - this option for loadable modules requiring the common clock - framework. - - If in doubt, say "N". + this option. -if COMMON_CLK +menu "Common Clock Framework" + depends on COMMON_CLK config COMMON_CLK_DISABLE_UNUSED bool "Disabled unused clocks at boot" @@ -47,4 +44,4 @@ config COMMON_CLK_DEBUG clk_flags, clk_prepare_count, clk_enable_count & clk_notifier_count. -endif +endmenu