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: 834351 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yVHhW1qxcz9t2c for ; Mon, 6 Nov 2017 01:12:43 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751895AbdKEOMj (ORCPT ); Sun, 5 Nov 2017 09:12:39 -0500 Received: from sauhun.de ([88.99.104.3]:47360 "EHLO pokefinder.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751192AbdKEOMi (ORCPT ); Sun, 5 Nov 2017 09:12:38 -0500 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 Cc: linux-arm-kernel@lists.infradead.org, Robert Jarzmik , Wolfram Sang 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> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org 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