Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

+24 -25
+1 -1
Documentation/video4linux/omap4_camera.txt
··· 47 47 File list 48 48 --------- 49 49 drivers/staging/media/omap4iss/ 50 - include/media/omap4iss.h 50 + include/linux/platform_data/media/omap4iss.h 51 51 52 52 References 53 53 ----------
+1 -1
Documentation/video4linux/si4713.txt
··· 157 157 } 158 158 159 159 The struct si4713_rnl and SI4713_IOC_MEASURE_RNL are defined under 160 - include/media/si4713.h. 160 + include/linux/platform_data/media/si4713.h. 161 161 162 162 Stereo/Mono and RDS subchannels 163 163 ===============================
+1
MAINTAINERS
··· 6895 6895 F: Documentation/DocBook/media/ 6896 6896 F: drivers/media/ 6897 6897 F: drivers/staging/media/ 6898 + F: include/linux/platform_data/media/ 6898 6899 F: include/media/ 6899 6900 F: include/uapi/linux/dvb/ 6900 6901 F: include/uapi/linux/videodev2.h
+1 -1
arch/arm/mach-omap1/include/mach/camera.h
··· 1 1 #ifndef __ASM_ARCH_CAMERA_H_ 2 2 #define __ASM_ARCH_CAMERA_H_ 3 3 4 - #include <media/omap1_camera.h> 4 + #include <linux/platform_data/media/omap1_camera.h> 5 5 6 6 void omap1_camera_init(void *); 7 7
+2 -2
arch/arm/mach-omap2/board-rx51-peripherals.c
··· 39 39 40 40 #include <sound/tlv320aic3x.h> 41 41 #include <sound/tpa6130a2-plat.h> 42 - #include <media/si4713.h> 42 + #include <linux/platform_data/media/si4713.h> 43 43 #include <linux/platform_data/leds-lp55xx.h> 44 44 45 45 #include <linux/platform_data/tsl2563.h> ··· 48 48 #include <video/omap-panel-data.h> 49 49 50 50 #if defined(CONFIG_IR_RX51) || defined(CONFIG_IR_RX51_MODULE) 51 - #include <media/ir-rx51.h> 51 + #include <linux/platform_data/media/ir-rx51.h> 52 52 #endif 53 53 54 54 #include "mux.h"
+1 -1
arch/arm/plat-samsung/devs.c
··· 36 36 #include <linux/platform_data/s3c-hsotg.h> 37 37 #include <linux/platform_data/dma-s3c24xx.h> 38 38 39 - #include <media/s5p_hdmi.h> 39 + #include <linux/platform_data/media/s5p_hdmi.h> 40 40 41 41 #include <asm/irq.h> 42 42 #include <asm/mach/arch.h>
+1 -1
arch/sh/boards/mach-ap325rxa/setup.c
··· 29 29 #include <linux/sh_intc.h> 30 30 #include <media/i2c/ov772x.h> 31 31 #include <media/soc_camera.h> 32 - #include <media/soc_camera_platform.h> 32 + #include <linux/platform_data/media/soc_camera_platform.h> 33 33 #include <media/drv-intf/sh_mobile_ceu.h> 34 34 #include <video/sh_mobile_lcdc.h> 35 35 #include <asm/io.h>
+1 -1
drivers/media/platform/marvell-ccic/mmp-driver.c
··· 18 18 #include <linux/slab.h> 19 19 #include <linux/videodev2.h> 20 20 #include <media/v4l2-device.h> 21 - #include <media/mmp-camera.h> 21 + #include <linux/platform_data/media/mmp-camera.h> 22 22 #include <linux/device.h> 23 23 #include <linux/platform_device.h> 24 24 #include <linux/gpio.h>
+1 -1
drivers/media/platform/s5p-tv/hdmi_drv.c
··· 33 33 #include <linux/regulator/consumer.h> 34 34 #include <linux/v4l2-dv-timings.h> 35 35 36 - #include <media/s5p_hdmi.h> 36 + #include <linux/platform_data/media/s5p_hdmi.h> 37 37 #include <media/v4l2-common.h> 38 38 #include <media/v4l2-dev.h> 39 39 #include <media/v4l2-device.h>
+1 -1
drivers/media/platform/s5p-tv/sii9234_drv.c
··· 23 23 #include <linux/regulator/machine.h> 24 24 #include <linux/slab.h> 25 25 26 - #include <media/sii9234.h> 26 + #include <linux/platform_data/media/sii9234.h> 27 27 #include <media/v4l2-subdev.h> 28 28 29 29 MODULE_AUTHOR("Tomasz Stanislawski <t.stanislaws@samsung.com>");
+1 -1
drivers/media/platform/soc_camera/omap1_camera.c
··· 28 28 #include <linux/platform_device.h> 29 29 #include <linux/slab.h> 30 30 31 - #include <media/omap1_camera.h> 31 + #include <linux/platform_data/media/omap1_camera.h> 32 32 #include <media/soc_camera.h> 33 33 #include <media/drv-intf/soc_mediabus.h> 34 34 #include <media/videobuf-dma-contig.h>
+1 -1
drivers/media/platform/soc_camera/soc_camera_platform.c
··· 18 18 #include <linux/videodev2.h> 19 19 #include <media/v4l2-subdev.h> 20 20 #include <media/soc_camera.h> 21 - #include <media/soc_camera_platform.h> 21 + #include <linux/platform_data/media/soc_camera_platform.h> 22 22 23 23 struct soc_camera_platform_priv { 24 24 struct v4l2_subdev subdev;
+1 -1
drivers/media/platform/timblogiw.c
··· 31 31 #include <media/v4l2-ioctl.h> 32 32 #include <media/v4l2-device.h> 33 33 #include <media/videobuf-dma-contig.h> 34 - #include <media/timb_video.h> 34 + #include <linux/platform_data/media/timb_video.h> 35 35 36 36 #define DRIVER_NAME "timb-video" 37 37
+1 -1
drivers/media/radio/radio-timb.c
··· 26 26 #include <linux/slab.h> 27 27 #include <linux/i2c.h> 28 28 #include <linux/module.h> 29 - #include <media/timb_radio.h> 29 + #include <linux/platform_data/media/timb_radio.h> 30 30 31 31 #define DRIVER_NAME "timb-radio" 32 32
+1 -1
drivers/media/radio/si4713/radio-usb-si4713.c
··· 31 31 #include <media/v4l2-device.h> 32 32 #include <media/v4l2-ioctl.h> 33 33 #include <media/v4l2-event.h> 34 - #include <media/si4713.h> 34 + #include <linux/platform_data/media/si4713.h> 35 35 36 36 #include "si4713.h" 37 37
+1 -1
drivers/media/radio/si4713/si4713.h
··· 20 20 #include <linux/gpio/consumer.h> 21 21 #include <media/v4l2-subdev.h> 22 22 #include <media/v4l2-ctrls.h> 23 - #include <media/si4713.h> 23 + #include <linux/platform_data/media/si4713.h> 24 24 25 25 #define SI4713_PRODUCT_NUMBER 0x0D 26 26
+1 -1
drivers/media/rc/gpio-ir-recv.c
··· 21 21 #include <linux/platform_device.h> 22 22 #include <linux/irq.h> 23 23 #include <media/rc-core.h> 24 - #include <media/gpio-ir-recv.h> 24 + #include <linux/platform_data/media/gpio-ir-recv.h> 25 25 26 26 #define GPIO_IR_DRIVER_NAME "gpio-rc-recv" 27 27 #define GPIO_IR_DEVICE_NAME "gpio_ir_recv"
+1 -1
drivers/media/rc/ir-rx51.c
··· 31 31 32 32 #include <media/lirc.h> 33 33 #include <media/lirc_dev.h> 34 - #include <media/ir-rx51.h> 34 + #include <linux/platform_data/media/ir-rx51.h> 35 35 36 36 #define LIRC_RX51_DRIVER_FEATURES (LIRC_CAN_SET_SEND_DUTY_CYCLE | \ 37 37 LIRC_CAN_SET_SEND_CARRIER | \
+2 -2
drivers/mfd/timberdale.c
··· 39 39 #include <linux/spi/max7301.h> 40 40 #include <linux/spi/mc33880.h> 41 41 42 - #include <media/timb_radio.h> 43 - #include <media/timb_video.h> 42 + #include <linux/platform_data/media/timb_radio.h> 43 + #include <linux/platform_data/media/timb_video.h> 44 44 45 45 #include <linux/timb_dma.h> 46 46
+1 -1
drivers/staging/media/omap4iss/iss.h
··· 20 20 #include <linux/platform_device.h> 21 21 #include <linux/wait.h> 22 22 23 - #include <media/omap4iss.h> 23 + #include <linux/platform_data/media/omap4iss.h> 24 24 25 25 #include "iss_regs.h" 26 26 #include "iss_csiphy.h"
+1 -1
drivers/staging/media/omap4iss/iss_csiphy.h
··· 14 14 #ifndef OMAP4_ISS_CSI_PHY_H 15 15 #define OMAP4_ISS_CSI_PHY_H 16 16 17 - #include <media/omap4iss.h> 17 + #include <linux/platform_data/media/omap4iss.h> 18 18 19 19 struct iss_csi2_device; 20 20
-1
include/media/gpio-ir-recv.h include/linux/platform_data/media/gpio-ir-recv.h
··· 21 21 }; 22 22 23 23 #endif /* __GPIO_IR_RECV_H__ */ 24 -
include/media/ir-rx51.h include/linux/platform_data/media/ir-rx51.h
include/media/mmp-camera.h include/linux/platform_data/media/mmp-camera.h
include/media/omap1_camera.h include/linux/platform_data/media/omap1_camera.h
include/media/omap4iss.h include/linux/platform_data/media/omap4iss.h
-1
include/media/s5p_hdmi.h include/linux/platform_data/media/s5p_hdmi.h
··· 34 34 }; 35 35 36 36 #endif /* S5P_HDMI_H */ 37 -
+1 -1
include/media/si4713.h include/linux/platform_data/media/si4713.h
··· 1 1 /* 2 - * include/media/si4713.h 2 + * include/linux/platform_data/media/si4713.h 3 3 * 4 4 * Board related data definitions for Si4713 i2c device driver. 5 5 *
include/media/sii9234.h include/linux/platform_data/media/sii9234.h
include/media/soc_camera_platform.h include/linux/platform_data/media/soc_camera_platform.h
include/media/timb_radio.h include/linux/platform_data/media/timb_radio.h
include/media/timb_video.h include/linux/platform_data/media/timb_video.h