Commit 0f20956b authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab
Browse files

[media] exynos4-is: Move __fimc_videoc_querycap() function to the common module 



Move __fimc_videoc_querycap() function to the common exynos4-is-common.ko
module so it don't need to be reimplemented in multiple video node drivers
of the exynos4-is.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 7536b424

drivers/media/platform/exynos4-is/common.c

+12 −0
Original line number Diff line number Diff line
@@ -38,4 +38,16 @@ struct v4l2_subdev *fimc_find_remote_sensor(struct media_entity *entity) 
}

EXPORT_SYMBOL(fimc_find_remote_sensor);



void __fimc_vidioc_querycap(struct device *dev, struct v4l2_capability *cap,

						unsigned int caps)

{

	strlcpy(cap->driver, dev->driver->name, sizeof(cap->driver));

	strlcpy(cap->card, dev->driver->name, sizeof(cap->card));

	snprintf(cap->bus_info, sizeof(cap->bus_info),

				"platform:%s", dev_name(dev));

	cap->device_caps = caps;

	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;

}

EXPORT_SYMBOL(__fimc_vidioc_querycap);



MODULE_LICENSE("GPL");

drivers/media/platform/exynos4-is/common.h

+4 −0
Original line number Diff line number Diff line
@@ -6,7 +6,11 @@ 
 * published by the Free Software Foundation.

 */



#include <linux/device.h>

#include <linux/videodev2.h>

#include <media/media-entity.h>

#include <media/v4l2-subdev.h>



struct v4l2_subdev *fimc_find_remote_sensor(struct media_entity *entity);

void __fimc_vidioc_querycap(struct device *dev, struct v4l2_capability *cap,

			    unsigned int caps);

drivers/media/platform/exynos4-is/fimc-core.c

+0 −11
Original line number Diff line number Diff line
@@ -213,17 +213,6 @@ struct fimc_fmt *fimc_get_format(unsigned int index) 
	return &fimc_formats[index];

}



void __fimc_vidioc_querycap(struct device *dev, struct v4l2_capability *cap,

						unsigned int caps)

{

	strlcpy(cap->driver, dev->driver->name, sizeof(cap->driver));

	strlcpy(cap->card, dev->driver->name, sizeof(cap->card));

	snprintf(cap->bus_info, sizeof(cap->bus_info),

				"platform:%s", dev_name(dev));

	cap->device_caps = caps;

	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;

}



int fimc_check_scaler_ratio(struct fimc_ctx *ctx, int sw, int sh,

			    int dw, int dh, int rotation)

{

drivers/media/platform/exynos4-is/fimc-core.h

+0 −2
Original line number Diff line number Diff line
@@ -619,8 +619,6 @@ static inline struct fimc_frame *ctx_get_frame(struct fimc_ctx *ctx, 
/* fimc-core.c */

int fimc_vidioc_enum_fmt_mplane(struct file *file, void *priv,

				struct v4l2_fmtdesc *f);

void __fimc_vidioc_querycap(struct device *dev, struct v4l2_capability *cap,

						unsigned int caps);

int fimc_ctrls_create(struct fimc_ctx *ctx);

void fimc_ctrls_delete(struct fimc_ctx *ctx);

void fimc_ctrls_activate(struct fimc_ctx *ctx, bool active);

drivers/media/platform/exynos4-is/fimc-m2m.c

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <media/videobuf2-core.h>

#include <media/videobuf2-dma-contig.h>



#include "common.h"

#include "fimc-core.h"

#include "fimc-reg.h"

#include "media-dev.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE