[PATCH 2/2] [media] include/media: move platform driver headers to a separate dir
From: arnd@arndb.de (Arnd Bergmann)
Date: 2015-11-13 21:33:37
Also in:
linux-media, linux-omap, linux-samsung-soc, linux-sh
On Friday 13 November 2015 17:13:41 Mauro Carvalho Chehab wrote:
Em Wed, 11 Nov 2015 21:26:31 +0100 Arnd Bergmann [off-list ref] escreveu:
include/media/{ => drv-intf}/cx2341x.h | 0
include/media/{ => drv-intf}/cx25840.h | 0
include/media/{ => drv-intf}/exynos-fimc.h | 0
include/media/{ => drv-intf}/msp3400.h | 0
include/media/{ => drv-intf}/s3c_camif.h | 0
include/media/{ => drv-intf}/saa7146.h | 0
include/media/{ => drv-intf}/saa7146_vv.h | 2 +-
include/media/{ => drv-intf}/sh_mobile_ceu.h | 0
include/media/{ => drv-intf}/sh_mobile_csi2.h | 0
include/media/{ => drv-intf}/sh_vou.h | 0
include/media/{ => drv-intf}/si476x.h | 0
include/media/{ => drv-intf}/soc_mediabus.h | 0
include/media/{ => drv-intf}/tea575x.h | 0
include/media/i2c/tw9910.h | 2 +-
include/media/{ => platform_data}/gpio-ir-recv.h | 0
include/media/{ => platform_data}/ir-rx51.h | 0
include/media/{ => platform_data}/mmp-camera.h | 0
include/media/{ => platform_data}/omap1_camera.h | 0
include/media/{ => platform_data}/omap4iss.h | 0
include/media/{ => platform_data}/s5p_hdmi.h | 0
include/media/{ => platform_data}/si4713.h | 0
include/media/{ => platform_data}/sii9234.h | 0
include/media/{ => platform_data}/smiapp.h | 0
include/media/{ => platform_data}/soc_camera.h | 0
include/media/{ => platform_data}/soc_camera_platform.h | 2 +-
include/media/{ => platform_data}/timb_radio.h | 0
include/media/{ => platform_data}/timb_video.h | 0
sound/pci/es1968.c | 2 +-
sound/pci/fm801.c | 2 +-
155 files changed, 158 insertions(+), 158 deletions(-)As Geert said, include/linux/platform_data/media/ would be nicer for consistency with other subsystems.
quoted hunk ↗ jump to hunk
diff --git a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c index ede2bdbb5dd5..44ba1f28bb34 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 <linux/dma-mapping.h> #include <linux/leds.h> #include <linux/platform_data/asoc-mx27vis.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <sound/tlv320aic32x4.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
This looks like a mistake: the header contains the string 'platform_data', but it is not actually a platform data header file in the sense that it defines the interface between platform and driver. Maybe soc_camera.h is important enough to still leave it as a core file in the existing location? Or possibly a separate directory for media/soc_camera/*.h
quoted hunk ↗ jump to hunk
@@ -24,7 +24,7 @@ #include <linux/slab.h> #include <linux/kfifo.h> #include <linux/module.h> -#include <media/cx25840.h> +#include <media/drv-intf/cx25840.h> #include <media/rc-core.h> #include "cx25840-core.h"
For this case, I think the original patch to move it into include/media/i2c was more logical as it mirrors the file structure. I was mainly talking about the platform_data being different from the rest. Arnd