Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8774bed9 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: subdev: Move [gs]_std operation to video ops 



The g_std and s_std operations are video-related, move them to the video
ops where they belong.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 85ada737

drivers/media/i2c/adv7180.c

+1 −1
Original line number Diff line number Diff line
@@ -461,6 +461,7 @@ static int adv7180_g_mbus_config(struct v4l2_subdev *sd, 
}



static const struct v4l2_subdev_video_ops adv7180_video_ops = {

	.s_std = adv7180_s_std,

	.querystd = adv7180_querystd,

	.g_input_status = adv7180_g_input_status,

	.s_routing = adv7180_s_routing,
@@ -472,7 +473,6 @@ static const struct v4l2_subdev_video_ops adv7180_video_ops = { 
};



static const struct v4l2_subdev_core_ops adv7180_core_ops = {

	.s_std = adv7180_s_std,

	.s_power = adv7180_s_power,

};

drivers/media/i2c/adv7183.c

+2 −2
Original line number Diff line number Diff line
@@ -501,8 +501,6 @@ static const struct v4l2_ctrl_ops adv7183_ctrl_ops = { 


static const struct v4l2_subdev_core_ops adv7183_core_ops = {

	.log_status = adv7183_log_status,

	.g_std = adv7183_g_std,

	.s_std = adv7183_s_std,

	.reset = adv7183_reset,

#ifdef CONFIG_VIDEO_ADV_DEBUG

	.g_register = adv7183_g_register,
@@ -511,6 +509,8 @@ static const struct v4l2_subdev_core_ops adv7183_core_ops = { 
};



static const struct v4l2_subdev_video_ops adv7183_video_ops = {

	.g_std = adv7183_g_std,

	.s_std = adv7183_s_std,

	.s_routing = adv7183_s_routing,

	.querystd = adv7183_querystd,

	.g_input_status = adv7183_g_input_status,

drivers/media/i2c/adv7842.c

+2 −2
Original line number Diff line number Diff line
@@ -2873,8 +2873,6 @@ static const struct v4l2_ctrl_ops adv7842_ctrl_ops = { 


static const struct v4l2_subdev_core_ops adv7842_core_ops = {

	.log_status = adv7842_log_status,

	.g_std = adv7842_g_std,

	.s_std = adv7842_s_std,

	.ioctl = adv7842_ioctl,

	.interrupt_service_routine = adv7842_isr,

#ifdef CONFIG_VIDEO_ADV_DEBUG
@@ -2884,6 +2882,8 @@ static const struct v4l2_subdev_core_ops adv7842_core_ops = { 
};



static const struct v4l2_subdev_video_ops adv7842_video_ops = {

	.g_std = adv7842_g_std,

	.s_std = adv7842_s_std,

	.s_routing = adv7842_s_routing,

	.querystd = adv7842_querystd,

	.g_input_status = adv7842_g_input_status,

drivers/media/i2c/bt819.c

+1 −1
Original line number Diff line number Diff line
@@ -387,10 +387,10 @@ static const struct v4l2_subdev_core_ops bt819_core_ops = { 
	.s_ctrl = v4l2_subdev_s_ctrl,

	.queryctrl = v4l2_subdev_queryctrl,

	.querymenu = v4l2_subdev_querymenu,

	.s_std = bt819_s_std,

};



static const struct v4l2_subdev_video_ops bt819_video_ops = {

	.s_std = bt819_s_std,

	.s_routing = bt819_s_routing,

	.s_stream = bt819_s_stream,

	.querystd = bt819_querystd,

drivers/media/i2c/cx25840/cx25840-core.c

+2 −2
Original line number Diff line number Diff line
@@ -5041,8 +5041,6 @@ static const struct v4l2_subdev_core_ops cx25840_core_ops = { 
	.g_ext_ctrls = v4l2_subdev_g_ext_ctrls,

	.queryctrl = v4l2_subdev_queryctrl,

	.querymenu = v4l2_subdev_querymenu,

	.s_std = cx25840_s_std,

	.g_std = cx25840_g_std,

	.reset = cx25840_reset,

	.load_fw = cx25840_load_fw,

	.s_io_pin_config = common_s_io_pin_config,
@@ -5067,6 +5065,8 @@ static const struct v4l2_subdev_audio_ops cx25840_audio_ops = { 
};



static const struct v4l2_subdev_video_ops cx25840_video_ops = {

	.s_std = cx25840_s_std,

	.g_std = cx25840_g_std,

	.s_routing = cx25840_s_video_routing,

	.s_mbus_fmt = cx25840_s_mbus_fmt,

	.s_stream = cx25840_s_stream,