From patchwork Tue Oct 2 16:36:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11953 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 3E7A523EFF for ; Tue, 2 Oct 2012 16:37:19 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id D73B3A18710 for ; Tue, 2 Oct 2012 16:37:18 +0000 (UTC) Received: by ieje10 with SMTP id e10so14609099iej.11 for ; Tue, 02 Oct 2012 09:37:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-provags-id:x-gm-message-state; bh=p3RD9jJlSi0XlWIp/4VUhzc+bRZa5FTGzKXkbl/BNz0=; b=M4pcIOMIum24oCpXNRthynxhGNz6t21mkOVgOIbayQ9ovzyFKktazGfM9KGwREPoWw tVq7Y3ey7tN24KBtj31lBMRH8b3O3yG6dC7dTpDoN0fCXmcD2KMzxAnO9P/jWiZuvqni EntN61bQ1JFIdWoISKazm6pRlQh9pjSW3OB63rc3Y1KYCO6/b8Sr7EkcBnjKh3v+iq7g SAe9+nM2JnlmBQFySGHcygD+9oO2nfAHyTar5KB7OQb3lBovMd/XmaUz1TPjv9E9SOJU E1ueocKdeUUlSVoJpMPhss+trR2YKM8GH/iRH18+iwXnBcn4nsCzTMYbO0hQ2t8m7rO4 3GAw== Received: by 10.50.150.198 with SMTP id uk6mr9389538igb.43.1349195838310; Tue, 02 Oct 2012 09:37:18 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp92050igc; Tue, 2 Oct 2012 09:37:17 -0700 (PDT) Received: by 10.180.93.8 with SMTP id cq8mr23099511wib.16.1349195836549; Tue, 02 Oct 2012 09:37:16 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.17.9]) by mx.google.com with ESMTPS id cq5si3230373wib.3.2012.10.02.09.37.16 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 02 Oct 2012 09:37:16 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.17.9 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.17.9; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.17.9 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from localhost.localdomain (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0LlXtf-1Tshne3Sg3-00aqeO; Tue, 02 Oct 2012 18:37:10 +0200 From: Arnd Bergmann To: linux-arm-kernel@infradead.org Cc: arm@kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann , "Krzysztof Halasa" Subject: [PATCH 02/17] ARM: shark: fix shark_pci_init return code Date: Tue, 2 Oct 2012 18:36:41 +0200 Message-Id: <1349195816-2225-3-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1349195816-2225-1-git-send-email-arnd@arndb.de> References: <1349195816-2225-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:rFYR1JSIs/maBQvq9oNVwgA9H9nn96i1XUTbWfAAID9 xF06tfEusVC7uEWOPflLJh6upcxRN6gTOfQZmLGV5QZk0ysh1a c7/0QI+WpKIdCvlaIbpfqTcWQJPNTsJUQOOH4kpE2gQOk8f6wF 2DiQNlQCg1r7AnBYbZguiQ9UZwMes7a4MvJlXznAwLbStI3g8u JYdoFENN0184f95CUbOLZ/pJg11IpoDY8lwUeiSI0RaJId8YEM jSvbkY4bSPlWsxaJsKXLwq1leQFPBmHFyx6DGF/cBcmStMEhrC zdZ0DZnxpa/v0BtRJdyzwycXUe/STDo87dlasnnF9Nbpv5xlu/ kKEXvWjf/3FBXXpcqAfFh2YMp8Uwhi9nwHMXZKUtOzMC+BTL30 jhJEkhF+KDjFA== X-Gm-Message-State: ALoCoQk9N1oDh5GTwBBtMgUkMVYdOQ2jJruH1gMzayfMHXYUsPqRlHUejdPvoiJASLsELk3qmgBZ When run on the wrong platform, the shark_pci_init function returns an undefined value, as reported by a gcc warning, so let's just return -ENODEV. Without this patch, building shark_defconfig results in: arch/arm/mach-shark/pci.c: In function 'shark_pci_init': arch/arm/mach-shark/pci.c:42:3: warning: 'return' with no value, in function returning non-void [-Wreturn-type] Signed-off-by: Arnd Bergmann Cc: "Krzysztof Halasa" --- arch/arm/mach-shark/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-shark/pci.c b/arch/arm/mach-shark/pci.c index 9089407..2b351a3 100644 --- a/arch/arm/mach-shark/pci.c +++ b/arch/arm/mach-shark/pci.c @@ -38,7 +38,7 @@ static struct hw_pci shark_pci __initdata = { static int __init shark_pci_init(void) { if (!machine_is_shark()) - return; + return -ENODEV; pcibios_min_io = 0x6000; pcibios_min_mem = 0x50000000;