From 574e88d6497d8af48482a4d7f1e333c39e4d175b Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Thu, 22 Jun 2017 18:41:20 +0900 Subject: [PATCH] fimc-is: change metadata header as uapi header The header fimc-is-metadata.h is required from user, so it should be a uapi header. So this patch moves the header to uapi header. Change-Id: I5618889c806d4463da0bf0ea947bf5d1b667d5e3 Signed-off-by: Seung-Woo Kim --- drivers/media/platform/exynos/fimc-is/fimc-is-interface.h | 3 ++- drivers/media/platform/exynos/fimc-is/fimc-is-video-3aa.c | 2 +- drivers/media/platform/exynos/fimc-is/fimc-is-video-isp.c | 2 +- drivers/media/platform/exynos/fimc-is/fimc-is-video-sensor.c | 2 +- drivers/media/platform/exynos/fimc-is/fimc-is-video-vdiso.c | 2 +- drivers/media/platform/exynos/fimc-is/fimc-is-video.h | 2 +- include/uapi/linux/Kbuild | 1 + .../exynos/fimc-is => include/uapi/linux}/fimc-is-metadata.h | 0 8 files changed, 8 insertions(+), 6 deletions(-) rename {drivers/media/platform/exynos/fimc-is => include/uapi/linux}/fimc-is-metadata.h (100%) diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-interface.h b/drivers/media/platform/exynos/fimc-is/fimc-is-interface.h index d4ea64eb946b..34c11cf5a937 100644 --- a/drivers/media/platform/exynos/fimc-is/fimc-is-interface.h +++ b/drivers/media/platform/exynos/fimc-is/fimc-is-interface.h @@ -14,7 +14,8 @@ #ifndef FIMC_IS_INTERFACE_H #define FIMC_IS_INTERFACE_H -#include "fimc-is-metadata.h" +#include + #include "fimc-is-framemgr.h" #include "fimc-is-video.h" #include "fimc-is-time.h" diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-video-3aa.c b/drivers/media/platform/exynos/fimc-is/fimc-is-video-3aa.c index 3db80b2449cb..37df8914854c 100644 --- a/drivers/media/platform/exynos/fimc-is/fimc-is-video-3aa.c +++ b/drivers/media/platform/exynos/fimc-is/fimc-is-video-3aa.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -40,7 +41,6 @@ #include "fimc-is-regs.h" #include "fimc-is-err.h" #include "fimc-is-video.h" -#include "fimc-is-metadata.h" const struct v4l2_file_operations fimc_is_3aa_video_fops; const struct v4l2_ioctl_ops fimc_is_3aa_video_ioctl_ops; diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-video-isp.c b/drivers/media/platform/exynos/fimc-is/fimc-is-video-isp.c index 9d1f735b2c78..0f12dd90d96e 100644 --- a/drivers/media/platform/exynos/fimc-is/fimc-is-video-isp.c +++ b/drivers/media/platform/exynos/fimc-is/fimc-is-video-isp.c @@ -27,6 +27,7 @@ #include #include #include +#include #include "fimc-is-core.h" #include "fimc-is-param.h" @@ -34,7 +35,6 @@ #include "fimc-is-regs.h" #include "fimc-is-err.h" #include "fimc-is-video.h" -#include "fimc-is-metadata.h" extern struct fimc_is_from_info *sysfs_finfo; extern struct fimc_is_from_info *sysfs_pinfo; diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-video-sensor.c b/drivers/media/platform/exynos/fimc-is/fimc-is-video-sensor.c index a76f19278b72..5451a4f0dfe7 100644 --- a/drivers/media/platform/exynos/fimc-is/fimc-is-video-sensor.c +++ b/drivers/media/platform/exynos/fimc-is/fimc-is-video-sensor.c @@ -27,6 +27,7 @@ #include #include #include +#include #include "fimc-is-device-sensor.h" #include "fimc-is-param.h" @@ -34,7 +35,6 @@ #include "fimc-is-regs.h" #include "fimc-is-err.h" #include "fimc-is-video.h" -#include "fimc-is-metadata.h" #include "fimc-is-core.h" const struct v4l2_file_operations fimc_is_sen_video_fops; diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-video-vdiso.c b/drivers/media/platform/exynos/fimc-is/fimc-is-video-vdiso.c index 6e3786c0ca02..4e618b1de50a 100644 --- a/drivers/media/platform/exynos/fimc-is/fimc-is-video-vdiso.c +++ b/drivers/media/platform/exynos/fimc-is/fimc-is-video-vdiso.c @@ -27,6 +27,7 @@ #include #include #include +#include #include "fimc-is-core.h" #include "fimc-is-param.h" @@ -34,7 +35,6 @@ #include "fimc-is-regs.h" #include "fimc-is-err.h" #include "fimc-is-video.h" -#include "fimc-is-metadata.h" const struct v4l2_file_operations fimc_is_vdo_video_fops; const struct v4l2_ioctl_ops fimc_is_vdo_video_ioctl_ops; diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-video.h b/drivers/media/platform/exynos/fimc-is/fimc-is-video.h index 95c3ffaf9ac2..8e6f46c53d16 100644 --- a/drivers/media/platform/exynos/fimc-is/fimc-is-video.h +++ b/drivers/media/platform/exynos/fimc-is/fimc-is-video.h @@ -2,11 +2,11 @@ #define FIMC_IS_VIDEO_H #include +#include #include #include "fimc-is-type.h" #include "fimc-is-mem.h" #include "fimc-is-framemgr.h" -#include "fimc-is-metadata.h" #include "fimc-is-config.h" /* configuration by linux kernel version */ diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index 8247e3683da8..563346f9ba51 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@ -125,6 +125,7 @@ header-y += fdreg.h header-y += fib_rules.h header-y += fiemap.h header-y += filter.h +header-y += fimc-is-metadata.h header-y += firewire-cdev.h header-y += firewire-constants.h header-y += flat.h diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-metadata.h b/include/uapi/linux/fimc-is-metadata.h similarity index 100% rename from drivers/media/platform/exynos/fimc-is/fimc-is-metadata.h rename to include/uapi/linux/fimc-is-metadata.h -- 2.34.1