From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd@arndb.de (Arnd Bergmann) Date: Thu, 6 Jun 2013 17:58:24 +0200 Subject: [PATCH 4/4] ARM: ux500: Remove call to u8500_of_init_devices() - again In-Reply-To: <1370517676-10909-5-git-send-email-lee.jones@linaro.org> References: <1370517676-10909-1-git-send-email-lee.jones@linaro.org> <1370517676-10909-5-git-send-email-lee.jones@linaro.org> Message-ID: <201306061758.25106.arnd@arndb.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thursday 06 June 2013, Lee Jones wrote: > Somehow, probably due to a merge error the call to u8500_of_init_devices() > has re-appeared in next, causing this error: > > arch/arm/mach-ux500/cpu-db8500.c: In function ?u8500_init_machine?: > arch/arm/mach-ux500/cpu-db8500.c:268:2: error: implicit declaration of \ > function ?u8500_of_init_devices? [-Werror=implicit-function-declaration] > arch/arm/mach-ux500/cpu-db8500.c:268:9: warning: assignment makes pointer \ > from integer without a cast [enabled by default] > > Signed-off-by: Lee Jones > --- > arch/arm/mach-ux500/cpu-db8500.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c > index d8ee616..f391d08 100644 > --- a/arch/arm/mach-ux500/cpu-db8500.c > +++ b/arch/arm/mach-ux500/cpu-db8500.c > @@ -264,9 +264,6 @@ static void __init u8500_init_machine(void) > else if (of_machine_is_compatible("st-ericsson,ccu9540")) {} > /* TODO: Add pinmaps for ccu9540 board. */ > > - /* TODO: Export SoC, USB, cpu-freq and DMA40 */ > - parent = u8500_of_init_devices(); > - > /* automatically probe child nodes of dbx5x0 devices */ > if (of_machine_is_compatible("st-ericsson,u8540")) > of_platform_populate(NULL, u8500_local_bus_nodes, > -- > 1.7.10.4 > > In the code I'm looking at, the definition for that function is /* TODO: Once all pieces are DT:ed, remove completely. */ static struct device * __init u8500_of_init_devices(void) { struct device *parent = db8500_soc_device_init(); db8500_add_usb(parent, usb_db8500_dma_cfg, usb_db8500_dma_cfg); return parent; } I'm not sure about the db8500_add_usb() call, but I think at least db8500_soc_device_init() is required to get the root device for all other devices. Arnd From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752830Ab3FFP6a (ORCPT ); Thu, 6 Jun 2013 11:58:30 -0400 Received: from moutng.kundenserver.de ([212.227.17.8]:50024 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751728Ab3FFP63 (ORCPT ); Thu, 6 Jun 2013 11:58:29 -0400 From: Arnd Bergmann To: Lee Jones Subject: Re: [PATCH 4/4] ARM: ux500: Remove call to u8500_of_init_devices() - again Date: Thu, 6 Jun 2013 17:58:24 +0200 User-Agent: KMail/1.12.2 (Linux/3.8.0-22-generic; KDE/4.3.2; x86_64; ; ) Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linus.walleij@stericsson.com, srinidhi.kasagar@stericsson.com References: <1370517676-10909-1-git-send-email-lee.jones@linaro.org> <1370517676-10909-5-git-send-email-lee.jones@linaro.org> In-Reply-To: <1370517676-10909-5-git-send-email-lee.jones@linaro.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <201306061758.25106.arnd@arndb.de> X-Provags-ID: V02:K0:viullcW38CxnKMFtXu6jfPelyJ7Srg7RwDBz9PlGtZK ilWyLRu5/iGgKjbVJHvuwfNdPrGSGRA+Y7RPHhP0U2tLHfSUQr ZoBmNiVX7duHiuuoczTjaKNNKYG4w2Ei91pszvNPQNg35L3/+G d56ylFQZugUuTVxKPN22IA5qGELmuHSKWcEH01GAtv50SMYDiK tG0Ceuawf/tVlhOcGyIOadP70T26hdqH8TrjhYsnyKG9Nw0EFW 2UjHWvp7sktsMEHq6xmDDv1KSBKqYJX0O0JJR1CQkDeNEU+jVF 55z5NuRzzVBlWEGYkX6YtbaqXIH4GTv8mjCzlVh3NiEgm9Fhx5 BYn9ntLEDucR7advDcps= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thursday 06 June 2013, Lee Jones wrote: > Somehow, probably due to a merge error the call to u8500_of_init_devices() > has re-appeared in next, causing this error: > > arch/arm/mach-ux500/cpu-db8500.c: In function ‘u8500_init_machine’: > arch/arm/mach-ux500/cpu-db8500.c:268:2: error: implicit declaration of \ > function ‘u8500_of_init_devices’ [-Werror=implicit-function-declaration] > arch/arm/mach-ux500/cpu-db8500.c:268:9: warning: assignment makes pointer \ > from integer without a cast [enabled by default] > > Signed-off-by: Lee Jones > --- > arch/arm/mach-ux500/cpu-db8500.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c > index d8ee616..f391d08 100644 > --- a/arch/arm/mach-ux500/cpu-db8500.c > +++ b/arch/arm/mach-ux500/cpu-db8500.c > @@ -264,9 +264,6 @@ static void __init u8500_init_machine(void) > else if (of_machine_is_compatible("st-ericsson,ccu9540")) {} > /* TODO: Add pinmaps for ccu9540 board. */ > > - /* TODO: Export SoC, USB, cpu-freq and DMA40 */ > - parent = u8500_of_init_devices(); > - > /* automatically probe child nodes of dbx5x0 devices */ > if (of_machine_is_compatible("st-ericsson,u8540")) > of_platform_populate(NULL, u8500_local_bus_nodes, > -- > 1.7.10.4 > > In the code I'm looking at, the definition for that function is /* TODO: Once all pieces are DT:ed, remove completely. */ static struct device * __init u8500_of_init_devices(void) { struct device *parent = db8500_soc_device_init(); db8500_add_usb(parent, usb_db8500_dma_cfg, usb_db8500_dma_cfg); return parent; } I'm not sure about the db8500_add_usb() call, but I think at least db8500_soc_device_init() is required to get the root device for all other devices. Arnd