The g_std and s_std operations are video-related, move them to the video
ops where they belong.
Signed-off-by: Laurent Pinchart laurent.pinch...@ideasonboard.com
Acked-by: Hans Verkuil hans.verk...@cisco.com
Acked-by: Lad, Prabhakar prabhakar.cse...@gmail.com
---
drivers/media/i2c/adv7180.c | 2 +-
drivers/media/i2c/adv7183.c | 4 ++--
drivers/media/i2c/adv7842.c | 4 ++--
drivers/media/i2c/bt819.c | 2 +-
drivers/media/i2c/cx25840/cx25840-core.c| 4 ++--
drivers/media/i2c/ks0127.c | 6 +-
drivers/media/i2c/ml86v7667.c | 2 +-
drivers/media/i2c/msp3400-driver.c | 2 +-
drivers/media/i2c/saa6752hs.c | 2 +-
drivers/media/i2c/saa7110.c | 2 +-
drivers/media/i2c/saa7115.c | 2 +-
drivers/media/i2c/saa717x.c | 2 +-
drivers/media/i2c/saa7191.c | 2 +-
drivers/media/i2c/soc_camera/tw9910.c | 4 ++--
drivers/media/i2c/sony-btf-mpx.c| 10 +-
drivers/media/i2c/tvaudio.c | 6 +-
drivers/media/i2c/tvp514x.c | 2 +-
drivers/media/i2c/tvp5150.c | 2 +-
drivers/media/i2c/tw2804.c | 2 +-
drivers/media/i2c/tw9903.c | 2 +-
drivers/media/i2c/tw9906.c | 2 +-
drivers/media/i2c/vp27smpx.c| 6 +-
drivers/media/i2c/vpx3220.c | 2 +-
drivers/media/pci/bt8xx/bttv-driver.c | 2 +-
drivers/media/pci/cx18/cx18-av-core.c | 2 +-
drivers/media/pci/cx18/cx18-fileops.c | 2 +-
drivers/media/pci/cx18/cx18-gpio.c | 6 +-
drivers/media/pci/cx18/cx18-ioctl.c | 2 +-
drivers/media/pci/cx23885/cx23885-video.c | 4 ++--
drivers/media/pci/cx88/cx88-core.c | 2 +-
drivers/media/pci/ivtv/ivtv-fileops.c | 2 +-
drivers/media/pci/ivtv/ivtv-ioctl.c | 2 +-
drivers/media/pci/saa7134/saa7134-video.c | 4 ++--
drivers/media/pci/saa7146/mxb.c | 14 +++---
drivers/media/pci/sta2x11/sta2x11_vip.c | 4 ++--
drivers/media/pci/zoran/zoran_device.c | 2 +-
drivers/media/pci/zoran/zoran_driver.c | 2 +-
drivers/media/platform/blackfin/bfin_capture.c | 4 ++--
drivers/media/platform/davinci/vpfe_capture.c | 2 +-
drivers/media/platform/davinci/vpif_capture.c | 2 +-
drivers/media/platform/davinci/vpif_display.c | 2 +-
drivers/media/platform/fsl-viu.c| 2 +-
drivers/media/platform/soc_camera/soc_camera.c | 4 ++--
drivers/media/platform/timblogiw.c | 2 +-
drivers/media/platform/vino.c | 6 +++---
drivers/media/usb/au0828/au0828-video.c | 4 ++--
drivers/media/usb/cx231xx/cx231xx-417.c | 2 +-
drivers/media/usb/cx231xx/cx231xx-video.c | 6 +++---
drivers/media/usb/em28xx/em28xx-video.c | 4 ++--
drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 2 +-
drivers/media/usb/stk1160/stk1160-v4l.c | 4 ++--
drivers/media/usb/tm6000/tm6000-cards.c | 2 +-
drivers/media/usb/tm6000/tm6000-video.c | 2 +-
drivers/media/usb/usbvision/usbvision-video.c | 2 +-
drivers/media/v4l2-core/tuner-core.c| 6 +-
drivers/staging/media/davinci_vpfe/vpfe_video.c | 2 +-
drivers/staging/media/go7007/go7007-v4l2.c | 2 +-
drivers/staging/media/go7007/s2250-board.c | 2 +-
drivers/staging/media/go7007/saa7134-go7007.c | 4
include/media/v4l2-subdev.h | 6 +++---
60 files changed, 107 insertions(+), 91 deletions(-)
Changes compared to v2:
- Picked Prabhakar's Acked-by tag
diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c
index 5e638b1..ac1cdbe 100644
--- a/drivers/media/i2c/adv7180.c
+++ b/drivers/media/i2c/adv7180.c
@@ -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,
};
diff --git a/drivers/media/i2c/adv7183.c b/drivers/media/i2c/adv7183.c
index d45e0e3..df461b0 100644
--- a/drivers/media/i2c/adv7183.c
+++ b/drivers/media/i2c/adv7183.c
@@ -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,
