Skip to contentSkip to conversation

move media platform data to linux/platform_data/media

PATCH New Mauro Carvalho Chehab 2 participants 2 messages Nov 17, 2015 – Nov 24, 2015

Subsystems (6)
Arm (32-bit) Media (V4L/DVB) Arm sub-architectures Arm i.MX and Layerscape +2 more subsystems
lore
Share & tools
lore

Mauro Carvalho Chehab

author
#0 lore raw

PATCH v2 1/1 move media platform data to linux/platform_data/media

Now that media has its own subdirectory inside platform_data, let's move the headers that are already there to such subdir.

After moving those files, the references were adjusted using this script:

    MAIN_DIR="linux/platform_data/"
    PREV_DIR="linux/platform_data/"
    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
Suggested-by Arnd Bergmann <[email protected]>
Signed-off-by Mauro Carvalho Chehab <[email protected]>
---
 arch/arm/mach-imx/devices/devices-common.h            | 4 ++--
 arch/arm/mach-pxa/devices.c                           | 2 +-
 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/palmtreo.c                          | 2 +-
 arch/arm/mach-pxa/palmz72.c                           | 2 +-
 arch/arm/mach-pxa/pcm990-baseboard.c                  | 2 +-
 drivers/media/platform/coda/coda-common.c             | 2 +-
 drivers/media/platform/soc_camera/mx2_camera.c        | 2 +-
 drivers/media/platform/soc_camera/mx3_camera.c        | 2 +-
 drivers/media/platform/soc_camera/pxa_camera.c        | 2 +-
 drivers/media/platform/soc_camera/rcar_vin.c          | 2 +-
 include/linux/platform_data/{ => media}/camera-mx2.h  | 0
 include/linux/platform_data/{ => media}/camera-mx3.h  | 0
 include/linux/platform_data/{ => media}/camera-pxa.h  | 0
 include/linux/platform_data/{ => media}/camera-rcar.h | 0
 include/linux/platform_data/{ => media}/coda.h        | 0
 18 files changed, 14 insertions(+), 14 deletions(-)
 rename include/linux/platform_data/{ => media}/camera-mx2.h (100%)
 rename include/linux/platform_data/{ => media}/camera-mx3.h (100%)
 rename include/linux/platform_data/{ => media}/camera-pxa.h (100%)
 rename include/linux/platform_data/{ => media}/camera-rcar.h (100%)
 rename include/linux/platform_data/{ => media}/coda.h (100%)
arch/arm/mach-imx/devices/devices-common.h +2 -2
index 67f7fb13050d..09cebd8cef2b 100644
@@ -177,7 +177,7 @@ struct platform_device *__init imx_add_imx_uart_1irq(
 		const struct imxuart_platform_data *pdata);
 
 #include <linux/platform_data/video-mx3fb.h>
-#include <linux/platform_data/camera-mx3.h>
+#include <linux/platform_data/media/camera-mx3.h>
 struct imx_ipu_core_data {
 	resource_size_t iobase;
 	resource_size_t synirq;

@@ -192,7 +192,7 @@ struct platform_device *__init imx_add_mx3_sdc_fb(
 		const struct imx_ipu_core_data *data,
 		struct mx3fb_platform_data *pdata);
 
-#include <linux/platform_data/camera-mx2.h>
+#include <linux/platform_data/media/camera-mx2.h>
 struct imx_mx2_camera_data {
 	const char *devid;
 	resource_size_t iobasecsi;
arch/arm/mach-pxa/devices.c +1 -1
index 2a6e0ae2b920..d1211a40f400 100644
@@ -14,7 +14,7 @@
 #include <mach/irqs.h>
 #include <linux/platform_data/usb-ohci-pxa27x.h>
 #include <linux/platform_data/keypad-pxa27x.h>
-#include <linux/platform_data/camera-pxa.h>
+#include <linux/platform_data/media/camera-pxa.h>
 #include <mach/audio.h>
 #include <mach/hardware.h>
 #include <linux/platform_data/mmp_dma.h>
arch/arm/mach-pxa/em-x270.c +1 -1
index 9d7072b04045..8b1f89e096c6 100644
@@ -46,7 +46,7 @@
 #include <linux/platform_data/usb-ohci-pxa27x.h>
 #include <linux/platform_data/mmc-pxamci.h>
 #include <linux/platform_data/keypad-pxa27x.h>
-#include <linux/platform_data/camera-pxa.h>
+#include <linux/platform_data/media/camera-pxa.h>
 
 #include "generic.h"
 #include "devices.h"
arch/arm/mach-pxa/ezx.c +1 -1
index 9a9c15bfcd34..12af6e2d597c 100644
@@ -34,7 +34,7 @@
 #include <linux/platform_data/usb-ohci-pxa27x.h>
 #include <mach/hardware.h>
 #include <linux/platform_data/keypad-pxa27x.h>
-#include <linux/platform_data/camera-pxa.h>
+#include <linux/platform_data/media/camera-pxa.h>
 
 #include "devices.h"
 #include "generic.h"
arch/arm/mach-pxa/mioa701.c +1 -1
index 3b52b1aa0659..ccfd2b63c6a4 100644
@@ -54,7 +54,7 @@
 #include <linux/platform_data/mmc-pxamci.h>
 #include <mach/udc.h>
 #include <mach/pxa27x-udc.h>
-#include <linux/platform_data/camera-pxa.h>
+#include <linux/platform_data/media/camera-pxa.h>
 #include <mach/audio.h>
 #include <mach/smemc.h>
 #include <media/soc_camera.h>
arch/arm/mach-pxa/palmtreo.c +1 -1
index d8b937c870de..2dc56062fb7e 100644
@@ -43,7 +43,7 @@
 #include <linux/platform_data/usb-ohci-pxa27x.h>
 #include <mach/pxa2xx-regs.h>
 #include <linux/platform_data/asoc-palm27x.h>
-#include <linux/platform_data/camera-pxa.h>
+#include <linux/platform_data/media/camera-pxa.h>
 #include <mach/palm27x.h>
 
 #include <sound/pxa2xx-lib.h>
arch/arm/mach-pxa/palmz72.c +1 -1
index 1a35ddf218da..e3df17a7e8d4 100644
@@ -49,7 +49,7 @@
 #include <mach/palm27x.h>
 
 #include <mach/pm.h>
-#include <linux/platform_data/camera-pxa.h>
+#include <linux/platform_data/media/camera-pxa.h>
 
 #include <media/soc_camera.h>
arch/arm/mach-pxa/pcm990-baseboard.c +1 -1
index e3b58cb84c06..8459239a093c 100644
@@ -30,7 +30,7 @@
 #include <media/i2c/mt9v022.h>
 #include <media/soc_camera.h>
 
-#include <linux/platform_data/camera-pxa.h>
+#include <linux/platform_data/media/camera-pxa.h>
 #include <asm/mach/map.h>
 #include <mach/pxa27x.h>
 #include <mach/audio.h>
drivers/media/platform/coda/coda-common.c +1 -1
index 15516a6e3a39..f821627d015b 100644
@@ -28,7 +28,7 @@
 #include <linux/slab.h>
 #include <linux/videodev2.h>
 #include <linux/of.h>
-#include <linux/platform_data/coda.h>
+#include <linux/platform_data/media/coda.h>
 #include <linux/reset.h>
 
 #include <media/v4l2-ctrls.h>
drivers/media/platform/soc_camera/mx2_camera.c +1 -1
index 55437ec3a3e2..276beaefca7c 100644
@@ -39,7 +39,7 @@
 
 #include <linux/videodev2.h>
 
-#include <linux/platform_data/camera-mx2.h>
+#include <linux/platform_data/media/camera-mx2.h>
 
 #include <asm/dma.h>
drivers/media/platform/soc_camera/mx3_camera.c +1 -1
index 3e67b9517a5a..046ebf0b56a0 100644
@@ -25,7 +25,7 @@
 #include <media/soc_camera.h>
 #include <media/drv-intf/soc_mediabus.h>
 
-#include <linux/platform_data/camera-mx3.h>
+#include <linux/platform_data/media/camera-mx3.h>
 #include <linux/platform_data/dma-imx.h>
 
 #define MX3_CAM_DRV_NAME "mx3-camera"
drivers/media/platform/soc_camera/pxa_camera.c +1 -1
index 34762a82ebd2..415f3bda60bf 100644
@@ -39,7 +39,7 @@
 #include <linux/videodev2.h>
 
 #include <mach/dma.h>
-#include <linux/platform_data/camera-pxa.h>
+#include <linux/platform_data/media/camera-pxa.h>
 
 #define PXA_CAM_VERSION "0.0.6"
 #define PXA_CAM_DRV_NAME "pxa27x-camera"
drivers/media/platform/soc_camera/rcar_vin.c +1 -1
index 32aa64c3fc7e..defee08f073c 100644
@@ -21,7 +21,7 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
-#include <linux/platform_data/camera-rcar.h>
+#include <linux/platform_data/media/camera-rcar.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
include/linux/platform_data/media/camera-mx2.h renamed from include/linux/platform_data/camera-mx2.h +0 -0
similarity index 100%
rename from include/linux/platform_data/camera-mx2.h
rename to include/linux/platform_data/media/camera-mx2.h
include/linux/platform_data/media/camera-mx3.h renamed from include/linux/platform_data/camera-mx3.h +0 -0
similarity index 100%
rename from include/linux/platform_data/camera-mx3.h
rename to include/linux/platform_data/media/camera-mx3.h
include/linux/platform_data/media/camera-pxa.h renamed from include/linux/platform_data/camera-pxa.h +0 -0
similarity index 100%
rename from include/linux/platform_data/camera-pxa.h
rename to include/linux/platform_data/media/camera-pxa.h
include/linux/platform_data/media/camera-rcar.h renamed from include/linux/platform_data/camera-rcar.h +0 -0
similarity index 100%
rename from include/linux/platform_data/camera-rcar.h
rename to include/linux/platform_data/media/camera-rcar.h
include/linux/platform_data/media/coda.h renamed from include/linux/platform_data/coda.h +0 -0
similarity index 100%
rename from include/linux/platform_data/coda.h
rename to include/linux/platform_data/media/coda.h
Signature · 1 line
2.5.0
#1 lore raw

PATCH v2 1/1 move media platform data to linux/platform_data/media

Quoted 41 lines · Mauro Carvalho Chehab

Now that media has its own subdirectory inside platform_data, let's move the headers that are already there to such subdir.

After moving those files, the references were adjusted using this script:

    MAIN_DIR="linux/platform_data/"
    PREV_DIR="linux/platform_data/"
    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
Quoted 2 lines
Suggested-by Arnd Bergmann <[email protected]>
Signed-off-by Mauro Carvalho Chehab <[email protected]>
Acked-by Shawn Guo <[email protected]>