From patchwork Tue Oct 2 16:36:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11960 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 DC77223EFF for ; Tue, 2 Oct 2012 16:37:29 +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 9164FA18710 for ; Tue, 2 Oct 2012 16:37:29 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so14609099iej.11 for ; Tue, 02 Oct 2012 09:37:29 -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=OHFh68+pj9xhHcpeX4q/UvnHA2owsaNzBv8hvHZwLwI=; b=iSBPZnAqPe+17jPYG8wmhH/OJP4a1vfYmS4qyLs4/sNFQhEGtizwL9DmGhRH/JAEx4 SM8TKzpyeRUhgSzRrI++4lXXwhheYUsAYhlqc50JEc3dypYmJmaiK6GkgEs1UVny0L5x 6Z6fatoEtFfwgHCr1d9SJu/C3h58o7K9+TL9NY6XfIRurcXV3YnrcTb1uQU/b/hJevlx j/FQzh/YwrySK80isOL6eZDc/5pdhSxz0SfwaOFLA3iTN+vq3FObrK3J1yqzhr+uWLd1 N5zNqCdCenJKTONYBUdAg992iulD+onD77tVCo3SulgSEHAYxnkzaDysywCL3RLoVYDa /rgA== Received: by 10.42.110.130 with SMTP id q2mr14404890icp.53.1349195849377; Tue, 02 Oct 2012 09:37:29 -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 ex8csp92089igc; Tue, 2 Oct 2012 09:37:28 -0700 (PDT) Received: by 10.180.90.78 with SMTP id bu14mr23055193wib.21.1349195848017; Tue, 02 Oct 2012 09:37:28 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.126.187]) by mx.google.com with ESMTPS id a8si4516442wix.3.2012.10.02.09.37.27 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 02 Oct 2012 09:37:27 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.126.187 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.126.187; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.126.187 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 0LtUF2-1TTESN25WW-0114jT; Tue, 02 Oct 2012 18:37:16 +0200 From: Arnd Bergmann To: linux-arm-kernel@infradead.org Cc: arm@kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Lennert Buytenhek , Dan Williams Subject: [PATCH 13/17] ARM: iop13xx: fix iq81340sc_atux_map_irq prototype Date: Tue, 2 Oct 2012 18:36:52 +0200 Message-Id: <1349195816-2225-14-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:8l57syi4mBhTY8W6NxJiH83q8fLwJqRp+VaLsuKPKNc vd7luGcJ0qeCO5hN4JHoRKqG18r+NYhyQXogNRqq/jxYWiM1JJ 6b22CbZYqJlaM0WaoNJW61xdMNKa9wQbl7aOi0eyMZBrecPGOO wi1EGvWqnkeDBIjBYMyvnTxAubkGXxRIGfOnPRK6pvMtm3Ml5u JB6wr2kQfJIRKLDIxobFObVjbbmytNJ8MvRtsnCBoVZtuuzM0P +kyX4GXhRDOJECglbLsy9GXB9f59hhav5iDcOMrZCR8X/SHZoU 7rS0lFQTZzRsklRiPKA2ddAI+kzqzJUqN4jtkU3bZyLP4V/BYw /BwtEYjlCwQ+FDDtJjxXAK4rV6QLbRQYD0hRZ0XDHUr0B2dOZw 8bY8SoKnC9ASw== X-Gm-Message-State: ALoCoQndD2DAHwoMGopwHNGYaxcmzaedSuEIo6FgrE9wp47fNjUrhAbqoJDK3ROKg2Zj/o2XgkN2 The pci map_irq callbacks get a 'const' pci_dev argument, so change the iop13xx version to use the same prototype as everything else. Without this patch, building iop13xx_defconfig results in: arch/arm/mach-iop13xx/iq81340sc.c:63:2: warning: initialization from incompatible pointer type [enabled by default] arch/arm/mach-iop13xx/iq81340sc.c:63:2: warning: (near initialization for 'iq81340sc_pci.map_irq') [enabled by default] Signed-off-by: Arnd Bergmann Cc: Lennert Buytenhek Cc: Dan Williams --- arch/arm/mach-iop13xx/iq81340sc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-iop13xx/iq81340sc.c b/arch/arm/mach-iop13xx/iq81340sc.c index 060cddd..e947441 100644 --- a/arch/arm/mach-iop13xx/iq81340sc.c +++ b/arch/arm/mach-iop13xx/iq81340sc.c @@ -30,7 +30,7 @@ extern int init_atu; static int __init -iq81340sc_atux_map_irq(struct pci_dev *dev, u8 idsel, u8 pin) +iq81340sc_atux_map_irq(const struct pci_dev *dev, u8 idsel, u8 pin) { WARN_ON(idsel < 1 || idsel > 2);