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: 7597001 Return-Path: X-Original-To: patchwork-linux-media@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 476D09F1C2 for ; Wed, 11 Nov 2015 17:16:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 64EC4206DB for ; Wed, 11 Nov 2015 17:15:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7D2EF206E2 for ; Wed, 11 Nov 2015 17:15:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752484AbbKKRPl (ORCPT ); Wed, 11 Nov 2015 12:15:41 -0500 Received: from bombadil.infradead.org ([198.137.202.9]:58267 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752239AbbKKRPi (ORCPT ); Wed, 11 Nov 2015 12:15:38 -0500 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 Cc: Mauro Carvalho Chehab , Linux Media Mailing List , Mauro Carvalho Chehab , Shawn Guo , Sascha Hauer , Russell King , Tony Lindgren , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Daniel Ribeiro , Stefan Schmidt , Harald Welte , Sergey Lapin , Simon Horman , Magnus Damm , Kukjin Kim , Krzysztof Kozlowski , Kyungmin Park , Heungjun Kim , Guennadi Liakhovetski , Sylwester Nawrocki , Jonathan Corbet , Tomasz Stanislawski , Josh Wu , Laurent Pinchart , Greg Kroah-Hartman , Hans Verkuil , Sekhar Nori , "Lad, Prabhakar" , Vinod Koul , Kuninori Morimoto , Boris BREZILLON , Arnd Bergmann , Ulf Hansson , Inki Dae , Geunyoung Kim , Junghak Sung , Alexey Khoroshilov , linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, openezx-devel@lists.openezx.org, linux-sh@vger.kernel.org, linux-samsung-soc@vger.kernel.org, devel@driverdev.osuosl.org 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> To: unlisted-recipients:; (no To-header on input) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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