Browse Source

[media] include/media: move platform_data to linux/platform_data/media

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 <mchehab@osg.samsung.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Lee Jones <lee.jones@linaro.org>
Acked-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Mauro Carvalho Chehab 9 years ago
parent
commit
eb4b0ec75e
32 changed files with 24 additions and 25 deletions
  1. 1 1
      Documentation/video4linux/omap4_camera.txt
  2. 1 1
      Documentation/video4linux/si4713.txt
  3. 1 0
      MAINTAINERS
  4. 1 1
      arch/arm/mach-omap1/include/mach/camera.h
  5. 2 2
      arch/arm/mach-omap2/board-rx51-peripherals.c
  6. 1 1
      arch/arm/plat-samsung/devs.c
  7. 1 1
      arch/sh/boards/mach-ap325rxa/setup.c
  8. 1 1
      drivers/media/platform/marvell-ccic/mmp-driver.c
  9. 1 1
      drivers/media/platform/s5p-tv/hdmi_drv.c
  10. 1 1
      drivers/media/platform/s5p-tv/sii9234_drv.c
  11. 1 1
      drivers/media/platform/soc_camera/omap1_camera.c
  12. 1 1
      drivers/media/platform/soc_camera/soc_camera_platform.c
  13. 1 1
      drivers/media/platform/timblogiw.c
  14. 1 1
      drivers/media/radio/radio-timb.c
  15. 1 1
      drivers/media/radio/si4713/radio-usb-si4713.c
  16. 1 1
      drivers/media/radio/si4713/si4713.h
  17. 1 1
      drivers/media/rc/gpio-ir-recv.c
  18. 1 1
      drivers/media/rc/ir-rx51.c
  19. 2 2
      drivers/mfd/timberdale.c
  20. 1 1
      drivers/staging/media/omap4iss/iss.h
  21. 1 1
      drivers/staging/media/omap4iss/iss_csiphy.h
  22. 0 1
      include/linux/platform_data/media/gpio-ir-recv.h
  23. 0 0
      include/linux/platform_data/media/ir-rx51.h
  24. 0 0
      include/linux/platform_data/media/mmp-camera.h
  25. 0 0
      include/linux/platform_data/media/omap1_camera.h
  26. 0 0
      include/linux/platform_data/media/omap4iss.h
  27. 0 1
      include/linux/platform_data/media/s5p_hdmi.h
  28. 1 1
      include/linux/platform_data/media/si4713.h
  29. 0 0
      include/linux/platform_data/media/sii9234.h
  30. 0 0
      include/linux/platform_data/media/soc_camera_platform.h
  31. 0 0
      include/linux/platform_data/media/timb_radio.h
  32. 0 0
      include/linux/platform_data/media/timb_video.h

+ 1 - 1
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
 ----------

+ 1 - 1
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
 ===============================

+ 1 - 0
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

+ 1 - 1
arch/arm/mach-omap1/include/mach/camera.h

@@ -1,7 +1,7 @@
 #ifndef __ASM_ARCH_CAMERA_H_
 #define __ASM_ARCH_CAMERA_H_
 
-#include <media/omap1_camera.h>
+#include <linux/platform_data/media/omap1_camera.h>
 
 void omap1_camera_init(void *);
 

+ 2 - 2
arch/arm/mach-omap2/board-rx51-peripherals.c

@@ -39,7 +39,7 @@
 
 #include <sound/tlv320aic3x.h>
 #include <sound/tpa6130a2-plat.h>
-#include <media/si4713.h>
+#include <linux/platform_data/media/si4713.h>
 #include <linux/platform_data/leds-lp55xx.h>
 
 #include <linux/platform_data/tsl2563.h>
@@ -48,7 +48,7 @@
 #include <video/omap-panel-data.h>
 
 #if defined(CONFIG_IR_RX51) || defined(CONFIG_IR_RX51_MODULE)
-#include <media/ir-rx51.h>
+#include <linux/platform_data/media/ir-rx51.h>
 #endif
 
 #include "mux.h"

+ 1 - 1
arch/arm/plat-samsung/devs.c

@@ -36,7 +36,7 @@
 #include <linux/platform_data/s3c-hsotg.h>
 #include <linux/platform_data/dma-s3c24xx.h>
 
-#include <media/s5p_hdmi.h>
+#include <linux/platform_data/media/s5p_hdmi.h>
 
 #include <asm/irq.h>
 #include <asm/mach/arch.h>

+ 1 - 1
arch/sh/boards/mach-ap325rxa/setup.c

@@ -29,7 +29,7 @@
 #include <linux/sh_intc.h>
 #include <media/i2c/ov772x.h>
 #include <media/soc_camera.h>
-#include <media/soc_camera_platform.h>
+#include <linux/platform_data/media/soc_camera_platform.h>
 #include <media/drv-intf/sh_mobile_ceu.h>
 #include <video/sh_mobile_lcdc.h>
 #include <asm/io.h>

+ 1 - 1
drivers/media/platform/marvell-ccic/mmp-driver.c

@@ -18,7 +18,7 @@
 #include <linux/slab.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-device.h>
-#include <media/mmp-camera.h>
+#include <linux/platform_data/media/mmp-camera.h>
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.h>

+ 1 - 1
drivers/media/platform/s5p-tv/hdmi_drv.c

@@ -33,7 +33,7 @@
 #include <linux/regulator/consumer.h>
 #include <linux/v4l2-dv-timings.h>
 
-#include <media/s5p_hdmi.h>
+#include <linux/platform_data/media/s5p_hdmi.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-dev.h>
 #include <media/v4l2-device.h>

+ 1 - 1
drivers/media/platform/s5p-tv/sii9234_drv.c

@@ -23,7 +23,7 @@
 #include <linux/regulator/machine.h>
 #include <linux/slab.h>
 
-#include <media/sii9234.h>
+#include <linux/platform_data/media/sii9234.h>
 #include <media/v4l2-subdev.h>
 
 MODULE_AUTHOR("Tomasz Stanislawski <t.stanislaws@samsung.com>");

+ 1 - 1
drivers/media/platform/soc_camera/omap1_camera.c

@@ -28,7 +28,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
-#include <media/omap1_camera.h>
+#include <linux/platform_data/media/omap1_camera.h>
 #include <media/soc_camera.h>
 #include <media/drv-intf/soc_mediabus.h>
 #include <media/videobuf-dma-contig.h>

+ 1 - 1
drivers/media/platform/soc_camera/soc_camera_platform.c

@@ -18,7 +18,7 @@
 #include <linux/videodev2.h>
 #include <media/v4l2-subdev.h>
 #include <media/soc_camera.h>
-#include <media/soc_camera_platform.h>
+#include <linux/platform_data/media/soc_camera_platform.h>
 
 struct soc_camera_platform_priv {
 	struct v4l2_subdev subdev;

+ 1 - 1
drivers/media/platform/timblogiw.c

@@ -31,7 +31,7 @@
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-device.h>
 #include <media/videobuf-dma-contig.h>
-#include <media/timb_video.h>
+#include <linux/platform_data/media/timb_video.h>
 
 #define DRIVER_NAME			"timb-video"
 

+ 1 - 1
drivers/media/radio/radio-timb.c

@@ -26,7 +26,7 @@
 #include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
-#include <media/timb_radio.h>
+#include <linux/platform_data/media/timb_radio.h>
 
 #define DRIVER_NAME "timb-radio"
 

+ 1 - 1
drivers/media/radio/si4713/radio-usb-si4713.c

@@ -31,7 +31,7 @@
 #include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-event.h>
-#include <media/si4713.h>
+#include <linux/platform_data/media/si4713.h>
 
 #include "si4713.h"
 

+ 1 - 1
drivers/media/radio/si4713/si4713.h

@@ -20,7 +20,7 @@
 #include <linux/gpio/consumer.h>
 #include <media/v4l2-subdev.h>
 #include <media/v4l2-ctrls.h>
-#include <media/si4713.h>
+#include <linux/platform_data/media/si4713.h>
 
 #define SI4713_PRODUCT_NUMBER		0x0D
 

+ 1 - 1
drivers/media/rc/gpio-ir-recv.c

@@ -21,7 +21,7 @@
 #include <linux/platform_device.h>
 #include <linux/irq.h>
 #include <media/rc-core.h>
-#include <media/gpio-ir-recv.h>
+#include <linux/platform_data/media/gpio-ir-recv.h>
 
 #define GPIO_IR_DRIVER_NAME	"gpio-rc-recv"
 #define GPIO_IR_DEVICE_NAME	"gpio_ir_recv"

+ 1 - 1
drivers/media/rc/ir-rx51.c

@@ -31,7 +31,7 @@
 
 #include <media/lirc.h>
 #include <media/lirc_dev.h>
-#include <media/ir-rx51.h>
+#include <linux/platform_data/media/ir-rx51.h>
 
 #define LIRC_RX51_DRIVER_FEATURES (LIRC_CAN_SET_SEND_DUTY_CYCLE |	\
 				   LIRC_CAN_SET_SEND_CARRIER |		\

+ 2 - 2
drivers/mfd/timberdale.c

@@ -39,8 +39,8 @@
 #include <linux/spi/max7301.h>
 #include <linux/spi/mc33880.h>
 
-#include <media/timb_radio.h>
-#include <media/timb_video.h>
+#include <linux/platform_data/media/timb_radio.h>
+#include <linux/platform_data/media/timb_video.h>
 
 #include <linux/timb_dma.h>
 

+ 1 - 1
drivers/staging/media/omap4iss/iss.h

@@ -20,7 +20,7 @@
 #include <linux/platform_device.h>
 #include <linux/wait.h>
 
-#include <media/omap4iss.h>
+#include <linux/platform_data/media/omap4iss.h>
 
 #include "iss_regs.h"
 #include "iss_csiphy.h"

+ 1 - 1
drivers/staging/media/omap4iss/iss_csiphy.h

@@ -14,7 +14,7 @@
 #ifndef OMAP4_ISS_CSI_PHY_H
 #define OMAP4_ISS_CSI_PHY_H
 
-#include <media/omap4iss.h>
+#include <linux/platform_data/media/omap4iss.h>
 
 struct iss_csi2_device;
 

+ 0 - 1
include/media/gpio-ir-recv.h → include/linux/platform_data/media/gpio-ir-recv.h

@@ -21,4 +21,3 @@ struct gpio_ir_recv_platform_data {
 };
 
 #endif /* __GPIO_IR_RECV_H__ */
-

+ 0 - 0
include/media/ir-rx51.h → include/linux/platform_data/media/ir-rx51.h


+ 0 - 0
include/media/mmp-camera.h → include/linux/platform_data/media/mmp-camera.h


+ 0 - 0
include/media/omap1_camera.h → include/linux/platform_data/media/omap1_camera.h


+ 0 - 0
include/media/omap4iss.h → include/linux/platform_data/media/omap4iss.h


+ 0 - 1
include/media/s5p_hdmi.h → include/linux/platform_data/media/s5p_hdmi.h

@@ -34,4 +34,3 @@ struct s5p_hdmi_platform_data {
 };
 
 #endif /* S5P_HDMI_H */
-

+ 1 - 1
include/media/si4713.h → include/linux/platform_data/media/si4713.h

@@ -1,5 +1,5 @@
 /*
- * include/media/si4713.h
+ * include/linux/platform_data/media/si4713.h
  *
  * Board related data definitions for Si4713 i2c device driver.
  *

+ 0 - 0
include/media/sii9234.h → include/linux/platform_data/media/sii9234.h


+ 0 - 0
include/media/soc_camera_platform.h → include/linux/platform_data/media/soc_camera_platform.h


+ 0 - 0
include/media/timb_radio.h → include/linux/platform_data/media/timb_radio.h


+ 0 - 0
include/media/timb_video.h → include/linux/platform_data/media/timb_video.h