From patchwork Sun Nov 5 14:12:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 10042201 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B475F6037D for ; Sun, 5 Nov 2017 14:13:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A51A42923E for ; Sun, 5 Nov 2017 14:13:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 99DF829444; Sun, 5 Nov 2017 14:13:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 130232923E for ; Sun, 5 Nov 2017 14:13:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=T1N+FIKtEv95cUAeUfiTRjygjaOUPkz7hBlArntQtZI=; b=W8uqF2uIWZB/x99YR1mh9XuDVo zZrht1EdCQcrQvygGnO3Zp6VzMZYTpHr4AEzWXzgEoVBcnE9cXRdnGJz5BYa55nGJhUYe//2PPfk/ sc1FrCVGZXqKsRd6TdKSSasXD3HI1m+Y2ScxYK6wMn/YSk1Il7hlxM2C0SrNWf10cwEcO03dMH/NC GZSCuWgkTJQS1QlUGzqTMcJC9gIsiUqPt/sYrsjJ+3kjakUaBT8VMs2Q8YTdjsqKc5H5dtpIjYg0A GEaLFI4xagUbNn25ezMl54nZbZylM+gD9+JW/i/WlMWHGZyQqWwkj9f5/aixv3l+5ErG8y4z61eKi sz/Q7NfQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eBLg8-000447-Ez; Sun, 05 Nov 2017 14:13:36 +0000 Received: from sauhun.de ([88.99.104.3] helo=pokefinder.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eBLfW-0003YK-9n for linux-arm-kernel@lists.infradead.org; Sun, 05 Nov 2017 14:13:03 +0000 Received: from localhost (p54B333B7.dip0.t-ipconnect.de [84.179.51.183]) by pokefinder.org (Postfix) with ESMTPSA id 400F42C061A; Sun, 5 Nov 2017 15:12:37 +0100 (CET) From: Wolfram Sang To: linux-i2c@vger.kernel.org Subject: [PATCH 1/2] ARM: pxa: move declarations to proper place Date: Sun, 5 Nov 2017 15:12:25 +0100 Message-Id: <20171105141226.13624-2-wsa@the-dreams.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171105141226.13624-1-wsa@the-dreams.de> References: <20171105141226.13624-1-wsa@the-dreams.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171105_061258_561916_CB0982AB X-CRM114-Status: GOOD ( 11.03 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Robert Jarzmik , linux-arm-kernel@lists.infradead.org, Wolfram Sang MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Platform data is not the right place for such declarations, use devices.h in the mach-directory where the rest is located. Note that the board file for Zeus needed an additional include for this to work. Signed-off-by: Wolfram Sang --- arch/arm/mach-pxa/devices.h | 9 +++++++++ arch/arm/mach-pxa/zeus.c | 1 + include/linux/i2c/pxa-i2c.h | 11 ----------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-pxa/devices.h b/arch/arm/mach-pxa/devices.h index 04580c407276cd..dfd0d121fc1799 100644 --- a/arch/arm/mach-pxa/devices.h +++ b/arch/arm/mach-pxa/devices.h @@ -55,3 +55,12 @@ extern struct platform_device pxa93x_device_gpio; void __init pxa_register_device(struct platform_device *dev, void *data); void __init pxa2xx_set_dmac_info(int nb_channels, int nb_requestors); + +struct i2c_pxa_platform_data; +extern void pxa_set_i2c_info(struct i2c_pxa_platform_data *info); +#ifdef CONFIG_PXA27x +extern void pxa27x_set_i2c_power_info(struct i2c_pxa_platform_data *info); +#endif +#ifdef CONFIG_PXA3xx +extern void pxa3xx_set_i2c_power_info(struct i2c_pxa_platform_data *info); +#endif diff --git a/arch/arm/mach-pxa/zeus.c b/arch/arm/mach-pxa/zeus.c index ecbcaee5a2d5f8..8b16ba46c8c3bf 100644 --- a/arch/arm/mach-pxa/zeus.c +++ b/arch/arm/mach-pxa/zeus.c @@ -40,6 +40,7 @@ #include #include "pxa27x.h" +#include "devices.h" #include #include #include diff --git a/include/linux/i2c/pxa-i2c.h b/include/linux/i2c/pxa-i2c.h index 53aab243cbd834..5236f216dfaefd 100644 --- a/include/linux/i2c/pxa-i2c.h +++ b/include/linux/i2c/pxa-i2c.h @@ -71,15 +71,4 @@ struct i2c_pxa_platform_data { unsigned char master_code; unsigned long rate; }; - -extern void pxa_set_i2c_info(struct i2c_pxa_platform_data *info); - -#ifdef CONFIG_PXA27x -extern void pxa27x_set_i2c_power_info(struct i2c_pxa_platform_data *info); -#endif - -#ifdef CONFIG_PXA3xx -extern void pxa3xx_set_i2c_power_info(struct i2c_pxa_platform_data *info); -#endif - #endif