From patchwork Wed Nov 20 22:48:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 3215871 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7DC00C045B for ; Wed, 20 Nov 2013 22:49:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9E1DA2076A for ; Wed, 20 Nov 2013 22:49:34 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9C01C20763 for ; Wed, 20 Nov 2013 22:49:33 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VjGZx-0000gZ-OG; Wed, 20 Nov 2013 22:49:02 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VjGZq-0001cD-4X; Wed, 20 Nov 2013 22:48:54 +0000 Received: from mail-wi0-x22f.google.com ([2a00:1450:400c:c05::22f]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VjGZY-0001ZN-Um; Wed, 20 Nov 2013 22:48:37 +0000 Received: by mail-wi0-f175.google.com with SMTP id hi5so3007112wib.8 for ; Wed, 20 Nov 2013 14:48:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=L4bGYMipKq/338nxXU8y7CgN3hOaSvvof1sd3LDO3V8=; b=sqIH3PPZy0OQxbnSE2bdxUW5HYxbEdtMOZRpZc1SU/GItF7ZnNxErECEPB7is+m9dI OVgauFf4WkAgqHWAuW7MhJh0XJ9UWzv8+XZdYkEyBU5P27h2ucSJSfAGkOyeAa9rSPJx stSJWlQm2krnt6jc86dCEIOWZ1sl974p98ujaKTmJ4o+xQ7saiZUwlFHlhRIUD64gcNI kpXOIg3fqf41haX9+07UhQtmqW2LQYrcAdh/xmSkG8a5P1DwBjX0iswBPjc24+Z7rsWl SDQWa4yp07fKQUE1V4qJstvhc+9IFHSnf1hYmShRO9OMxcg950bM0xsqM41lN00XdIvk lcWw== X-Received: by 10.180.90.65 with SMTP id bu1mr3210454wib.15.1384987694716; Wed, 20 Nov 2013 14:48:14 -0800 (PST) Received: from fangorn.rup.mentorg.com (nat-min.mentorg.com. [139.181.32.34]) by mx.google.com with ESMTPSA id bs15sm20693317wib.10.2013.11.20.14.48.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Nov 2013 14:48:14 -0800 (PST) From: Dmitry Eremin-Solenikov To: linux-pcmcia@lists.infradead.org Subject: [PATCH 2/2] pcmcia: sa1111: pass sa1111_dev to jornada720-specific code Date: Thu, 21 Nov 2013 02:48:04 +0400 Message-Id: <1384987684-10692-3-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1384987684-10692-1-git-send-email-dbaryshkov@gmail.com> References: <1384987684-10692-1-git-send-email-dbaryshkov@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131120_174837_137242_F7F5A443 X-CRM114-Status: GOOD ( 11.45 ) X-Spam-Score: -2.0 (--) Cc: Russell King , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Pass sa1111_dev to platform-specific init code, as it is done by lubbock and neponset. This removes a compilation warnings: drivers/pcmcia/sa1111_jornada720.c: In function 'pcmcia_jornada720_init': drivers/pcmcia/sa1111_jornada720.c:105:3: warning: passing argument 1 of 'sa1111_set_io_dir' from incompatible pointer type [enabled by default] In file included from drivers/pcmcia/sa1111_jornada720.c:15:0: arch/arm/include/asm/hardware/sa1111.h:463:6: note: expected 'struct sa1111_dev *' but argument is of type 'struct device *' drivers/pcmcia/sa1111_jornada720.c:106:3: warning: passing argument 1 of 'sa1111_set_io' from incompatible pointer type [enabled by default] In file included from drivers/pcmcia/sa1111_jornada720.c:15:0: arch/arm/include/asm/hardware/sa1111.h:464:6: note: expected 'struct sa1111_dev *' but argument is of type 'struct device *' drivers/pcmcia/sa1111_jornada720.c:107:3: warning: passing argument 1 of 'sa1111_set_sleep_io' from incompatible pointer type [enabled by default] In file included from drivers/pcmcia/sa1111_jornada720.c:15:0: arch/arm/include/asm/hardware/sa1111.h:465:6: note: expected 'struct sa1111_dev *' but argument is of type 'struct device *' drivers/pcmcia/sa1111_jornada720.c:111:5: warning: passing argument 1 of 'sa1111_pcmcia_add' from incompatible pointer type [enabled by default] In file included from drivers/pcmcia/sa1111_jornada720.c:18:0: drivers/pcmcia/sa1111_generic.h:15:5: note: expected 'struct sa1111_dev *' but argument is of type 'struct device *' Signed-off-by: Dmitry Eremin-Solenikov --- drivers/pcmcia/sa1111_generic.c | 2 +- drivers/pcmcia/sa1111_generic.h | 2 +- drivers/pcmcia/sa1111_jornada720.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c index a353186..53299f8 100644 --- a/drivers/pcmcia/sa1111_generic.c +++ b/drivers/pcmcia/sa1111_generic.c @@ -200,7 +200,7 @@ static int pcmcia_probe(struct sa1111_dev *dev) pcmcia_badge4_init(dev); #endif #ifdef CONFIG_SA1100_JORNADA720 - pcmcia_jornada720_init(&dev->dev); + pcmcia_jornada720_init(dev); #endif #ifdef CONFIG_ARCH_LUBBOCK pcmcia_lubbock_init(dev); diff --git a/drivers/pcmcia/sa1111_generic.h b/drivers/pcmcia/sa1111_generic.h index 86b9cc8..e74ecfd 100644 --- a/drivers/pcmcia/sa1111_generic.h +++ b/drivers/pcmcia/sa1111_generic.h @@ -19,7 +19,7 @@ extern void sa1111_pcmcia_socket_state(struct soc_pcmcia_socket *, struct pcmcia extern int sa1111_pcmcia_configure_socket(struct soc_pcmcia_socket *, const socket_state_t *); extern int pcmcia_badge4_init(struct sa1111_dev *); -extern int pcmcia_jornada720_init(struct device *); +extern int pcmcia_jornada720_init(struct sa1111_dev *); extern int pcmcia_lubbock_init(struct sa1111_dev *); extern int pcmcia_neponset_init(struct sa1111_dev *); diff --git a/drivers/pcmcia/sa1111_jornada720.c b/drivers/pcmcia/sa1111_jornada720.c index 3baa3ef..ac60cd7 100644 --- a/drivers/pcmcia/sa1111_jornada720.c +++ b/drivers/pcmcia/sa1111_jornada720.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include @@ -91,7 +92,7 @@ static struct pcmcia_low_level jornada720_pcmcia_ops = { .nr = 2, }; -int pcmcia_jornada720_init(struct device *dev) +int pcmcia_jornada720_init(struct sa1111_dev *dev) { int ret = -ENODEV;