From patchwork Thu Jun 6 11:21:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 17590 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f197.google.com (mail-ve0-f197.google.com [209.85.128.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2940725DEA for ; Thu, 6 Jun 2013 11:21:29 +0000 (UTC) Received: by mail-ve0-f197.google.com with SMTP id d10sf2984067vea.8 for ; Thu, 06 Jun 2013 04:21:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-beenthere:x-forwarded-to:x-forwarded-for:delivered-to:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :mime-version:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type:content-transfer-encoding; bh=QQmr3BVAS8kQJ+Z8N3TeIp2CpkPpCvDSVfrv6SXRr7M=; b=I/M47cAWT8rIFj9BV9WjnjyEVlox3j4D/cKk83jMMezVRUnW44Jx6irOOy43wpKdme hviOgDX6wZlIKo+C3/0XxMlsPMXt7Y0CjIdhJuc+rzpWI3pBySt36Kpaez+y1hJ8CLns b6Rx3TYH8iVOU62XbDOtPlLrIVH6w9hAf3SwelG626CmyRqmhg+YmwvSQxzaW8Kery4q 3ki7MBCFJiR2BxJfQTK54Fy9xkPUyWQsm9+FE0DHRwmJdu4mvmmSpANU0hN0uKDAOU7H LGZD60ATyQmHeUY+4nLB1rv8FwJoumPLbfX+e+mV2rd3q9n1ocM9vPMqaWf9wQCoGVUc IOxg== X-Received: by 10.236.146.201 with SMTP id r49mr19954290yhj.27.1370517688921; Thu, 06 Jun 2013 04:21:28 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.60.231 with SMTP id k7ls1293786qer.22.gmail; Thu, 06 Jun 2013 04:21:28 -0700 (PDT) X-Received: by 10.52.230.201 with SMTP id ta9mr18839433vdc.119.1370517688742; Thu, 06 Jun 2013 04:21:28 -0700 (PDT) Received: from mail-ve0-x233.google.com (mail-ve0-x233.google.com [2607:f8b0:400c:c01::233]) by mx.google.com with ESMTPS id e8si9257325vcy.18.2013.06.06.04.21.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 06 Jun 2013 04:21:28 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::233 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::233; Received: by mail-ve0-f179.google.com with SMTP id d10so2056491vea.38 for ; Thu, 06 Jun 2013 04:21:28 -0700 (PDT) X-Received: by 10.52.170.148 with SMTP id am20mr18645813vdc.75.1370517688647; Thu, 06 Jun 2013 04:21:28 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.10.206 with SMTP id pb14csp62625vcb; Thu, 6 Jun 2013 04:21:28 -0700 (PDT) X-Received: by 10.194.157.165 with SMTP id wn5mr32100283wjb.15.1370517687675; Thu, 06 Jun 2013 04:21:27 -0700 (PDT) Received: from mail-wi0-x22b.google.com (mail-wi0-x22b.google.com [2a00:1450:400c:c05::22b]) by mx.google.com with ESMTPS id hw8si23590499wjb.78.2013.06.06.04.21.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 06 Jun 2013 04:21:27 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c05::22b is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c05::22b; Received: by mail-wi0-f171.google.com with SMTP id hm9so235902wib.16 for ; Thu, 06 Jun 2013 04:21:27 -0700 (PDT) X-Received: by 10.180.75.41 with SMTP id z9mr339969wiv.22.1370517687177; Thu, 06 Jun 2013 04:21:27 -0700 (PDT) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPSA id cw8sm15068455wib.7.2013.06.06.04.21.25 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 06 Jun 2013 04:21:26 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, srinidhi.kasagar@stericsson.com, Lee Jones Subject: [PATCH 4/4] ARM: ux500: Remove call to u8500_of_init_devices() - again Date: Thu, 6 Jun 2013 12:21:16 +0100 Message-Id: <1370517676-10909-5-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1370517676-10909-1-git-send-email-lee.jones@linaro.org> References: <1370517676-10909-1-git-send-email-lee.jones@linaro.org> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQn7zuYt2lI+LrvOcpuDMkZjmn6qNpMpDfhtoMXy33h2NN9gy/2pxTM4wWlwyhM80dC7L1Lx X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::233 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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,