From patchwork Wed Nov 11 17:14:48 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: 7597011 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 63A9E9F1C2 for ; Wed, 11 Nov 2015 17:18:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9B2B3206E2 for ; Wed, 11 Nov 2015 17:18:19 +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 C2676206DC for ; Wed, 11 Nov 2015 17:18:16 +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 1ZwYzj-000885-9f; Wed, 11 Nov 2015 17:15:39 +0000 Received: from [186.213.240.254] (helo=smtp.w2.samsung.com) by bombadil.infradead.org with esmtpsa (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZwYzZ-00087j-Ju; Wed, 11 Nov 2015 17:15:30 +0000 Received: from mchehab by smtp.w2.samsung.com with local (Exim 4.85) (envelope-from ) id 1ZwYyw-0000jl-7K; Wed, 11 Nov 2015 15:14:50 -0200 From: Mauro Carvalho Chehab To: Subject: [PATCH 2/2] [media] include/media: move platform driver headers to a separate dir Date: Wed, 11 Nov 2015 15:14:48 -0200 Message-Id: <09e182fa61a7122356b790cd2a4a7f622dabb4ce.1447261977.git.mchehab@osg.samsung.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <413d2bb0b813a7e62867de7a94b0ab61e16cb1cb.1447261977.git.mchehab@osg.samsung.com> References: <413d2bb0b813a7e62867de7a94b0ab61e16cb1cb.1447261977.git.mchehab@osg.samsung.com> In-Reply-To: <413d2bb0b813a7e62867de7a94b0ab61e16cb1cb.1447261977.git.mchehab@osg.samsung.com> References: <413d2bb0b813a7e62867de7a94b0ab61e16cb1cb.1447261977.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 , 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 , linux-samsung-soc@vger.kernel.org, Kukjin Kim , Hans Verkuil , Alexey Khoroshilov , Junghak Sung , Daniel Ribeiro , Linux Media Mailing List , Tomasz Stanislawski , Arnd Bergmann , Mauro Carvalho Chehab , Haojian Zhuang , Mauro Carvalho Chehab , Inki Dae , Simon Horman , Geunyoung Kim , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Stefan Schmidt , Heungjun Kim , Josh Wu , Kyungmin Park , Sascha Hauer , Greg Kroah-Hartman , Shawn Guo , Guennadi Liakhovetski , Daniel Mack 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=-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 Let's not mix headers used by the core with those headers that are needed by some specific platform drivers. This patch was made via this script: mkdir include/media/platform 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/platform; fi; fi; done git mv include/media/exynos* include/media/s5p* include/media/omap* include/media/soc_* include/media/sh_include/media/platform/ 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 rc/ i2c/ platform/ common_drv/; 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 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%) diff --git a/include/media/soc_mediabus.h b/include/media/platform/soc_mediabus.h similarity index 100% rename from include/media/soc_mediabus.h rename to include/media/platform/soc_mediabus.h diff --git a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c index ede2bdbb5dd5..99bd64c69a4f 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..74d073fd4fa6 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..5e1b9c335103 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..355b9521f7f0 100644 --- a/arch/arm/mach-imx/mach-mx35_3ds.c +++ b/arch/arm/mach-imx/mach-mx35_3ds.c @@ -45,7 +45,7 @@ #include