[PATCH] clk: Move vendor's Kconfig into CCF menu section

[PATCH] clk: Move vendor's Kconfig into CCF menu section

[James Liao]

Move all vendor's Kconfig into CCF menu section to prevent
new drivers putting their Kconfig files in a wrong place.

Signed-off-by: James Liao <jamesjj.liao@mediatek.com>
---
 drivers/clk/Kconfig | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index eca8e01..de707b2 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -202,11 +202,9 @@ config COMMON_CLK_CDCE706
 
 source "drivers/clk/bcm/Kconfig"
 source "drivers/clk/hisilicon/Kconfig"
-source "drivers/clk/qcom/Kconfig"
-
-endmenu
-
 source "drivers/clk/mvebu/Kconfig"
-
+source "drivers/clk/qcom/Kconfig"
 source "drivers/clk/samsung/Kconfig"
 source "drivers/clk/tegra/Kconfig"
+
+endmenu
-- 
1.9.1

[PATCH] clk: Move vendor's Kconfig into CCF menu section

[James Liao]

Move all vendor's Kconfig into CCF menu section to prevent
new drivers putting their Kconfig files in a wrong place.

Signed-off-by: James Liao <jamesjj.liao-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
---
 drivers/clk/Kconfig | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index eca8e01..de707b2 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -202,11 +202,9 @@ config COMMON_CLK_CDCE706
 
 source "drivers/clk/bcm/Kconfig"
 source "drivers/clk/hisilicon/Kconfig"
-source "drivers/clk/qcom/Kconfig"
-
-endmenu
-
 source "drivers/clk/mvebu/Kconfig"
-
+source "drivers/clk/qcom/Kconfig"
 source "drivers/clk/samsung/Kconfig"
 source "drivers/clk/tegra/Kconfig"
+
+endmenu
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] clk: Move vendor's Kconfig into CCF menu section

[James Liao]

Move all vendor's Kconfig into CCF menu section to prevent
new drivers putting their Kconfig files in a wrong place.

Signed-off-by: James Liao <jamesjj.liao@mediatek.com>
---
 drivers/clk/Kconfig | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index eca8e01..de707b2 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -202,11 +202,9 @@ config COMMON_CLK_CDCE706
 
 source "drivers/clk/bcm/Kconfig"
 source "drivers/clk/hisilicon/Kconfig"
-source "drivers/clk/qcom/Kconfig"
-
-endmenu
-
 source "drivers/clk/mvebu/Kconfig"
-
+source "drivers/clk/qcom/Kconfig"
 source "drivers/clk/samsung/Kconfig"
 source "drivers/clk/tegra/Kconfig"
+
+endmenu
-- 
1.9.1

Re: [PATCH] clk: Move vendor's Kconfig into CCF menu section

[kbuild test robot]

[-- Attachment #1: Type: text/plain, Size: 5235 bytes --]

Hi James,

[auto build test ERROR on clk/clk-next]
[also build test ERROR on v4.5-rc1 next-20160127]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]

url:    https://github.com/0day-ci/linux/commits/James-Liao/clk-Move-vendor-s-Kconfig-into-CCF-menu-section/20160127-152850
base:   https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next
config: arm-samsung (attached as .config)
reproduce:
        wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=arm 

All error/warnings (new ones prefixed by >>):

warning: (ARCH_BAST && MACH_VR1000 && MACH_ANUBIS && MACH_OSIRIS && MACH_RX1950) selects S3C2410_COMMON_DCLK which has unmet direct dependencies (COMMON_CLK)
warning: (CPU_S3C2410 && CPU_S3C2440 && CPU_S3C2442) selects S3C2410_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
warning: (CPU_S3C2412) selects S3C2412_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
warning: (CPU_S3C2416 && CPU_S3C2443) selects S3C2443_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
   drivers/built-in.o: In function `pwm_samsung_remove':
>> :(.text+0xba68): undefined reference to `clk_disable'
   drivers/built-in.o: In function `pwm_samsung_config':
>> :(.text+0xbc18): undefined reference to `clk_get_rate'
   :(.text+0xbc30): undefined reference to `clk_get_rate'
   drivers/built-in.o: In function `pwm_samsung_probe':
>> :(.text+0xbf68): undefined reference to `clk_enable'
   :(.text+0xc00c): undefined reference to `clk_disable'
   drivers/built-in.o: In function `__pm_clk_remove':
   :(.text+0x83518): undefined reference to `clk_disable'
   drivers/built-in.o: In function `pm_clk_suspend':
   :(.text+0x83834): undefined reference to `clk_disable'
   drivers/built-in.o: In function `pm_clk_resume':
   :(.text+0x8389c): undefined reference to `clk_enable'
   drivers/built-in.o: In function `s3c2410_start_hc':
   :(.text+0xffc84): undefined reference to `clk_enable'
   :(.text+0xffcac): undefined reference to `clk_enable'
   drivers/built-in.o: In function `s3c2410_stop_hc':
   :(.text+0xffd68): undefined reference to `clk_disable'
   :(.text+0xffd74): undefined reference to `clk_disable'
   drivers/built-in.o: In function `_samsung_pwm_clocksource_init':
>> :(.init.text+0x6f88): undefined reference to `clk_enable'
>> :(.init.text+0x6fcc): undefined reference to `clk_get_rate'
   :(.init.text+0x7070): undefined reference to `clk_get_rate'
   arch/arm/mach-s3c24xx/built-in.o: In function `s3c2412_init_clocks':
>> :(.init.text+0x13c): undefined reference to `s3c2412_common_clk_init'
   arch/arm/mach-s3c24xx/built-in.o: In function `s3c2416_init_clocks':
>> :(.init.text+0x164): undefined reference to `s3c2443_common_clk_init'
   arch/arm/mach-s3c24xx/built-in.o: In function `s3c2443_init_clocks':
   :(.init.text+0x18c): undefined reference to `s3c2443_common_clk_init'
   arch/arm/mach-s3c24xx/built-in.o: In function `amlm5900_init_time':
>> :(.init.text+0xa24): undefined reference to `s3c2410_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `bast_init_time':
   :(.init.text+0xa80): undefined reference to `s3c2410_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `h1940_init_time':
   :(.init.text+0xed0): undefined reference to `s3c2410_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `n30_init_time':
   :(.init.text+0xfb0): undefined reference to `s3c2410_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `otom11_init_time':
   :(.init.text+0x11f4): undefined reference to `s3c2410_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o::(.init.text+0x1350): more undefined references to `s3c2410_init_clocks' follow
   arch/arm/mach-s3c24xx/built-in.o: In function `anubis_init_time':
>> :(.init.text+0x1b30): undefined reference to `s3c2440_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `at2440evb_init_time':
   :(.init.text+0x1c28): undefined reference to `s3c2440_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `mini2440_init_time':
   :(.init.text+0x1cac): undefined reference to `s3c2440_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `nexcoder_init_time':
   :(.init.text+0x204c): undefined reference to `s3c2440_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `osiris_init_time':
   :(.init.text+0x2158): undefined reference to `s3c2440_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o::(.init.text+0x228c): more undefined references to `s3c2440_init_clocks' follow
   arch/arm/mach-s3c24xx/built-in.o: In function `gta02_init_time':
>> :(.init.text+0x2438): undefined reference to `s3c2442_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `rx1950_init_time':
   :(.init.text+0x26e4): undefined reference to `s3c2442_init_clocks'
   lib/lib.a(vsprintf.o): In function `clock':
>> vsprintf.c:(.text+0x2414): undefined reference to `clk_get_rate'

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 20185 bytes --]

Re: [PATCH] clk: Move vendor's Kconfig into CCF menu section

[kbuild test robot]

[-- Attachment #1: Type: text/plain, Size: 5235 bytes --]

Hi James,

[auto build test ERROR on clk/clk-next]
[also build test ERROR on v4.5-rc1 next-20160127]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]

url:    https://github.com/0day-ci/linux/commits/James-Liao/clk-Move-vendor-s-Kconfig-into-CCF-menu-section/20160127-152850
base:   https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next
config: arm-samsung (attached as .config)
reproduce:
        wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=arm 

All error/warnings (new ones prefixed by >>):

warning: (ARCH_BAST && MACH_VR1000 && MACH_ANUBIS && MACH_OSIRIS && MACH_RX1950) selects S3C2410_COMMON_DCLK which has unmet direct dependencies (COMMON_CLK)
warning: (CPU_S3C2410 && CPU_S3C2440 && CPU_S3C2442) selects S3C2410_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
warning: (CPU_S3C2412) selects S3C2412_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
warning: (CPU_S3C2416 && CPU_S3C2443) selects S3C2443_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
   drivers/built-in.o: In function `pwm_samsung_remove':
>> :(.text+0xba68): undefined reference to `clk_disable'
   drivers/built-in.o: In function `pwm_samsung_config':
>> :(.text+0xbc18): undefined reference to `clk_get_rate'
   :(.text+0xbc30): undefined reference to `clk_get_rate'
   drivers/built-in.o: In function `pwm_samsung_probe':
>> :(.text+0xbf68): undefined reference to `clk_enable'
   :(.text+0xc00c): undefined reference to `clk_disable'
   drivers/built-in.o: In function `__pm_clk_remove':
   :(.text+0x83518): undefined reference to `clk_disable'
   drivers/built-in.o: In function `pm_clk_suspend':
   :(.text+0x83834): undefined reference to `clk_disable'
   drivers/built-in.o: In function `pm_clk_resume':
   :(.text+0x8389c): undefined reference to `clk_enable'
   drivers/built-in.o: In function `s3c2410_start_hc':
   :(.text+0xffc84): undefined reference to `clk_enable'
   :(.text+0xffcac): undefined reference to `clk_enable'
   drivers/built-in.o: In function `s3c2410_stop_hc':
   :(.text+0xffd68): undefined reference to `clk_disable'
   :(.text+0xffd74): undefined reference to `clk_disable'
   drivers/built-in.o: In function `_samsung_pwm_clocksource_init':
>> :(.init.text+0x6f88): undefined reference to `clk_enable'
>> :(.init.text+0x6fcc): undefined reference to `clk_get_rate'
   :(.init.text+0x7070): undefined reference to `clk_get_rate'
   arch/arm/mach-s3c24xx/built-in.o: In function `s3c2412_init_clocks':
>> :(.init.text+0x13c): undefined reference to `s3c2412_common_clk_init'
   arch/arm/mach-s3c24xx/built-in.o: In function `s3c2416_init_clocks':
>> :(.init.text+0x164): undefined reference to `s3c2443_common_clk_init'
   arch/arm/mach-s3c24xx/built-in.o: In function `s3c2443_init_clocks':
   :(.init.text+0x18c): undefined reference to `s3c2443_common_clk_init'
   arch/arm/mach-s3c24xx/built-in.o: In function `amlm5900_init_time':
>> :(.init.text+0xa24): undefined reference to `s3c2410_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `bast_init_time':
   :(.init.text+0xa80): undefined reference to `s3c2410_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `h1940_init_time':
   :(.init.text+0xed0): undefined reference to `s3c2410_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `n30_init_time':
   :(.init.text+0xfb0): undefined reference to `s3c2410_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `otom11_init_time':
   :(.init.text+0x11f4): undefined reference to `s3c2410_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o::(.init.text+0x1350): more undefined references to `s3c2410_init_clocks' follow
   arch/arm/mach-s3c24xx/built-in.o: In function `anubis_init_time':
>> :(.init.text+0x1b30): undefined reference to `s3c2440_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `at2440evb_init_time':
   :(.init.text+0x1c28): undefined reference to `s3c2440_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `mini2440_init_time':
   :(.init.text+0x1cac): undefined reference to `s3c2440_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `nexcoder_init_time':
   :(.init.text+0x204c): undefined reference to `s3c2440_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `osiris_init_time':
   :(.init.text+0x2158): undefined reference to `s3c2440_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o::(.init.text+0x228c): more undefined references to `s3c2440_init_clocks' follow
   arch/arm/mach-s3c24xx/built-in.o: In function `gta02_init_time':
>> :(.init.text+0x2438): undefined reference to `s3c2442_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `rx1950_init_time':
   :(.init.text+0x26e4): undefined reference to `s3c2442_init_clocks'
   lib/lib.a(vsprintf.o): In function `clock':
>> vsprintf.c:(.text+0x2414): undefined reference to `clk_get_rate'

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 20185 bytes --]

[PATCH] clk: Move vendor's Kconfig into CCF menu section

[kbuild test robot]

Hi James,

[auto build test ERROR on clk/clk-next]
[also build test ERROR on v4.5-rc1 next-20160127]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]

url:    https://github.com/0day-ci/linux/commits/James-Liao/clk-Move-vendor-s-Kconfig-into-CCF-menu-section/20160127-152850
base:   https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next
config: arm-samsung (attached as .config)
reproduce:
        wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=arm 

All error/warnings (new ones prefixed by >>):

warning: (ARCH_BAST && MACH_VR1000 && MACH_ANUBIS && MACH_OSIRIS && MACH_RX1950) selects S3C2410_COMMON_DCLK which has unmet direct dependencies (COMMON_CLK)
warning: (CPU_S3C2410 && CPU_S3C2440 && CPU_S3C2442) selects S3C2410_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
warning: (CPU_S3C2412) selects S3C2412_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
warning: (CPU_S3C2416 && CPU_S3C2443) selects S3C2443_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
   drivers/built-in.o: In function `pwm_samsung_remove':
>> :(.text+0xba68): undefined reference to `clk_disable'
   drivers/built-in.o: In function `pwm_samsung_config':
>> :(.text+0xbc18): undefined reference to `clk_get_rate'
   :(.text+0xbc30): undefined reference to `clk_get_rate'
   drivers/built-in.o: In function `pwm_samsung_probe':
>> :(.text+0xbf68): undefined reference to `clk_enable'
   :(.text+0xc00c): undefined reference to `clk_disable'
   drivers/built-in.o: In function `__pm_clk_remove':
   :(.text+0x83518): undefined reference to `clk_disable'
   drivers/built-in.o: In function `pm_clk_suspend':
   :(.text+0x83834): undefined reference to `clk_disable'
   drivers/built-in.o: In function `pm_clk_resume':
   :(.text+0x8389c): undefined reference to `clk_enable'
   drivers/built-in.o: In function `s3c2410_start_hc':
   :(.text+0xffc84): undefined reference to `clk_enable'
   :(.text+0xffcac): undefined reference to `clk_enable'
   drivers/built-in.o: In function `s3c2410_stop_hc':
   :(.text+0xffd68): undefined reference to `clk_disable'
   :(.text+0xffd74): undefined reference to `clk_disable'
   drivers/built-in.o: In function `_samsung_pwm_clocksource_init':
>> :(.init.text+0x6f88): undefined reference to `clk_enable'
>> :(.init.text+0x6fcc): undefined reference to `clk_get_rate'
   :(.init.text+0x7070): undefined reference to `clk_get_rate'
   arch/arm/mach-s3c24xx/built-in.o: In function `s3c2412_init_clocks':
>> :(.init.text+0x13c): undefined reference to `s3c2412_common_clk_init'
   arch/arm/mach-s3c24xx/built-in.o: In function `s3c2416_init_clocks':
>> :(.init.text+0x164): undefined reference to `s3c2443_common_clk_init'
   arch/arm/mach-s3c24xx/built-in.o: In function `s3c2443_init_clocks':
   :(.init.text+0x18c): undefined reference to `s3c2443_common_clk_init'
   arch/arm/mach-s3c24xx/built-in.o: In function `amlm5900_init_time':
>> :(.init.text+0xa24): undefined reference to `s3c2410_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `bast_init_time':
   :(.init.text+0xa80): undefined reference to `s3c2410_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `h1940_init_time':
   :(.init.text+0xed0): undefined reference to `s3c2410_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `n30_init_time':
   :(.init.text+0xfb0): undefined reference to `s3c2410_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `otom11_init_time':
   :(.init.text+0x11f4): undefined reference to `s3c2410_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o::(.init.text+0x1350): more undefined references to `s3c2410_init_clocks' follow
   arch/arm/mach-s3c24xx/built-in.o: In function `anubis_init_time':
>> :(.init.text+0x1b30): undefined reference to `s3c2440_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `at2440evb_init_time':
   :(.init.text+0x1c28): undefined reference to `s3c2440_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `mini2440_init_time':
   :(.init.text+0x1cac): undefined reference to `s3c2440_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `nexcoder_init_time':
   :(.init.text+0x204c): undefined reference to `s3c2440_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `osiris_init_time':
   :(.init.text+0x2158): undefined reference to `s3c2440_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o::(.init.text+0x228c): more undefined references to `s3c2440_init_clocks' follow
   arch/arm/mach-s3c24xx/built-in.o: In function `gta02_init_time':
>> :(.init.text+0x2438): undefined reference to `s3c2442_init_clocks'
   arch/arm/mach-s3c24xx/built-in.o: In function `rx1950_init_time':
   :(.init.text+0x26e4): undefined reference to `s3c2442_init_clocks'
   lib/lib.a(vsprintf.o): In function `clock':
>> vsprintf.c:(.text+0x2414): undefined reference to `clk_get_rate'

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
-------------- next part --------------
A non-text attachment was scrubbed...
Name: .config.gz
Type: application/octet-stream
Size: 20185 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160127/a6d16192/attachment-0001.obj>

Re: [PATCH] clk: Move vendor's Kconfig into CCF menu section

[Arnd Bergmann]

On Wednesday 27 January 2016 17:18:03 kbuild test robot wrote:
> Hi James,
> 
> [auto build test ERROR on clk/clk-next]
> [also build test ERROR on v4.5-rc1 next-20160127]
> [if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
> 
> url:    https://github.com/0day-ci/linux/commits/James-Liao/clk-Move-vendor-s-Kconfig-into-CCF-menu-section/20160127-152850
> base:   https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next
> config: arm-samsung (attached as .config)
> reproduce:
>         wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
>         chmod +x ~/bin/make.cross
>         # save the attached .config to linux build tree
>         make.cross ARCH=arm 
> 
> All error/warnings (new ones prefixed by >>):
> 
> warning: (ARCH_BAST && MACH_VR1000 && MACH_ANUBIS && MACH_OSIRIS && MACH_RX1950) selects S3C2410_COMMON_DCLK which has unmet direct dependencies (COMMON_CLK)
> warning: (CPU_S3C2410 && CPU_S3C2440 && CPU_S3C2442) selects S3C2410_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
> warning: (CPU_S3C2412) selects S3C2412_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
> warning: (CPU_S3C2416 && CPU_S3C2443) selects S3C2443_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
>    drivers/built-in.o: In function `pwm_samsung_remove':
> >> :(.text+0xba68): undefined reference to `clk_disable'
>    drivers/built-in.o: In function `pwm_samsung_config':
> >> :(.text+0xbc18): undefined reference to `clk_get_rate'
>    :(.text+0xbc30): undefined reference to `clk_get_rate'

I think you should include this change in your patch, or as a preparation.
All other samsung platforms already select COMMON_CLK through ARCH_MULTIPLATFORM,
and all SoCs that are part of ARCH_S3C24XX individually select a symbol that
selects COMMON_CLK.

	Arnd

diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index bf66c8334822..85e051d1c2d6 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -15,6 +15,7 @@ config PLAT_S3C24XX
 	select NO_IOPORT_MAP
 	select S3C_DEV_NAND
 	select IRQ_DOMAIN
+	select COMMON_CLK
 	help
 	  Base platform code for any Samsung S3C24XX device
 
diff --git a/drivers/clk/samsung/Kconfig b/drivers/clk/samsung/Kconfig
index 84196ecdaa12..b3fe5cb01afe 100644
--- a/drivers/clk/samsung/Kconfig
+++ b/drivers/clk/samsung/Kconfig
@@ -1,6 +1,5 @@
 config COMMON_CLK_SAMSUNG
 	bool
-	select COMMON_CLK
 
 config S3C2410_COMMON_CLK
 	bool

Re: [PATCH] clk: Move vendor's Kconfig into CCF menu section

[Arnd Bergmann]

On Wednesday 27 January 2016 17:18:03 kbuild test robot wrote:
> Hi James,
> 
> [auto build test ERROR on clk/clk-next]
> [also build test ERROR on v4.5-rc1 next-20160127]
> [if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
> 
> url:    https://github.com/0day-ci/linux/commits/James-Liao/clk-Move-vendor-s-Kconfig-into-CCF-menu-section/20160127-152850
> base:   https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next
> config: arm-samsung (attached as .config)
> reproduce:
>         wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
>         chmod +x ~/bin/make.cross
>         # save the attached .config to linux build tree
>         make.cross ARCH=arm 
> 
> All error/warnings (new ones prefixed by >>):
> 
> warning: (ARCH_BAST && MACH_VR1000 && MACH_ANUBIS && MACH_OSIRIS && MACH_RX1950) selects S3C2410_COMMON_DCLK which has unmet direct dependencies (COMMON_CLK)
> warning: (CPU_S3C2410 && CPU_S3C2440 && CPU_S3C2442) selects S3C2410_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
> warning: (CPU_S3C2412) selects S3C2412_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
> warning: (CPU_S3C2416 && CPU_S3C2443) selects S3C2443_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
>    drivers/built-in.o: In function `pwm_samsung_remove':
> >> :(.text+0xba68): undefined reference to `clk_disable'
>    drivers/built-in.o: In function `pwm_samsung_config':
> >> :(.text+0xbc18): undefined reference to `clk_get_rate'
>    :(.text+0xbc30): undefined reference to `clk_get_rate'

I think you should include this change in your patch, or as a preparation.
All other samsung platforms already select COMMON_CLK through ARCH_MULTIPLATFORM,
and all SoCs that are part of ARCH_S3C24XX individually select a symbol that
selects COMMON_CLK.

	Arnd

diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index bf66c8334822..85e051d1c2d6 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -15,6 +15,7 @@ config PLAT_S3C24XX
 	select NO_IOPORT_MAP
 	select S3C_DEV_NAND
 	select IRQ_DOMAIN
+	select COMMON_CLK
 	help
 	  Base platform code for any Samsung S3C24XX device
 
diff --git a/drivers/clk/samsung/Kconfig b/drivers/clk/samsung/Kconfig
index 84196ecdaa12..b3fe5cb01afe 100644
--- a/drivers/clk/samsung/Kconfig
+++ b/drivers/clk/samsung/Kconfig
@@ -1,6 +1,5 @@
 config COMMON_CLK_SAMSUNG
 	bool
-	select COMMON_CLK
 
 config S3C2410_COMMON_CLK
 	bool

[PATCH] clk: Move vendor's Kconfig into CCF menu section

[Arnd Bergmann]

On Wednesday 27 January 2016 17:18:03 kbuild test robot wrote:
> Hi James,
> 
> [auto build test ERROR on clk/clk-next]
> [also build test ERROR on v4.5-rc1 next-20160127]
> [if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
> 
> url:    https://github.com/0day-ci/linux/commits/James-Liao/clk-Move-vendor-s-Kconfig-into-CCF-menu-section/20160127-152850
> base:   https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next
> config: arm-samsung (attached as .config)
> reproduce:
>         wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
>         chmod +x ~/bin/make.cross
>         # save the attached .config to linux build tree
>         make.cross ARCH=arm 
> 
> All error/warnings (new ones prefixed by >>):
> 
> warning: (ARCH_BAST && MACH_VR1000 && MACH_ANUBIS && MACH_OSIRIS && MACH_RX1950) selects S3C2410_COMMON_DCLK which has unmet direct dependencies (COMMON_CLK)
> warning: (CPU_S3C2410 && CPU_S3C2440 && CPU_S3C2442) selects S3C2410_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
> warning: (CPU_S3C2412) selects S3C2412_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
> warning: (CPU_S3C2416 && CPU_S3C2443) selects S3C2443_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
>    drivers/built-in.o: In function `pwm_samsung_remove':
> >> :(.text+0xba68): undefined reference to `clk_disable'
>    drivers/built-in.o: In function `pwm_samsung_config':
> >> :(.text+0xbc18): undefined reference to `clk_get_rate'
>    :(.text+0xbc30): undefined reference to `clk_get_rate'

I think you should include this change in your patch, or as a preparation.
All other samsung platforms already select COMMON_CLK through ARCH_MULTIPLATFORM,
and all SoCs that are part of ARCH_S3C24XX individually select a symbol that
selects COMMON_CLK.

	Arnd

diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index bf66c8334822..85e051d1c2d6 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -15,6 +15,7 @@ config PLAT_S3C24XX
 	select NO_IOPORT_MAP
 	select S3C_DEV_NAND
 	select IRQ_DOMAIN
+	select COMMON_CLK
 	help
 	  Base platform code for any Samsung S3C24XX device
 
diff --git a/drivers/clk/samsung/Kconfig b/drivers/clk/samsung/Kconfig
index 84196ecdaa12..b3fe5cb01afe 100644
--- a/drivers/clk/samsung/Kconfig
+++ b/drivers/clk/samsung/Kconfig
@@ -1,6 +1,5 @@
 config COMMON_CLK_SAMSUNG
 	bool
-	select COMMON_CLK
 
 config S3C2410_COMMON_CLK
 	bool

Re: [PATCH] clk: Move vendor's Kconfig into CCF menu section

[James Liao]

Hi Arnd,

On Wed, 2016-01-27 at 10:27 +0100, Arnd Bergmann wrote:
> On Wednesday 27 January 2016 17:18:03 kbuild test robot wrote:
> > Hi James,
> > 
> > [auto build test ERROR on clk/clk-next]
> > [also build test ERROR on v4.5-rc1 next-20160127]
> > [if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
> > 
> > url:    https://github.com/0day-ci/linux/commits/James-Liao/clk-Move-vendor-s-Kconfig-into-CCF-menu-section/20160127-152850
> > base:   https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next
> > config: arm-samsung (attached as .config)
> > reproduce:
> >         wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
> >         chmod +x ~/bin/make.cross
> >         # save the attached .config to linux build tree
> >         make.cross ARCH=arm 
> > 
> > All error/warnings (new ones prefixed by >>):
> > 
> > warning: (ARCH_BAST && MACH_VR1000 && MACH_ANUBIS && MACH_OSIRIS && MACH_RX1950) selects S3C2410_COMMON_DCLK which has unmet direct dependencies (COMMON_CLK)
> > warning: (CPU_S3C2410 && CPU_S3C2440 && CPU_S3C2442) selects S3C2410_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
> > warning: (CPU_S3C2412) selects S3C2412_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
> > warning: (CPU_S3C2416 && CPU_S3C2443) selects S3C2443_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
> >    drivers/built-in.o: In function `pwm_samsung_remove':
> > >> :(.text+0xba68): undefined reference to `clk_disable'
> >    drivers/built-in.o: In function `pwm_samsung_config':
> > >> :(.text+0xbc18): undefined reference to `clk_get_rate'
> >    :(.text+0xbc30): undefined reference to `clk_get_rate'
> 
> I think you should include this change in your patch, or as a preparation.
> All other samsung platforms already select COMMON_CLK through ARCH_MULTIPLATFORM,
> and all SoCs that are part of ARCH_S3C24XX individually select a symbol that
> selects COMMON_CLK.

Oops, I didn't notice there are warnings after moving these Kconfigs
into menu section.

The original motivation of this patch is preventing new clk drivers
include their Kconfig in a wrong place, so it's not critical. Do you
think we should apply this patch (with your changes below) or drop this
patch directly?


Best regards,

James

> diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
> index bf66c8334822..85e051d1c2d6 100644
> --- a/arch/arm/mach-s3c24xx/Kconfig
> +++ b/arch/arm/mach-s3c24xx/Kconfig
> @@ -15,6 +15,7 @@ config PLAT_S3C24XX
>  	select NO_IOPORT_MAP
>  	select S3C_DEV_NAND
>  	select IRQ_DOMAIN
> +	select COMMON_CLK
>  	help
>  	  Base platform code for any Samsung S3C24XX device
>  
> diff --git a/drivers/clk/samsung/Kconfig b/drivers/clk/samsung/Kconfig
> index 84196ecdaa12..b3fe5cb01afe 100644
> --- a/drivers/clk/samsung/Kconfig
> +++ b/drivers/clk/samsung/Kconfig
> @@ -1,6 +1,5 @@
>  config COMMON_CLK_SAMSUNG
>  	bool
> -	select COMMON_CLK
>  
>  config S3C2410_COMMON_CLK
>  	bool
> 

Re: [PATCH] clk: Move vendor's Kconfig into CCF menu section

[James Liao]

Hi Arnd,

On Wed, 2016-01-27 at 10:27 +0100, Arnd Bergmann wrote:
> On Wednesday 27 January 2016 17:18:03 kbuild test robot wrote:
> > Hi James,
> > 
> > [auto build test ERROR on clk/clk-next]
> > [also build test ERROR on v4.5-rc1 next-20160127]
> > [if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
> > 
> > url:    https://github.com/0day-ci/linux/commits/James-Liao/clk-Move-vendor-s-Kconfig-into-CCF-menu-section/20160127-152850
> > base:   https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next
> > config: arm-samsung (attached as .config)
> > reproduce:
> >         wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
> >         chmod +x ~/bin/make.cross
> >         # save the attached .config to linux build tree
> >         make.cross ARCH=arm 
> > 
> > All error/warnings (new ones prefixed by >>):
> > 
> > warning: (ARCH_BAST && MACH_VR1000 && MACH_ANUBIS && MACH_OSIRIS && MACH_RX1950) selects S3C2410_COMMON_DCLK which has unmet direct dependencies (COMMON_CLK)
> > warning: (CPU_S3C2410 && CPU_S3C2440 && CPU_S3C2442) selects S3C2410_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
> > warning: (CPU_S3C2412) selects S3C2412_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
> > warning: (CPU_S3C2416 && CPU_S3C2443) selects S3C2443_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
> >    drivers/built-in.o: In function `pwm_samsung_remove':
> > >> :(.text+0xba68): undefined reference to `clk_disable'
> >    drivers/built-in.o: In function `pwm_samsung_config':
> > >> :(.text+0xbc18): undefined reference to `clk_get_rate'
> >    :(.text+0xbc30): undefined reference to `clk_get_rate'
> 
> I think you should include this change in your patch, or as a preparation.
> All other samsung platforms already select COMMON_CLK through ARCH_MULTIPLATFORM,
> and all SoCs that are part of ARCH_S3C24XX individually select a symbol that
> selects COMMON_CLK.

Oops, I didn't notice there are warnings after moving these Kconfigs
into menu section.

The original motivation of this patch is preventing new clk drivers
include their Kconfig in a wrong place, so it's not critical. Do you
think we should apply this patch (with your changes below) or drop this
patch directly?


Best regards,

James

> diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
> index bf66c8334822..85e051d1c2d6 100644
> --- a/arch/arm/mach-s3c24xx/Kconfig
> +++ b/arch/arm/mach-s3c24xx/Kconfig
> @@ -15,6 +15,7 @@ config PLAT_S3C24XX
>  	select NO_IOPORT_MAP
>  	select S3C_DEV_NAND
>  	select IRQ_DOMAIN
> +	select COMMON_CLK
>  	help
>  	  Base platform code for any Samsung S3C24XX device
>  
> diff --git a/drivers/clk/samsung/Kconfig b/drivers/clk/samsung/Kconfig
> index 84196ecdaa12..b3fe5cb01afe 100644
> --- a/drivers/clk/samsung/Kconfig
> +++ b/drivers/clk/samsung/Kconfig
> @@ -1,6 +1,5 @@
>  config COMMON_CLK_SAMSUNG
>  	bool
> -	select COMMON_CLK
>  
>  config S3C2410_COMMON_CLK
>  	bool
> 

[PATCH] clk: Move vendor's Kconfig into CCF menu section

[James Liao]

Hi Arnd,

On Wed, 2016-01-27 at 10:27 +0100, Arnd Bergmann wrote:
> On Wednesday 27 January 2016 17:18:03 kbuild test robot wrote:
> > Hi James,
> > 
> > [auto build test ERROR on clk/clk-next]
> > [also build test ERROR on v4.5-rc1 next-20160127]
> > [if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
> > 
> > url:    https://github.com/0day-ci/linux/commits/James-Liao/clk-Move-vendor-s-Kconfig-into-CCF-menu-section/20160127-152850
> > base:   https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next
> > config: arm-samsung (attached as .config)
> > reproduce:
> >         wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
> >         chmod +x ~/bin/make.cross
> >         # save the attached .config to linux build tree
> >         make.cross ARCH=arm 
> > 
> > All error/warnings (new ones prefixed by >>):
> > 
> > warning: (ARCH_BAST && MACH_VR1000 && MACH_ANUBIS && MACH_OSIRIS && MACH_RX1950) selects S3C2410_COMMON_DCLK which has unmet direct dependencies (COMMON_CLK)
> > warning: (CPU_S3C2410 && CPU_S3C2440 && CPU_S3C2442) selects S3C2410_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
> > warning: (CPU_S3C2412) selects S3C2412_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
> > warning: (CPU_S3C2416 && CPU_S3C2443) selects S3C2443_COMMON_CLK which has unmet direct dependencies (COMMON_CLK)
> >    drivers/built-in.o: In function `pwm_samsung_remove':
> > >> :(.text+0xba68): undefined reference to `clk_disable'
> >    drivers/built-in.o: In function `pwm_samsung_config':
> > >> :(.text+0xbc18): undefined reference to `clk_get_rate'
> >    :(.text+0xbc30): undefined reference to `clk_get_rate'
> 
> I think you should include this change in your patch, or as a preparation.
> All other samsung platforms already select COMMON_CLK through ARCH_MULTIPLATFORM,
> and all SoCs that are part of ARCH_S3C24XX individually select a symbol that
> selects COMMON_CLK.

Oops, I didn't notice there are warnings after moving these Kconfigs
into menu section.

The original motivation of this patch is preventing new clk drivers
include their Kconfig in a wrong place, so it's not critical. Do you
think we should apply this patch (with your changes below) or drop this
patch directly?


Best regards,

James

> diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
> index bf66c8334822..85e051d1c2d6 100644
> --- a/arch/arm/mach-s3c24xx/Kconfig
> +++ b/arch/arm/mach-s3c24xx/Kconfig
> @@ -15,6 +15,7 @@ config PLAT_S3C24XX
>  	select NO_IOPORT_MAP
>  	select S3C_DEV_NAND
>  	select IRQ_DOMAIN
> +	select COMMON_CLK
>  	help
>  	  Base platform code for any Samsung S3C24XX device
>  
> diff --git a/drivers/clk/samsung/Kconfig b/drivers/clk/samsung/Kconfig
> index 84196ecdaa12..b3fe5cb01afe 100644
> --- a/drivers/clk/samsung/Kconfig
> +++ b/drivers/clk/samsung/Kconfig
> @@ -1,6 +1,5 @@
>  config COMMON_CLK_SAMSUNG
>  	bool
> -	select COMMON_CLK
>  
>  config S3C2410_COMMON_CLK
>  	bool
> 

Re: [PATCH] clk: Move vendor's Kconfig into CCF menu section

[kbuild test robot]

[-- Attachment #1: Type: text/plain, Size: 4880 bytes --]

Hi James,

[auto build test ERROR on clk/clk-next]
[also build test ERROR on v4.5-rc1 next-20160127]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]

url:    https://github.com/0day-ci/linux/commits/James-Liao/clk-Move-vendor-s-Kconfig-into-CCF-menu-section/20160127-152850
base:   https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next
config: arm-s3c2410_defconfig (attached as .config)
reproduce:
        wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=arm 

All errors (new ones prefixed by >>):

   drivers/built-in.o: In function `clk_disable_unprepare':
>> include/linux/clk.h:484: undefined reference to `clk_disable'
   drivers/built-in.o: In function `pwm_samsung_calc_tin':
>> drivers/pwm/pwm-samsung.c:179: undefined reference to `clk_get_rate'
   drivers/built-in.o: In function `pwm_samsung_get_tin_rate':
   drivers/pwm/pwm-samsung.c:158: undefined reference to `clk_get_rate'
   drivers/built-in.o: In function `clk_prepare_enable':
>> include/linux/clk.h:474: undefined reference to `clk_enable'
   drivers/built-in.o: In function `clk_disable_unprepare':
>> include/linux/clk.h:484: undefined reference to `clk_disable'
   drivers/built-in.o: In function `clk_prepare_enable':
>> include/linux/clk.h:474: undefined reference to `clk_enable'
   drivers/built-in.o: In function `clk_disable_unprepare':
>> include/linux/clk.h:484: undefined reference to `clk_disable'
>> include/linux/clk.h:484: undefined reference to `clk_disable'
   drivers/built-in.o: In function `clk_prepare_enable':
>> include/linux/clk.h:474: undefined reference to `clk_enable'
   drivers/built-in.o: In function `s3c24xxfb_probe':
>> drivers/video/fbdev/s3c2410fb.c:940: undefined reference to `clk_get_rate'
   drivers/built-in.o: In function `clk_disable_unprepare':
>> include/linux/clk.h:484: undefined reference to `clk_disable'
   drivers/built-in.o: In function `s3c24xx_serial_getclk':
>> drivers/tty/serial/samsung.c:1171: undefined reference to `clk_get_rate'
   drivers/built-in.o: In function `clk_disable_unprepare':
>> include/linux/clk.h:484: undefined reference to `clk_disable'
   drivers/built-in.o: In function `clk_prepare_enable':
>> include/linux/clk.h:474: undefined reference to `clk_enable'
   drivers/built-in.o: In function `s3c24xx_serial_set_termios':
   drivers/tty/serial/samsung.c:1276: undefined reference to `clk_get_rate'
   drivers/built-in.o: In function `clk_prepare_enable':
>> include/linux/clk.h:474: undefined reference to `clk_enable'
   drivers/built-in.o: In function `clk_disable_unprepare':
>> include/linux/clk.h:484: undefined reference to `clk_disable'
   drivers/built-in.o: In function `clk_prepare_enable':
>> include/linux/clk.h:474: undefined reference to `clk_enable'
   drivers/built-in.o: In function `clk_disable_unprepare':
>> include/linux/clk.h:484: undefined reference to `clk_disable'
>> include/linux/clk.h:484: undefined reference to `clk_disable'
>> include/linux/clk.h:484: undefined reference to `clk_disable'
   drivers/built-in.o: In function `clk_prepare_enable':
>> include/linux/clk.h:474: undefined reference to `clk_enable'

vim +484 include/linux/clk.h

93abe8e4 Viresh Kumar 2012-07-30  468  {
93abe8e4 Viresh Kumar 2012-07-30  469  	int ret;
93abe8e4 Viresh Kumar 2012-07-30  470  
93abe8e4 Viresh Kumar 2012-07-30  471  	ret = clk_prepare(clk);
93abe8e4 Viresh Kumar 2012-07-30  472  	if (ret)
93abe8e4 Viresh Kumar 2012-07-30  473  		return ret;
93abe8e4 Viresh Kumar 2012-07-30 @474  	ret = clk_enable(clk);
93abe8e4 Viresh Kumar 2012-07-30  475  	if (ret)
93abe8e4 Viresh Kumar 2012-07-30  476  		clk_unprepare(clk);
93abe8e4 Viresh Kumar 2012-07-30  477  
93abe8e4 Viresh Kumar 2012-07-30  478  	return ret;
93abe8e4 Viresh Kumar 2012-07-30  479  }
93abe8e4 Viresh Kumar 2012-07-30  480  
93abe8e4 Viresh Kumar 2012-07-30  481  /* clk_disable_unprepare helps cases using clk_disable in non-atomic context. */
93abe8e4 Viresh Kumar 2012-07-30  482  static inline void clk_disable_unprepare(struct clk *clk)
93abe8e4 Viresh Kumar 2012-07-30  483  {
93abe8e4 Viresh Kumar 2012-07-30 @484  	clk_disable(clk);
93abe8e4 Viresh Kumar 2012-07-30  485  	clk_unprepare(clk);
93abe8e4 Viresh Kumar 2012-07-30  486  }
93abe8e4 Viresh Kumar 2012-07-30  487  

:::::: The code at line 484 was first introduced by commit
:::::: 93abe8e4b13ae9a0428ce940a8a03ac72a7626f1 clk: add non CONFIG_HAVE_CLK routines

:::::: TO: Viresh Kumar <viresh.kumar@st.com>
:::::: CC: Linus Torvalds <torvalds@linux-foundation.org>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 21249 bytes --]

Re: [PATCH] clk: Move vendor's Kconfig into CCF menu section

[kbuild test robot]

[-- Attachment #1: Type: text/plain, Size: 4931 bytes --]

Hi James,

[auto build test ERROR on clk/clk-next]
[also build test ERROR on v4.5-rc1 next-20160127]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]

url:    https://github.com/0day-ci/linux/commits/James-Liao/clk-Move-vendor-s-Kconfig-into-CCF-menu-section/20160127-152850
base:   https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next
config: arm-s3c2410_defconfig (attached as .config)
reproduce:
        wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=arm 

All errors (new ones prefixed by >>):

   drivers/built-in.o: In function `clk_disable_unprepare':
>> include/linux/clk.h:484: undefined reference to `clk_disable'
   drivers/built-in.o: In function `pwm_samsung_calc_tin':
>> drivers/pwm/pwm-samsung.c:179: undefined reference to `clk_get_rate'
   drivers/built-in.o: In function `pwm_samsung_get_tin_rate':
   drivers/pwm/pwm-samsung.c:158: undefined reference to `clk_get_rate'
   drivers/built-in.o: In function `clk_prepare_enable':
>> include/linux/clk.h:474: undefined reference to `clk_enable'
   drivers/built-in.o: In function `clk_disable_unprepare':
>> include/linux/clk.h:484: undefined reference to `clk_disable'
   drivers/built-in.o: In function `clk_prepare_enable':
>> include/linux/clk.h:474: undefined reference to `clk_enable'
   drivers/built-in.o: In function `clk_disable_unprepare':
>> include/linux/clk.h:484: undefined reference to `clk_disable'
>> include/linux/clk.h:484: undefined reference to `clk_disable'
   drivers/built-in.o: In function `clk_prepare_enable':
>> include/linux/clk.h:474: undefined reference to `clk_enable'
   drivers/built-in.o: In function `s3c24xxfb_probe':
>> drivers/video/fbdev/s3c2410fb.c:940: undefined reference to `clk_get_rate'
   drivers/built-in.o: In function `clk_disable_unprepare':
>> include/linux/clk.h:484: undefined reference to `clk_disable'
   drivers/built-in.o: In function `s3c24xx_serial_getclk':
>> drivers/tty/serial/samsung.c:1171: undefined reference to `clk_get_rate'
   drivers/built-in.o: In function `clk_disable_unprepare':
>> include/linux/clk.h:484: undefined reference to `clk_disable'
   drivers/built-in.o: In function `clk_prepare_enable':
>> include/linux/clk.h:474: undefined reference to `clk_enable'
   drivers/built-in.o: In function `s3c24xx_serial_set_termios':
   drivers/tty/serial/samsung.c:1276: undefined reference to `clk_get_rate'
   drivers/built-in.o: In function `clk_prepare_enable':
>> include/linux/clk.h:474: undefined reference to `clk_enable'
   drivers/built-in.o: In function `clk_disable_unprepare':
>> include/linux/clk.h:484: undefined reference to `clk_disable'
   drivers/built-in.o: In function `clk_prepare_enable':
>> include/linux/clk.h:474: undefined reference to `clk_enable'
   drivers/built-in.o: In function `clk_disable_unprepare':
>> include/linux/clk.h:484: undefined reference to `clk_disable'
>> include/linux/clk.h:484: undefined reference to `clk_disable'
>> include/linux/clk.h:484: undefined reference to `clk_disable'
   drivers/built-in.o: In function `clk_prepare_enable':
>> include/linux/clk.h:474: undefined reference to `clk_enable'

vim +484 include/linux/clk.h

93abe8e4 Viresh Kumar 2012-07-30  468  {
93abe8e4 Viresh Kumar 2012-07-30  469  	int ret;
93abe8e4 Viresh Kumar 2012-07-30  470  
93abe8e4 Viresh Kumar 2012-07-30  471  	ret = clk_prepare(clk);
93abe8e4 Viresh Kumar 2012-07-30  472  	if (ret)
93abe8e4 Viresh Kumar 2012-07-30  473  		return ret;
93abe8e4 Viresh Kumar 2012-07-30 @474  	ret = clk_enable(clk);
93abe8e4 Viresh Kumar 2012-07-30  475  	if (ret)
93abe8e4 Viresh Kumar 2012-07-30  476  		clk_unprepare(clk);
93abe8e4 Viresh Kumar 2012-07-30  477  
93abe8e4 Viresh Kumar 2012-07-30  478  	return ret;
93abe8e4 Viresh Kumar 2012-07-30  479  }
93abe8e4 Viresh Kumar 2012-07-30  480  
93abe8e4 Viresh Kumar 2012-07-30  481  /* clk_disable_unprepare helps cases using clk_disable in non-atomic context. */
93abe8e4 Viresh Kumar 2012-07-30  482  static inline void clk_disable_unprepare(struct clk *clk)
93abe8e4 Viresh Kumar 2012-07-30  483  {
93abe8e4 Viresh Kumar 2012-07-30 @484  	clk_disable(clk);
93abe8e4 Viresh Kumar 2012-07-30  485  	clk_unprepare(clk);
93abe8e4 Viresh Kumar 2012-07-30  486  }
93abe8e4 Viresh Kumar 2012-07-30  487  

:::::: The code at line 484 was first introduced by commit
:::::: 93abe8e4b13ae9a0428ce940a8a03ac72a7626f1 clk: add non CONFIG_HAVE_CLK routines

:::::: TO: Viresh Kumar <viresh.kumar-qxv4g6HH51o@public.gmane.org>
:::::: CC: Linus Torvalds <torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 21249 bytes --]

[PATCH] clk: Move vendor's Kconfig into CCF menu section

[kbuild test robot]

Hi James,

[auto build test ERROR on clk/clk-next]
[also build test ERROR on v4.5-rc1 next-20160127]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]

url:    https://github.com/0day-ci/linux/commits/James-Liao/clk-Move-vendor-s-Kconfig-into-CCF-menu-section/20160127-152850
base:   https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next
config: arm-s3c2410_defconfig (attached as .config)
reproduce:
        wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=arm 

All errors (new ones prefixed by >>):

   drivers/built-in.o: In function `clk_disable_unprepare':
>> include/linux/clk.h:484: undefined reference to `clk_disable'
   drivers/built-in.o: In function `pwm_samsung_calc_tin':
>> drivers/pwm/pwm-samsung.c:179: undefined reference to `clk_get_rate'
   drivers/built-in.o: In function `pwm_samsung_get_tin_rate':
   drivers/pwm/pwm-samsung.c:158: undefined reference to `clk_get_rate'
   drivers/built-in.o: In function `clk_prepare_enable':
>> include/linux/clk.h:474: undefined reference to `clk_enable'
   drivers/built-in.o: In function `clk_disable_unprepare':
>> include/linux/clk.h:484: undefined reference to `clk_disable'
   drivers/built-in.o: In function `clk_prepare_enable':
>> include/linux/clk.h:474: undefined reference to `clk_enable'
   drivers/built-in.o: In function `clk_disable_unprepare':
>> include/linux/clk.h:484: undefined reference to `clk_disable'
>> include/linux/clk.h:484: undefined reference to `clk_disable'
   drivers/built-in.o: In function `clk_prepare_enable':
>> include/linux/clk.h:474: undefined reference to `clk_enable'
   drivers/built-in.o: In function `s3c24xxfb_probe':
>> drivers/video/fbdev/s3c2410fb.c:940: undefined reference to `clk_get_rate'
   drivers/built-in.o: In function `clk_disable_unprepare':
>> include/linux/clk.h:484: undefined reference to `clk_disable'
   drivers/built-in.o: In function `s3c24xx_serial_getclk':
>> drivers/tty/serial/samsung.c:1171: undefined reference to `clk_get_rate'
   drivers/built-in.o: In function `clk_disable_unprepare':
>> include/linux/clk.h:484: undefined reference to `clk_disable'
   drivers/built-in.o: In function `clk_prepare_enable':
>> include/linux/clk.h:474: undefined reference to `clk_enable'
   drivers/built-in.o: In function `s3c24xx_serial_set_termios':
   drivers/tty/serial/samsung.c:1276: undefined reference to `clk_get_rate'
   drivers/built-in.o: In function `clk_prepare_enable':
>> include/linux/clk.h:474: undefined reference to `clk_enable'
   drivers/built-in.o: In function `clk_disable_unprepare':
>> include/linux/clk.h:484: undefined reference to `clk_disable'
   drivers/built-in.o: In function `clk_prepare_enable':
>> include/linux/clk.h:474: undefined reference to `clk_enable'
   drivers/built-in.o: In function `clk_disable_unprepare':
>> include/linux/clk.h:484: undefined reference to `clk_disable'
>> include/linux/clk.h:484: undefined reference to `clk_disable'
>> include/linux/clk.h:484: undefined reference to `clk_disable'
   drivers/built-in.o: In function `clk_prepare_enable':
>> include/linux/clk.h:474: undefined reference to `clk_enable'

vim +484 include/linux/clk.h

93abe8e4 Viresh Kumar 2012-07-30  468  {
93abe8e4 Viresh Kumar 2012-07-30  469  	int ret;
93abe8e4 Viresh Kumar 2012-07-30  470  
93abe8e4 Viresh Kumar 2012-07-30  471  	ret = clk_prepare(clk);
93abe8e4 Viresh Kumar 2012-07-30  472  	if (ret)
93abe8e4 Viresh Kumar 2012-07-30  473  		return ret;
93abe8e4 Viresh Kumar 2012-07-30 @474  	ret = clk_enable(clk);
93abe8e4 Viresh Kumar 2012-07-30  475  	if (ret)
93abe8e4 Viresh Kumar 2012-07-30  476  		clk_unprepare(clk);
93abe8e4 Viresh Kumar 2012-07-30  477  
93abe8e4 Viresh Kumar 2012-07-30  478  	return ret;
93abe8e4 Viresh Kumar 2012-07-30  479  }
93abe8e4 Viresh Kumar 2012-07-30  480  
93abe8e4 Viresh Kumar 2012-07-30  481  /* clk_disable_unprepare helps cases using clk_disable in non-atomic context. */
93abe8e4 Viresh Kumar 2012-07-30  482  static inline void clk_disable_unprepare(struct clk *clk)
93abe8e4 Viresh Kumar 2012-07-30  483  {
93abe8e4 Viresh Kumar 2012-07-30 @484  	clk_disable(clk);
93abe8e4 Viresh Kumar 2012-07-30  485  	clk_unprepare(clk);
93abe8e4 Viresh Kumar 2012-07-30  486  }
93abe8e4 Viresh Kumar 2012-07-30  487  

:::::: The code at line 484 was first introduced by commit
:::::: 93abe8e4b13ae9a0428ce940a8a03ac72a7626f1 clk: add non CONFIG_HAVE_CLK routines

:::::: TO: Viresh Kumar <viresh.kumar@st.com>
:::::: CC: Linus Torvalds <torvalds@linux-foundation.org>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
-------------- next part --------------
A non-text attachment was scrubbed...
Name: .config.gz
Type: application/octet-stream
Size: 21249 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160127/64f5aa6b/attachment-0001.obj>

Re: [PATCH] clk: Move vendor's Kconfig into CCF menu section

[Arnd Bergmann]

On Wednesday 27 January 2016 17:56:18 James Liao wrote:
> > 
> > I think you should include this change in your patch, or as a preparation.
> > All other samsung platforms already select COMMON_CLK through ARCH_MULTIPLATFORM,
> > and all SoCs that are part of ARCH_S3C24XX individually select a symbol that
> > selects COMMON_CLK.
> 
> Oops, I didn't notice there are warnings after moving these Kconfigs
> into menu section.
> 
> The original motivation of this patch is preventing new clk drivers
> include their Kconfig in a wrong place, so it's not critical. Do you
> think we should apply this patch (with your changes below) or drop this
> patch directly?


I think your patch is good, we just need to fix S3C24xx, which is doing
things in a strange way for historic reasons.

	Arnd

[PATCH] clk: Move vendor's Kconfig into CCF menu section

[Arnd Bergmann]

On Wednesday 27 January 2016 17:56:18 James Liao wrote:
> > 
> > I think you should include this change in your patch, or as a preparation.
> > All other samsung platforms already select COMMON_CLK through ARCH_MULTIPLATFORM,
> > and all SoCs that are part of ARCH_S3C24XX individually select a symbol that
> > selects COMMON_CLK.
> 
> Oops, I didn't notice there are warnings after moving these Kconfigs
> into menu section.
> 
> The original motivation of this patch is preventing new clk drivers
> include their Kconfig in a wrong place, so it's not critical. Do you
> think we should apply this patch (with your changes below) or drop this
> patch directly?


I think your patch is good, we just need to fix S3C24xx, which is doing
things in a strange way for historic reasons.

	Arnd

Re: [PATCH] clk: Move vendor's Kconfig into CCF menu section

[kbuild test robot]

[-- Attachment #1: Type: text/plain, Size: 1012 bytes --]

Hi James,

[auto build test WARNING on clk/clk-next]
[also build test WARNING on v4.5-rc1 next-20160127]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]

url:    https://github.com/0day-ci/linux/commits/James-Liao/clk-Move-vendor-s-Kconfig-into-CCF-menu-section/20160127-152850
base:   https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next
config: arm64-allmodconfig (attached as .config)
reproduce:
        wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=arm64 

All warnings (new ones prefixed by >>):

warning: (ARCH_EXYNOS7) selects COMMON_CLK_SAMSUNG which has unmet direct dependencies (COMMON_CLK)

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 46703 bytes --]

Re: [PATCH] clk: Move vendor's Kconfig into CCF menu section

[kbuild test robot]

[-- Attachment #1: Type: text/plain, Size: 1012 bytes --]

Hi James,

[auto build test WARNING on clk/clk-next]
[also build test WARNING on v4.5-rc1 next-20160127]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]

url:    https://github.com/0day-ci/linux/commits/James-Liao/clk-Move-vendor-s-Kconfig-into-CCF-menu-section/20160127-152850
base:   https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next
config: arm64-allmodconfig (attached as .config)
reproduce:
        wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=arm64 

All warnings (new ones prefixed by >>):

warning: (ARCH_EXYNOS7) selects COMMON_CLK_SAMSUNG which has unmet direct dependencies (COMMON_CLK)

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 46703 bytes --]

[PATCH] clk: Move vendor's Kconfig into CCF menu section

[kbuild test robot]

Hi James,

[auto build test WARNING on clk/clk-next]
[also build test WARNING on v4.5-rc1 next-20160127]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]

url:    https://github.com/0day-ci/linux/commits/James-Liao/clk-Move-vendor-s-Kconfig-into-CCF-menu-section/20160127-152850
base:   https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next
config: arm64-allmodconfig (attached as .config)
reproduce:
        wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=arm64 

All warnings (new ones prefixed by >>):

warning: (ARCH_EXYNOS7) selects COMMON_CLK_SAMSUNG which has unmet direct dependencies (COMMON_CLK)

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
-------------- next part --------------
A non-text attachment was scrubbed...
Name: .config.gz
Type: application/octet-stream
Size: 46703 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160127/6190b6e1/attachment-0001.obj>

Re: [PATCH] clk: Move vendor's Kconfig into CCF menu section

[Stephen Boyd]

On 01/27, Arnd Bergmann wrote:
> On Wednesday 27 January 2016 17:56:18 James Liao wrote:
> > > 
> > > I think you should include this change in your patch, or as a preparation.
> > > All other samsung platforms already select COMMON_CLK through ARCH_MULTIPLATFORM,
> > > and all SoCs that are part of ARCH_S3C24XX individually select a symbol that
> > > selects COMMON_CLK.
> > 
> > Oops, I didn't notice there are warnings after moving these Kconfigs
> > into menu section.
> > 
> > The original motivation of this patch is preventing new clk drivers
> > include their Kconfig in a wrong place, so it's not critical. Do you
> > think we should apply this patch (with your changes below) or drop this
> > patch directly?
> 
> 
> I think your patch is good, we just need to fix S3C24xx, which is doing
> things in a strange way for historic reasons.

So far we've taken the approach of not caring if they include
their Kconfig outside the common clk menu when all the configs
inside the Kconfig file are hidden. Of course, when they aren't
hidden this becomes a problem, but that isn't the case unless
something changed recently.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH] clk: Move vendor's Kconfig into CCF menu section

[Stephen Boyd]

On 01/27, Arnd Bergmann wrote:
> On Wednesday 27 January 2016 17:56:18 James Liao wrote:
> > > 
> > > I think you should include this change in your patch, or as a preparation.
> > > All other samsung platforms already select COMMON_CLK through ARCH_MULTIPLATFORM,
> > > and all SoCs that are part of ARCH_S3C24XX individually select a symbol that
> > > selects COMMON_CLK.
> > 
> > Oops, I didn't notice there are warnings after moving these Kconfigs
> > into menu section.
> > 
> > The original motivation of this patch is preventing new clk drivers
> > include their Kconfig in a wrong place, so it's not critical. Do you
> > think we should apply this patch (with your changes below) or drop this
> > patch directly?
> 
> 
> I think your patch is good, we just need to fix S3C24xx, which is doing
> things in a strange way for historic reasons.

So far we've taken the approach of not caring if they include
their Kconfig outside the common clk menu when all the configs
inside the Kconfig file are hidden. Of course, when they aren't
hidden this becomes a problem, but that isn't the case unless
something changed recently.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [PATCH] clk: Move vendor's Kconfig into CCF menu section

[Arnd Bergmann]

On Thursday 28 January 2016 00:36:56 Stephen Boyd wrote:
> On 01/27, Arnd Bergmann wrote:
> > On Wednesday 27 January 2016 17:56:18 James Liao wrote:
> > > > 
> > > > I think you should include this change in your patch, or as a preparation.
> > > > All other samsung platforms already select COMMON_CLK through ARCH_MULTIPLATFORM,
> > > > and all SoCs that are part of ARCH_S3C24XX individually select a symbol that
> > > > selects COMMON_CLK.
> > > 
> > > Oops, I didn't notice there are warnings after moving these Kconfigs
> > > into menu section.
> > > 
> > > The original motivation of this patch is preventing new clk drivers
> > > include their Kconfig in a wrong place, so it's not critical. Do you
> > > think we should apply this patch (with your changes below) or drop this
> > > patch directly?
> > 
> > 
> > I think your patch is good, we just need to fix S3C24xx, which is doing
> > things in a strange way for historic reasons.
> 
> So far we've taken the approach of not caring if they include
> their Kconfig outside the common clk menu when all the configs
> inside the Kconfig file are hidden. Of course, when they aren't
> hidden this becomes a problem, but that isn't the case unless
> something changed recently.

They are all hidden, but there is no real reason for that I think
(other than the samsung glitch).

Having them inside the menu makes it possible to add '|| COMPILE_TEST'
as a follow-up, and makes it more consistent overall.

	Arnd

[PATCH] clk: Move vendor's Kconfig into CCF menu section

[Arnd Bergmann]

On Thursday 28 January 2016 00:36:56 Stephen Boyd wrote:
> On 01/27, Arnd Bergmann wrote:
> > On Wednesday 27 January 2016 17:56:18 James Liao wrote:
> > > > 
> > > > I think you should include this change in your patch, or as a preparation.
> > > > All other samsung platforms already select COMMON_CLK through ARCH_MULTIPLATFORM,
> > > > and all SoCs that are part of ARCH_S3C24XX individually select a symbol that
> > > > selects COMMON_CLK.
> > > 
> > > Oops, I didn't notice there are warnings after moving these Kconfigs
> > > into menu section.
> > > 
> > > The original motivation of this patch is preventing new clk drivers
> > > include their Kconfig in a wrong place, so it's not critical. Do you
> > > think we should apply this patch (with your changes below) or drop this
> > > patch directly?
> > 
> > 
> > I think your patch is good, we just need to fix S3C24xx, which is doing
> > things in a strange way for historic reasons.
> 
> So far we've taken the approach of not caring if they include
> their Kconfig outside the common clk menu when all the configs
> inside the Kconfig file are hidden. Of course, when they aren't
> hidden this becomes a problem, but that isn't the case unless
> something changed recently.

They are all hidden, but there is no real reason for that I think
(other than the samsung glitch).

Having them inside the menu makes it possible to add '|| COMPILE_TEST'
as a follow-up, and makes it more consistent overall.

	Arnd