From patchwork Wed Aug 21 14:46:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylwester Nawrocki X-Patchwork-Id: 268823 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id A03EA2C02A8 for ; Thu, 22 Aug 2013 00:47:33 +1000 (EST) Received: from mailout4.w1.samsung.com (mailout4.w1.samsung.com [210.118.77.14]) by ozlabs.org (Postfix) with ESMTP id EADCA2C00C8 for ; Thu, 22 Aug 2013 00:46:55 +1000 (EST) Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MRV00MIAYDOVTC0@mailout4.w1.samsung.com> for linuxppc-dev@lists.ozlabs.org; Wed, 21 Aug 2013 15:46:50 +0100 (BST) X-AuditID: cbfec7f5-b7f5f6d00000105f-76-5214d2d9cb1c Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id 30.D4.04191.9D2D4125; Wed, 21 Aug 2013 15:46:49 +0100 (BST) Received: from [106.116.147.32] by eusync3.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0MRV00126YE19630@eusync3.samsung.com>; Wed, 21 Aug 2013 15:46:49 +0100 (BST) Message-id: <5214D2D8.7010106@samsung.com> Date: Wed, 21 Aug 2013 16:46:48 +0200 From: Sylwester Nawrocki User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-version: 1.0 To: Wolfram Sang Subject: Re: [PATCH V2] i2c: move of helpers into the core References: <1377092832-3417-1-git-send-email-wsa@the-dreams.de> In-reply-to: <1377092832-3417-1-git-send-email-wsa@the-dreams.de> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrNLMWRmVeSWpSXmKPExsVy+t/xq7o3L4kEGRzdYWNx7lYDq8X8I+dY LZbv62e02PT4GqvFwrYlLBYdf78wWlzeNYfNomfDVlaL2Uv6WSxmnN/HZNH5ZRabxe/v/1gt Vp6YxezA6zFnWhOLx+Yl9R7nZyxk9Dh56gmLx+dNcgGsUVw2Kak5mWWpRfp2CVwZ99edZilo 1quYv2cNcwPjSqUuRk4OCQETiU9tG9khbDGJC/fWs3UxcnEICSxllJg1/wILhPOJUeJ093MW kCpeAS2Jb1dnMoLYLAKqEr9P9IDZbAKGEr1H+8BsUYEAicVLzrFD1AtK/Jh8D6xXREBFonP9 f7ChzAJtzBLH+o8zgSSEBawkTv4FWc0BtM1BomNuAEiYU8BRYuGbQ2AzmQV0JPa3TmODsOUl Nq95yzyBUWAWkhWzkJTNQlK2gJF5FaNoamlyQXFSeq6RXnFibnFpXrpecn7uJkZIhHzdwbj0 mNUhRgEORiUe3gs7RYKEWBPLiitzDzFKcDArifAWngQK8aYkVlalFuXHF5XmpBYfYmTi4JRq YJzHmco2W+3Z47BDJx/Ok0xWXitcl7Gi4mxi38/650f4Nd5bzm+95fIucJfpjFcPee+Wn5N9 e6Nd6//kdQsMH7SF9f6VfXBb7mPunbXO74xLHIt366pzNAe8uqFpInbC7r3Q8/QHZ87wVwXv E5KfcL/s5oPHAcXr3fO/2G/eHJw02at87dS5Yj1KLMUZiYZazEXFiQBBqkhHbgIAAA== Cc: devicetree@vger.kernel.org, davinci-linux-open-source@linux.davincidsp.com, linux-samsung-soc@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-i2c@vger.kernel.org, linux-tegra@vger.kernel.org, linux-omap@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16rc2 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" On 08/21/2013 03:47 PM, Wolfram Sang wrote: > I2C of helpers used to live in of_i2c.c but experience (from SPI) shows > that it is much cleaner to have this in the core. This also removes a > circular dependency between the helpers and the core, and so we can > finally register child nodes in the core instead of doing this manually > in each driver. So, fix the drivers and documentation, too. > > Acked-by: Sylwester Nawrocki > Acked-by: Rob Herring > Reviewed-by: Felipe Balbi > Acked-by: Rafael J. Wysocki > Signed-off-by: Wolfram Sang With this patch there are still couple of of_i2c.h header file inclusions: $ git grep of_i2c.h arch/powerpc/platforms/44x/warp.c:#include drivers/gpu/drm/tilcdc/tilcdc_slave.c:#include drivers/gpu/drm/tilcdc/tilcdc_tfp410.c:#include drivers/gpu/host1x/drm/output.c:#include drivers/media/platform/exynos4-is/fimc-is.c:#include drivers/media/platform/exynos4-is/media-dev.c:#include drivers/staging/imx-drm/imx-tve.c:#include sound/soc/fsl/imx-sgtl5000.c:#include sound/soc/fsl/imx-wm8962.c:#include Please include also this chunk, without it I'm getting build errors. --------------8<--------------------- --------------8<--------------------- > --- > > V1 -> V2: * Add #else branch to #if CONFIG_OF > * EXPORT_SYMBOLs got attached to wrong functions > * cosmetic change (of -> OF) > * properly based on 3.11-rc4 > > Documentation/acpi/enumeration.txt | 1 - > drivers/i2c/busses/i2c-at91.c | 3 - > drivers/i2c/busses/i2c-cpm.c | 6 -- > drivers/i2c/busses/i2c-davinci.c | 2 - > drivers/i2c/busses/i2c-designware-platdrv.c | 2 - > drivers/i2c/busses/i2c-gpio.c | 3 - > drivers/i2c/busses/i2c-i801.c | 2 - > drivers/i2c/busses/i2c-ibm_iic.c | 4 - > drivers/i2c/busses/i2c-imx.c | 3 - > drivers/i2c/busses/i2c-mpc.c | 2 - > drivers/i2c/busses/i2c-mv64xxx.c | 3 - > drivers/i2c/busses/i2c-mxs.c | 3 - > drivers/i2c/busses/i2c-nomadik.c | 3 - > drivers/i2c/busses/i2c-ocores.c | 3 - > drivers/i2c/busses/i2c-octeon.c | 3 - > drivers/i2c/busses/i2c-omap.c | 3 - > drivers/i2c/busses/i2c-pnx.c | 3 - > drivers/i2c/busses/i2c-powermac.c | 9 +- > drivers/i2c/busses/i2c-pxa.c | 2 - > drivers/i2c/busses/i2c-s3c2410.c | 2 - > drivers/i2c/busses/i2c-sh_mobile.c | 2 - > drivers/i2c/busses/i2c-sirf.c | 3 - > drivers/i2c/busses/i2c-stu300.c | 2 - > drivers/i2c/busses/i2c-tegra.c | 3 - > drivers/i2c/busses/i2c-versatile.c | 2 - > drivers/i2c/busses/i2c-wmt.c | 3 - > drivers/i2c/busses/i2c-xiic.c | 3 - > drivers/i2c/i2c-core.c | 109 +++++++++++++++++++++- > drivers/i2c/i2c-mux.c | 3 - > drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 1 - > drivers/i2c/muxes/i2c-mux-gpio.c | 1 - > drivers/i2c/muxes/i2c-mux-pinctrl.c | 1 - > drivers/media/platform/exynos4-is/fimc-is-i2c.c | 3 - > drivers/of/Kconfig | 6 -- > drivers/of/Makefile | 1 - > drivers/of/of_i2c.c | 114 ----------------------- > include/linux/i2c.h | 20 ++++ > include/linux/of_i2c.h | 46 --------- > 38 files changed, 132 insertions(+), 253 deletions(-) > delete mode 100644 drivers/of/of_i2c.c > delete mode 100644 include/linux/of_i2c.h I've tested this patch on Exynos4412 SoC based board, so this covers i2c-s3c2410 and fimc-is-i2c. Compiled with CONFIG_OF enabled. I guess after removing all remaining occurrences of #include you could add: Tested-by: Sylwester Nawrocki --- Thanks, Sylwester diff --git a/drivers/media/platform/exynos4-is/fimc-is-i2c.c b/drivers/media/platform/exynos4-is/fimc-is-i2c.c index ca07b48..e38e9dc 100644 --- a/drivers/media/platform/exynos4-is/fimc-is-i2c.c +++ b/drivers/media/platform/exynos4-is/fimc-is-i2c.c @@ -11,6 +11,7 @@ */ #include +#include #include #include #include diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/platform/exynos4-is/fimc-is.c index 6743ae3..63e4f1d 100644 --- a/drivers/media/platform/exynos4-is/fimc-is.c +++ b/drivers/media/platform/exynos4-is/fimc-is.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c index c10dee2..00e5f91 100644 --- a/drivers/media/platform/exynos4-is/media-dev.c +++ b/drivers/media/platform/exynos4-is/media-dev.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include