From patchwork Mon Nov 16 11:00:45 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: 7623931 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 4F38E9F2EC for ; Mon, 16 Nov 2015 11:03:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CED4620416 for ; Mon, 16 Nov 2015 11:03:31 +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 388E0203E6 for ; Mon, 16 Nov 2015 11:03:30 +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 1ZyHWt-0008Om-JI; Mon, 16 Nov 2015 11:00:59 +0000 Received: from [179.182.160.150] (helo=smtp.w2.samsung.com) by bombadil.infradead.org with esmtpsa (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZyHWn-0008MM-GN; Mon, 16 Nov 2015 11:00:54 +0000 Received: from mchehab by smtp.w2.samsung.com with local (Exim 4.86) (envelope-from ) id 1ZyHWg-0002dl-Gj; Mon, 16 Nov 2015 09:00:46 -0200 From: Mauro Carvalho Chehab To: Subject: [PATCH v2 3/3] [media] include/media: move platform_data to linux/platform_data/media Date: Mon, 16 Nov 2015 09:00:45 -0200 Message-Id: X-Mailer: git-send-email 2.5.0 In-Reply-To: <013152dcb3d4eaddd39aa4a37868430567bdc2d6.1447671420.git.mchehab@osg.samsung.com> References: <013152dcb3d4eaddd39aa4a37868430567bdc2d6.1447671420.git.mchehab@osg.samsung.com> In-Reply-To: <013152dcb3d4eaddd39aa4a37868430567bdc2d6.1447671420.git.mchehab@osg.samsung.com> References: <013152dcb3d4eaddd39aa4a37868430567bdc2d6.1447671420.git.mchehab@osg.samsung.com> 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 , Heiko Stuebner , Kuninori Morimoto , linux-doc@vger.kernel.org, Tony Lindgren , Ulf Hansson , Hans Verkuil , Laurent Pinchart , Lee Jones , devel@driverdev.osuosl.org, linux-samsung-soc@vger.kernel.org, Russell King , Jonathan Corbet , Vinod Koul , linux-sh@vger.kernel.org, Kukjin Kim , Jiri Slaby , Linux Media Mailing List , Tomasz Stanislawski , Arnd Bergmann , Mauro Carvalho Chehab , Mauro Carvalho Chehab , Eduardo Valentin , Julia Lawall , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Fabian Frederick , Greg Kroah-Hartman , Patrice Chotard , Guennadi Liakhovetski , Kyungmin Park , Joe Perches , Andrew Morton , "David S. Miller" 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=-5.0 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 Let's not mix platform_data headers with the core headers. Instead, let's create a subdir at linux/platform_data and move the headers to that common place, adding it to MAINTAINERS. The headers were moved with: mkdir include/linux/platform_data/media/; git mv include/media/gpio-ir-recv.h include/media/ir-rx51.h include/media/mmp-camera.h include/media/omap1_camera.h include/media/omap4iss.h include/media/s5p_hdmi.h include/media/si4713.h include/media/sii9234.h include/media/smiapp.h include/media/soc_camera.h include/media/soc_camera_platform.h include/media/timb_radio.h include/media/timb_video.h include/linux/platform_data/media/ And the references fixed with this script: MAIN_DIR="linux/platform_data/" PREV_DIR="media/" DIRS="media/" echo "Checking affected files" >&2 for i in $DIRS; do for j in $(find include/$MAIN_DIR/$i -type f -name '*.h'); do n=`basename $j` git grep -l $n done done|sort|uniq >files && ( echo "Handling files..." >&2; echo "for i in \$(cat files|grep -v Documentation); do cat \$i | \\"; ( cd include/$MAIN_DIR; for j in $DIRS; do for i in $(ls $j); do echo "perl -ne 's,(include [\\\"\\<])$PREV_DIR($i)([\\\"\\>]),\1$MAIN_DIR$j\2\3,; print \$_' |\\"; done; done; echo "cat > a && mv a \$i; done"; ); echo "Handling documentation..." >&2; echo "for i in MAINTAINERS \$(cat files); do cat \$i | \\"; ( cd include/$MAIN_DIR; for j in $DIRS; do for i in $(ls $j); do echo " perl -ne 's,include/$PREV_DIR($i)\b,include/$MAIN_DIR$j\1,; print \$_' |\\"; done; done; echo "cat > a && mv a \$i; done" ); ) >script && . ./script Signed-off-by: Mauro Carvalho Chehab Acked-by: Arnd Bergmann Acked-by: Lee Jones Acked-by: Krzysztof Kozlowski --- Documentation/video4linux/omap4_camera.txt | 2 +- Documentation/video4linux/si4713.txt | 2 +- MAINTAINERS | 1 + arch/arm/mach-omap1/include/mach/camera.h | 2 +- arch/arm/mach-omap2/board-rx51-peripherals.c | 4 ++-- arch/arm/plat-samsung/devs.c | 2 +- arch/sh/boards/mach-ap325rxa/setup.c | 2 +- drivers/media/platform/marvell-ccic/mmp-driver.c | 2 +- drivers/media/platform/s5p-tv/hdmi_drv.c | 2 +- drivers/media/platform/s5p-tv/sii9234_drv.c | 2 +- drivers/media/platform/soc_camera/omap1_camera.c | 2 +- drivers/media/platform/soc_camera/soc_camera_platform.c | 2 +- drivers/media/platform/timblogiw.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/rc/gpio-ir-recv.c | 2 +- drivers/media/rc/ir-rx51.c | 2 +- drivers/mfd/timberdale.c | 4 ++-- drivers/staging/media/omap4iss/iss.h | 2 +- drivers/staging/media/omap4iss/iss_csiphy.h | 2 +- include/{ => linux/platform_data}/media/gpio-ir-recv.h | 1 - include/{ => linux/platform_data}/media/ir-rx51.h | 0 include/{ => linux/platform_data}/media/mmp-camera.h | 0 include/{ => linux/platform_data}/media/omap1_camera.h | 0 include/{ => linux/platform_data}/media/omap4iss.h | 0 include/{ => linux/platform_data}/media/s5p_hdmi.h | 1 - include/{ => linux/platform_data}/media/si4713.h | 2 +- include/{ => linux/platform_data}/media/sii9234.h | 0 include/{ => linux/platform_data}/media/soc_camera_platform.h | 0 include/{ => linux/platform_data}/media/timb_radio.h | 0 include/{ => linux/platform_data}/media/timb_video.h | 0 32 files changed, 24 insertions(+), 25 deletions(-) rename include/{ => linux/platform_data}/media/gpio-ir-recv.h (99%) rename include/{ => linux/platform_data}/media/ir-rx51.h (100%) rename include/{ => linux/platform_data}/media/mmp-camera.h (100%) rename include/{ => linux/platform_data}/media/omap1_camera.h (100%) rename include/{ => linux/platform_data}/media/omap4iss.h (100%) rename include/{ => linux/platform_data}/media/s5p_hdmi.h (99%) rename include/{ => linux/platform_data}/media/si4713.h (96%) rename include/{ => linux/platform_data}/media/sii9234.h (100%) rename include/{ => linux/platform_data}/media/soc_camera_platform.h (100%) rename include/{ => linux/platform_data}/media/timb_radio.h (100%) rename include/{ => linux/platform_data}/media/timb_video.h (100%) diff --git a/include/media/sii9234.h b/include/linux/platform_data/media/sii9234.h similarity index 100% rename from include/media/sii9234.h rename to include/linux/platform_data/media/sii9234.h diff --git a/include/media/soc_camera_platform.h b/include/linux/platform_data/media/soc_camera_platform.h similarity index 100% rename from include/media/soc_camera_platform.h rename to include/linux/platform_data/media/soc_camera_platform.h diff --git a/include/media/timb_radio.h b/include/linux/platform_data/media/timb_radio.h similarity index 100% rename from include/media/timb_radio.h rename to include/linux/platform_data/media/timb_radio.h diff --git a/include/media/timb_video.h b/include/linux/platform_data/media/timb_video.h similarity index 100% rename from include/media/timb_video.h rename to include/linux/platform_data/media/timb_video.h diff --git a/Documentation/video4linux/omap4_camera.txt b/Documentation/video4linux/omap4_camera.txt index 25d9b40a4651..a6734aa77242 100644 --- a/Documentation/video4linux/omap4_camera.txt +++ b/Documentation/video4linux/omap4_camera.txt @@ -47,7 +47,7 @@ Tested platforms File list --------- drivers/staging/media/omap4iss/ -include/media/omap4iss.h +include/linux/platform_data/media/omap4iss.h References ---------- diff --git a/Documentation/video4linux/si4713.txt b/Documentation/video4linux/si4713.txt index 2e7392a4fee1..2ddc6b095a76 100644 --- a/Documentation/video4linux/si4713.txt +++ b/Documentation/video4linux/si4713.txt @@ -157,7 +157,7 @@ int main (int argc, char *argv[]) } The struct si4713_rnl and SI4713_IOC_MEASURE_RNL are defined under -include/media/si4713.h. +include/linux/platform_data/media/si4713.h. Stereo/Mono and RDS subchannels =============================== diff --git a/MAINTAINERS b/MAINTAINERS index dc1787719c2a..96521eb39270 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6895,6 +6895,7 @@ F: Documentation/video4linux/ F: Documentation/DocBook/media/ F: drivers/media/ F: drivers/staging/media/ +F: include/linux/platform_data/media/ F: include/media/ F: include/uapi/linux/dvb/ F: include/uapi/linux/videodev2.h diff --git a/arch/arm/mach-omap1/include/mach/camera.h b/arch/arm/mach-omap1/include/mach/camera.h index 847d00f0bb0a..caa6c0d6f0ac 100644 --- a/arch/arm/mach-omap1/include/mach/camera.h +++ b/arch/arm/mach-omap1/include/mach/camera.h @@ -1,7 +1,7 @@ #ifndef __ASM_ARCH_CAMERA_H_ #define __ASM_ARCH_CAMERA_H_ -#include +#include void omap1_camera_init(void *); diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index 14edcd7a2a1d..0a0567f8e8a0 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -39,7 +39,7 @@ #include #include -#include +#include #include #include @@ -48,7 +48,7 @@ #include