From patchwork Fri Nov 13 19:13:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 7614071 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0AA5B9F392 for ; Fri, 13 Nov 2015 19:17:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 41F83205E3 for ; Fri, 13 Nov 2015 19:17:09 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A36C9205CA for ; Fri, 13 Nov 2015 19:17:04 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZxJnn-000867-7x; Fri, 13 Nov 2015 19:14:27 +0000 Received: from lists.s-osg.org ([54.187.51.154]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZxJnc-0007wL-Ms for linux-arm-kernel@lists.infradead.org; Fri, 13 Nov 2015 19:14:24 +0000 Received: from recife.lan (unknown [179.183.110.204]) by lists.s-osg.org (Postfix) with ESMTPSA id 78103462B3; Fri, 13 Nov 2015 11:13:44 -0800 (PST) Date: Fri, 13 Nov 2015 17:13:41 -0200 From: Mauro Carvalho Chehab To: Arnd Bergmann Subject: Re: [PATCH 2/2] [media] include/media: move platform driver headers to a separate dir Message-ID: <20151113171341.0972ef7a@recife.lan> In-Reply-To: <4220808.QEkJDXYE1T@wuerfel> References: <413d2bb0b813a7e62867de7a94b0ab61e16cb1cb.1447261977.git.mchehab@osg.samsung.com> <09e182fa61a7122356b790cd2a4a7f622dabb4ce.1447261977.git.mchehab@osg.samsung.com> <4220808.QEkJDXYE1T@wuerfel> Organization: Samsung X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-redhat-linux-gnu) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151113_111416_966221_A246D9E5 X-CRM114-Status: GOOD ( 17.02 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Krzysztof Kozlowski , Kuninori Morimoto , linux-sh@vger.kernel.org, Tony Lindgren , Sergey Lapin , Sekhar Nori , Ulf Hansson , "Lad, Prabhakar" , Laurent Pinchart , Sylwester Nawrocki , Robert Jarzmik , Harald Welte , devel@driverdev.osuosl.org, Boris BREZILLON , openezx-devel@lists.openezx.org, Russell King , Jonathan Corbet , Vinod Koul , Magnus Damm , Kukjin Kim , Hans Verkuil , Alexey Khoroshilov , Junghak Sung , D aniel Ribeiro , Linux Media Mailing List , Tomasz Stanislawski , Haojian Zhuang , Mauro Carvalho Chehab , Inki Dae , linux-samsung-soc@vger.kernel.org, Geunyoung Kim , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Stefan Schmidt , Heungjun Kim , Josh Wu , Kyungmin Park , Simon Horman , Sascha Hauer , Greg Kroah-Hartman , Shawn Guo , Guennadi Liakhovetski , Daniel Mack 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.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 Em Wed, 11 Nov 2015 21:26:31 +0100 Arnd Bergmann escreveu: > On Wednesday 11 November 2015 15:14:48 Mauro Carvalho Chehab wrote: > > rename include/media/{ => platform}/exynos-fimc.h (100%) > > rename include/media/{ => platform}/mmp-camera.h (100%) > > rename include/media/{ => platform}/omap1_camera.h (100%) > > rename include/media/{ => platform}/omap4iss.h (100%) > > rename include/media/{ => platform}/s3c_camif.h (100%) > > rename include/media/{ => platform}/s5p_hdmi.h (100%) > > rename include/media/{ => platform}/sh_mobile_ceu.h (100%) > > rename include/media/{ => platform}/sh_mobile_csi2.h (100%) > > rename include/media/{ => platform}/sh_vou.h (100%) > > rename include/media/{ => platform}/sii9234.h (100%) > > rename include/media/{ => platform}/soc_camera.h (100%) > > rename include/media/{ => platform}/soc_camera_platform.h (98%) > > rename include/media/{ => platform}/soc_mediabus.h (100%) > > This still seems to be a mix of various things. Some of these are interfaces > between drivers, while others declare a foo_platform_data structure that > is used to interface between platform code and the driver. True. What about calling putting those driver interfaces under include/media/drv-intf? That also helps moving the headers for other non-platform drivers too. > > I think the latter should go into include/linux/platform_data/media/*.h instead. Agreed. Please see the enclosed patch: Subject: [PATCH] [media] include/media: move platform driver headers to a separate dirs Let's not mix headers used by the core with those headers that are needed by some specific platform drivers or by platform data. This patch was made via this script: mkdir include/media/platform mkdir include/media/platform_data (cd include/media/; git mv $(grep -l platform_data *.h|grep -v v4l2) platform_data/) for i in include/media/*.h; do n=`basename $i`; (for j in $(git grep -l $n); do dirname $j; done)|sort|uniq|grep -ve '^.$' > list; num=$(wc -l list|cut -d' ' -f1); if [ $num == 1 ]; then if [ "`grep platform list`" != "" ]; then git mv $i include/media/drv-intf; fi; fi; done git mv include/media/exynos* include/media/soc_* include/media/sh_* include/media/drv-intf/ And some headers were manually adjusted. Then, this script fixed the address for those new headers: for i in $(find include/media/ -type f); do n=`basename $i`; git grep -l $n; done|sort|uniq >files && (echo "for i in \$(cat files); do cat \$i | \\"; cd include/media; for j in platform/ platform_data/; do for i in $(ls $j); do echo "perl -ne 's,(include [\\\"\\<]media/)($i)([\\\"\\>]),\1$j\2\3,; print \$_' |\\"; done; done; echo "cat > a && mv a \$i; done") >script&& . ./script Signed-off-by: Mauro Carvalho Chehab --- arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 2 +- arch/arm/mach-imx/mach-mx27_3ds.c | 2 +- arch/arm/mach-imx/mach-mx31_3ds.c | 2 +- arch/arm/mach-imx/mach-mx35_3ds.c | 2 +- arch/arm/mach-imx/mach-pcm037.c | 2 +- arch/arm/mach-imx/mx31moboard-marxbot.c | 2 +- arch/arm/mach-imx/mx31moboard-smartbot.c | 2 +- arch/arm/mach-omap1/board-ams-delta.c | 2 +- arch/arm/mach-omap1/include/mach/camera.h | 2 +- arch/arm/mach-omap2/board-rx51-peripherals.c | 4 ++-- arch/arm/mach-pxa/em-x270.c | 2 +- arch/arm/mach-pxa/ezx.c | 2 +- arch/arm/mach-pxa/mioa701.c | 2 +- arch/arm/mach-pxa/palmz72.c | 2 +- arch/arm/mach-pxa/pcm990-baseboard.c | 2 +- arch/arm/mach-shmobile/board-bockw.c | 2 +- arch/arm/plat-samsung/devs.c | 2 +- arch/sh/boards/mach-ap325rxa/setup.c | 6 +++--- arch/sh/boards/mach-ecovec24/setup.c | 6 +++--- arch/sh/boards/mach-kfr2r09/setup.c | 4 ++-- arch/sh/boards/mach-migor/setup.c | 4 ++-- arch/sh/boards/mach-se/7724/setup.c | 4 ++-- drivers/media/common/cx2341x.c | 2 +- drivers/media/common/saa7146/saa7146_core.c | 2 +- drivers/media/common/saa7146/saa7146_fops.c | 2 +- drivers/media/common/saa7146/saa7146_hlp.c | 2 +- drivers/media/common/saa7146/saa7146_i2c.c | 2 +- drivers/media/common/saa7146/saa7146_vbi.c | 2 +- drivers/media/common/saa7146/saa7146_video.c | 2 +- drivers/media/i2c/cx25840/cx25840-audio.c | 2 +- drivers/media/i2c/cx25840/cx25840-core.c | 2 +- drivers/media/i2c/cx25840/cx25840-firmware.c | 2 +- drivers/media/i2c/cx25840/cx25840-ir.c | 2 +- drivers/media/i2c/cx25840/cx25840-vbi.c | 2 +- drivers/media/i2c/m5mols/m5mols_capture.c | 2 +- drivers/media/i2c/msp3400-driver.c | 2 +- drivers/media/i2c/msp3400-driver.h | 2 +- drivers/media/i2c/msp3400-kthreads.c | 2 +- drivers/media/i2c/smiapp/smiapp.h | 2 +- drivers/media/i2c/soc_camera/imx074.c | 2 +- drivers/media/i2c/soc_camera/mt9m001.c | 4 ++-- drivers/media/i2c/soc_camera/mt9m111.c | 2 +- drivers/media/i2c/soc_camera/mt9t031.c | 2 +- drivers/media/i2c/soc_camera/mt9t112.c | 2 +- drivers/media/i2c/soc_camera/mt9v022.c | 4 ++-- drivers/media/i2c/soc_camera/ov2640.c | 2 +- drivers/media/i2c/soc_camera/ov5642.c | 2 +- drivers/media/i2c/soc_camera/ov6650.c | 2 +- drivers/media/i2c/soc_camera/ov772x.c | 2 +- drivers/media/i2c/soc_camera/ov9640.c | 2 +- drivers/media/i2c/soc_camera/ov9740.c | 2 +- drivers/media/i2c/soc_camera/rj54n1cb0c.c | 2 +- drivers/media/i2c/soc_camera/tw9910.c | 2 +- drivers/media/pci/bt8xx/bttv-driver.c | 2 +- drivers/media/pci/bt8xx/bttvp.h | 2 +- drivers/media/pci/cx18/cx23418.h | 2 +- drivers/media/pci/cx23885/cx23885-417.c | 2 +- drivers/media/pci/cx23885/cx23885-cards.c | 2 +- drivers/media/pci/cx23885/cx23885-video.c | 2 +- drivers/media/pci/cx23885/cx23885.h | 2 +- drivers/media/pci/cx88/cx88-blackbird.c | 2 +- drivers/media/pci/cx88/cx88.h | 2 +- drivers/media/pci/ivtv/ivtv-cards.c | 4 ++-- drivers/media/pci/ivtv/ivtv-driver.h | 2 +- drivers/media/pci/ivtv/ivtv-i2c.c | 2 +- drivers/media/pci/ivtv/ivtv-routing.c | 2 +- drivers/media/pci/saa7146/hexium_gemini.c | 2 +- drivers/media/pci/saa7146/hexium_orion.c | 2 +- drivers/media/pci/saa7146/mxb.c | 2 +- drivers/media/pci/ttpci/av7110.h | 2 +- drivers/media/pci/ttpci/budget-av.c | 2 +- drivers/media/pci/ttpci/budget.h | 2 +- drivers/media/platform/exynos4-is/common.c | 2 +- drivers/media/platform/exynos4-is/fimc-core.h | 2 +- drivers/media/platform/exynos4-is/fimc-isp-video.c | 2 +- drivers/media/platform/exynos4-is/fimc-isp.h | 2 +- drivers/media/platform/exynos4-is/fimc-lite-reg.c | 2 +- drivers/media/platform/exynos4-is/fimc-lite.c | 2 +- drivers/media/platform/exynos4-is/fimc-lite.h | 2 +- drivers/media/platform/exynos4-is/fimc-reg.c | 2 +- drivers/media/platform/exynos4-is/media-dev.c | 2 +- drivers/media/platform/exynos4-is/media-dev.h | 2 +- drivers/media/platform/exynos4-is/mipi-csis.c | 2 +- drivers/media/platform/marvell-ccic/mmp-driver.c | 2 +- drivers/media/platform/s3c-camif/camif-core.h | 2 +- drivers/media/platform/s3c-camif/camif-regs.h | 2 +- drivers/media/platform/s5p-tv/hdmi_drv.c | 2 +- drivers/media/platform/s5p-tv/sii9234_drv.c | 2 +- drivers/media/platform/sh_vou.c | 2 +- drivers/media/platform/soc_camera/atmel-isi.c | 4 ++-- drivers/media/platform/soc_camera/mx2_camera.c | 4 ++-- drivers/media/platform/soc_camera/mx3_camera.c | 4 ++-- drivers/media/platform/soc_camera/omap1_camera.c | 6 +++--- drivers/media/platform/soc_camera/pxa_camera.c | 4 ++-- drivers/media/platform/soc_camera/rcar_vin.c | 4 ++-- drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c | 8 ++++---- drivers/media/platform/soc_camera/sh_mobile_csi2.c | 8 ++++---- drivers/media/platform/soc_camera/soc_camera.c | 4 ++-- drivers/media/platform/soc_camera/soc_camera_platform.c | 4 ++-- drivers/media/platform/soc_camera/soc_mediabus.c | 2 +- drivers/media/platform/soc_camera/soc_scale_crop.c | 2 +- drivers/media/platform/timblogiw.c | 2 +- drivers/media/radio/radio-maxiradio.c | 2 +- drivers/media/radio/radio-sf16fmr2.c | 2 +- drivers/media/radio/radio-shark.c | 2 +- drivers/media/radio/radio-si476x.c | 2 +- drivers/media/radio/radio-timb.c | 2 +- drivers/media/radio/si4713/radio-usb-si4713.c | 2 +- drivers/media/radio/si4713/si4713.h | 2 +- drivers/media/radio/tea575x.c | 2 +- drivers/media/rc/gpio-ir-recv.c | 2 +- drivers/media/rc/ir-rx51.c | 2 +- drivers/media/usb/cx231xx/cx231xx-417.c | 2 +- drivers/media/usb/cx231xx/cx231xx-cards.c | 2 +- drivers/media/usb/cx231xx/cx231xx-vbi.c | 2 +- drivers/media/usb/cx231xx/cx231xx-video.c | 2 +- drivers/media/usb/cx231xx/cx231xx.h | 2 +- drivers/media/usb/em28xx/em28xx-camera.c | 2 +- drivers/media/usb/em28xx/em28xx-cards.c | 2 +- drivers/media/usb/em28xx/em28xx-video.c | 2 +- drivers/media/usb/pvrusb2/pvrusb2-audio.c | 2 +- drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c | 2 +- drivers/media/usb/pvrusb2/pvrusb2-hdw-internal.h | 2 +- drivers/mfd/timberdale.c | 4 ++-- drivers/staging/media/omap4iss/iss.h | 2 +- drivers/staging/media/omap4iss/iss_csiphy.h | 2 +- include/media/{ => drv-intf}/cx2341x.h | 0 include/media/{ => drv-intf}/cx25840.h | 0 include/media/{ => drv-intf}/exynos-fimc.h | 0 include/media/{ => drv-intf}/msp3400.h | 0 include/media/{ => drv-intf}/s3c_camif.h | 0 include/media/{ => drv-intf}/saa7146.h | 0 include/media/{ => drv-intf}/saa7146_vv.h | 2 +- include/media/{ => drv-intf}/sh_mobile_ceu.h | 0 include/media/{ => drv-intf}/sh_mobile_csi2.h | 0 include/media/{ => drv-intf}/sh_vou.h | 0 include/media/{ => drv-intf}/si476x.h | 0 include/media/{ => drv-intf}/soc_mediabus.h | 0 include/media/{ => drv-intf}/tea575x.h | 0 include/media/i2c/tw9910.h | 2 +- include/media/{ => platform_data}/gpio-ir-recv.h | 0 include/media/{ => platform_data}/ir-rx51.h | 0 include/media/{ => platform_data}/mmp-camera.h | 0 include/media/{ => platform_data}/omap1_camera.h | 0 include/media/{ => platform_data}/omap4iss.h | 0 include/media/{ => platform_data}/s5p_hdmi.h | 0 include/media/{ => platform_data}/si4713.h | 0 include/media/{ => platform_data}/sii9234.h | 0 include/media/{ => platform_data}/smiapp.h | 0 include/media/{ => platform_data}/soc_camera.h | 0 include/media/{ => platform_data}/soc_camera_platform.h | 2 +- include/media/{ => platform_data}/timb_radio.h | 0 include/media/{ => platform_data}/timb_video.h | 0 sound/pci/es1968.c | 2 +- sound/pci/fm801.c | 2 +- 155 files changed, 158 insertions(+), 158 deletions(-) diff --git a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c index ede2bdbb5dd5..44ba1f28bb34 100644 --- a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c +++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/mach-imx/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c index 9ef4640f3660..0acacada1243 100644 --- a/arch/arm/mach-imx/mach-mx27_3ds.c +++ b/arch/arm/mach-imx/mach-mx27_3ds.c @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c index 65a0dc06a97c..f22907fad8a3 100644 --- a/arch/arm/mach-imx/mach-mx31_3ds.c +++ b/arch/arm/mach-imx/mach-mx31_3ds.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include diff --git a/arch/arm/mach-imx/mach-mx35_3ds.c b/arch/arm/mach-imx/mach-mx35_3ds.c index 7e315f00648d..751bbb0d662a 100644 --- a/arch/arm/mach-imx/mach-mx35_3ds.c +++ b/arch/arm/mach-imx/mach-mx35_3ds.c @@ -45,7 +45,7 @@ #include