diff options
56 files changed, 165 insertions, 165 deletions
diff --git a/drivers/media/common/saa7146/saa7146_video.c b/drivers/media/common/saa7146/saa7146_video.c index 4143d61f79b1..fe907f2e8f59 100644 --- a/drivers/media/common/saa7146/saa7146_video.c +++ b/drivers/media/common/saa7146/saa7146_video.c | |||
@@ -832,7 +832,7 @@ static int vidioc_g_std(struct file *file, void *fh, v4l2_std_id *norm) | |||
832 | } | 832 | } |
833 | */ | 833 | */ |
834 | 834 | ||
835 | static int vidioc_s_std(struct file *file, void *fh, v4l2_std_id *id) | 835 | static int vidioc_s_std(struct file *file, void *fh, v4l2_std_id id) |
836 | { | 836 | { |
837 | struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev; | 837 | struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev; |
838 | struct saa7146_vv *vv = dev->vv_data; | 838 | struct saa7146_vv *vv = dev->vv_data; |
@@ -856,7 +856,7 @@ static int vidioc_s_std(struct file *file, void *fh, v4l2_std_id *id) | |||
856 | } | 856 | } |
857 | 857 | ||
858 | for (i = 0; i < dev->ext_vv_data->num_stds; i++) | 858 | for (i = 0; i < dev->ext_vv_data->num_stds; i++) |
859 | if (*id & dev->ext_vv_data->stds[i].id) | 859 | if (id & dev->ext_vv_data->stds[i].id) |
860 | break; | 860 | break; |
861 | if (i != dev->ext_vv_data->num_stds) { | 861 | if (i != dev->ext_vv_data->num_stds) { |
862 | vv->standard = &dev->ext_vv_data->stds[i]; | 862 | vv->standard = &dev->ext_vv_data->stds[i]; |
diff --git a/drivers/media/parport/pms.c b/drivers/media/parport/pms.c index 77f9c92186f4..66c957a02ba7 100644 --- a/drivers/media/parport/pms.c +++ b/drivers/media/parport/pms.c | |||
@@ -735,12 +735,12 @@ static int pms_g_std(struct file *file, void *fh, v4l2_std_id *std) | |||
735 | return 0; | 735 | return 0; |
736 | } | 736 | } |
737 | 737 | ||
738 | static int pms_s_std(struct file *file, void *fh, v4l2_std_id *std) | 738 | static int pms_s_std(struct file *file, void *fh, v4l2_std_id std) |
739 | { | 739 | { |
740 | struct pms *dev = video_drvdata(file); | 740 | struct pms *dev = video_drvdata(file); |
741 | int ret = 0; | 741 | int ret = 0; |
742 | 742 | ||
743 | dev->std = *std; | 743 | dev->std = std; |
744 | if (dev->std & V4L2_STD_NTSC) { | 744 | if (dev->std & V4L2_STD_NTSC) { |
745 | pms_framerate(dev, 30); | 745 | pms_framerate(dev, 30); |
746 | pms_secamcross(dev, 0); | 746 | pms_secamcross(dev, 0); |
diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c index 7aea24bf3a37..4b9a256f506e 100644 --- a/drivers/media/pci/bt8xx/bttv-driver.c +++ b/drivers/media/pci/bt8xx/bttv-driver.c | |||
@@ -1713,7 +1713,7 @@ static void radio_enable(struct bttv *btv) | |||
1713 | } | 1713 | } |
1714 | } | 1714 | } |
1715 | 1715 | ||
1716 | static int bttv_s_std(struct file *file, void *priv, v4l2_std_id *id) | 1716 | static int bttv_s_std(struct file *file, void *priv, v4l2_std_id id) |
1717 | { | 1717 | { |
1718 | struct bttv_fh *fh = priv; | 1718 | struct bttv_fh *fh = priv; |
1719 | struct bttv *btv = fh->btv; | 1719 | struct bttv *btv = fh->btv; |
@@ -1721,14 +1721,14 @@ static int bttv_s_std(struct file *file, void *priv, v4l2_std_id *id) | |||
1721 | int err = 0; | 1721 | int err = 0; |
1722 | 1722 | ||
1723 | for (i = 0; i < BTTV_TVNORMS; i++) | 1723 | for (i = 0; i < BTTV_TVNORMS; i++) |
1724 | if (*id & bttv_tvnorms[i].v4l2_id) | 1724 | if (id & bttv_tvnorms[i].v4l2_id) |
1725 | break; | 1725 | break; |
1726 | if (i == BTTV_TVNORMS) { | 1726 | if (i == BTTV_TVNORMS) { |
1727 | err = -EINVAL; | 1727 | err = -EINVAL; |
1728 | goto err; | 1728 | goto err; |
1729 | } | 1729 | } |
1730 | 1730 | ||
1731 | btv->std = *id; | 1731 | btv->std = id; |
1732 | set_tvnorm(btv, i); | 1732 | set_tvnorm(btv, i); |
1733 | 1733 | ||
1734 | err: | 1734 | err: |
diff --git a/drivers/media/pci/cx18/cx18-driver.c b/drivers/media/pci/cx18/cx18-driver.c index 613e5ae7d5ca..67b61cf3e03a 100644 --- a/drivers/media/pci/cx18/cx18-driver.c +++ b/drivers/media/pci/cx18/cx18-driver.c | |||
@@ -1243,7 +1243,7 @@ int cx18_init_on_first_open(struct cx18 *cx) | |||
1243 | in one place. */ | 1243 | in one place. */ |
1244 | cx->std++; /* Force full standard initialization */ | 1244 | cx->std++; /* Force full standard initialization */ |
1245 | std = (cx->tuner_std == V4L2_STD_ALL) ? V4L2_STD_NTSC_M : cx->tuner_std; | 1245 | std = (cx->tuner_std == V4L2_STD_ALL) ? V4L2_STD_NTSC_M : cx->tuner_std; |
1246 | cx18_s_std(NULL, &fh, &std); | 1246 | cx18_s_std(NULL, &fh, std); |
1247 | cx18_s_frequency(NULL, &fh, &vf); | 1247 | cx18_s_frequency(NULL, &fh, &vf); |
1248 | return 0; | 1248 | return 0; |
1249 | } | 1249 | } |
diff --git a/drivers/media/pci/cx18/cx18-ioctl.c b/drivers/media/pci/cx18/cx18-ioctl.c index 173ccd204c1f..254c50fabd73 100644 --- a/drivers/media/pci/cx18/cx18-ioctl.c +++ b/drivers/media/pci/cx18/cx18-ioctl.c | |||
@@ -637,15 +637,15 @@ static int cx18_g_std(struct file *file, void *fh, v4l2_std_id *std) | |||
637 | return 0; | 637 | return 0; |
638 | } | 638 | } |
639 | 639 | ||
640 | int cx18_s_std(struct file *file, void *fh, v4l2_std_id *std) | 640 | int cx18_s_std(struct file *file, void *fh, v4l2_std_id std) |
641 | { | 641 | { |
642 | struct cx18_open_id *id = fh2id(fh); | 642 | struct cx18_open_id *id = fh2id(fh); |
643 | struct cx18 *cx = id->cx; | 643 | struct cx18 *cx = id->cx; |
644 | 644 | ||
645 | if ((*std & V4L2_STD_ALL) == 0) | 645 | if ((std & V4L2_STD_ALL) == 0) |
646 | return -EINVAL; | 646 | return -EINVAL; |
647 | 647 | ||
648 | if (*std == cx->std) | 648 | if (std == cx->std) |
649 | return 0; | 649 | return 0; |
650 | 650 | ||
651 | if (test_bit(CX18_F_I_RADIO_USER, &cx->i_flags) || | 651 | if (test_bit(CX18_F_I_RADIO_USER, &cx->i_flags) || |
@@ -656,8 +656,8 @@ int cx18_s_std(struct file *file, void *fh, v4l2_std_id *std) | |||
656 | return -EBUSY; | 656 | return -EBUSY; |
657 | } | 657 | } |
658 | 658 | ||
659 | cx->std = *std; | 659 | cx->std = std; |
660 | cx->is_60hz = (*std & V4L2_STD_525_60) ? 1 : 0; | 660 | cx->is_60hz = (std & V4L2_STD_525_60) ? 1 : 0; |
661 | cx->is_50hz = !cx->is_60hz; | 661 | cx->is_50hz = !cx->is_60hz; |
662 | cx2341x_handler_set_50hz(&cx->cxhdl, cx->is_50hz); | 662 | cx2341x_handler_set_50hz(&cx->cxhdl, cx->is_50hz); |
663 | cx->cxhdl.width = 720; | 663 | cx->cxhdl.width = 720; |
diff --git a/drivers/media/pci/cx18/cx18-ioctl.h b/drivers/media/pci/cx18/cx18-ioctl.h index aa9b44a611d3..43433969d633 100644 --- a/drivers/media/pci/cx18/cx18-ioctl.h +++ b/drivers/media/pci/cx18/cx18-ioctl.h | |||
@@ -26,6 +26,6 @@ u16 cx18_service2vbi(int type); | |||
26 | void cx18_expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal); | 26 | void cx18_expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal); |
27 | u16 cx18_get_service_set(struct v4l2_sliced_vbi_format *fmt); | 27 | u16 cx18_get_service_set(struct v4l2_sliced_vbi_format *fmt); |
28 | void cx18_set_funcs(struct video_device *vdev); | 28 | void cx18_set_funcs(struct video_device *vdev); |
29 | int cx18_s_std(struct file *file, void *fh, v4l2_std_id *std); | 29 | int cx18_s_std(struct file *file, void *fh, v4l2_std_id std); |
30 | int cx18_s_frequency(struct file *file, void *fh, const struct v4l2_frequency *vf); | 30 | int cx18_s_frequency(struct file *file, void *fh, const struct v4l2_frequency *vf); |
31 | int cx18_s_input(struct file *file, void *fh, unsigned int inp); | 31 | int cx18_s_input(struct file *file, void *fh, unsigned int inp); |
diff --git a/drivers/media/pci/cx23885/cx23885-417.c b/drivers/media/pci/cx23885/cx23885-417.c index 812ec5ff5939..6dea11a7a858 100644 --- a/drivers/media/pci/cx23885/cx23885-417.c +++ b/drivers/media/pci/cx23885/cx23885-417.c | |||
@@ -1222,14 +1222,14 @@ static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *id) | |||
1222 | return 0; | 1222 | return 0; |
1223 | } | 1223 | } |
1224 | 1224 | ||
1225 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *id) | 1225 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id id) |
1226 | { | 1226 | { |
1227 | struct cx23885_fh *fh = file->private_data; | 1227 | struct cx23885_fh *fh = file->private_data; |
1228 | struct cx23885_dev *dev = fh->dev; | 1228 | struct cx23885_dev *dev = fh->dev; |
1229 | unsigned int i; | 1229 | unsigned int i; |
1230 | 1230 | ||
1231 | for (i = 0; i < ARRAY_SIZE(cx23885_tvnorms); i++) | 1231 | for (i = 0; i < ARRAY_SIZE(cx23885_tvnorms); i++) |
1232 | if (*id & cx23885_tvnorms[i].id) | 1232 | if (id & cx23885_tvnorms[i].id) |
1233 | break; | 1233 | break; |
1234 | if (i == ARRAY_SIZE(cx23885_tvnorms)) | 1234 | if (i == ARRAY_SIZE(cx23885_tvnorms)) |
1235 | return -EINVAL; | 1235 | return -EINVAL; |
@@ -1237,7 +1237,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *id) | |||
1237 | 1237 | ||
1238 | /* Have the drier core notify the subdevices */ | 1238 | /* Have the drier core notify the subdevices */ |
1239 | mutex_lock(&dev->lock); | 1239 | mutex_lock(&dev->lock); |
1240 | cx23885_set_tvnorm(dev, *id); | 1240 | cx23885_set_tvnorm(dev, id); |
1241 | mutex_unlock(&dev->lock); | 1241 | mutex_unlock(&dev->lock); |
1242 | 1242 | ||
1243 | return 0; | 1243 | return 0; |
diff --git a/drivers/media/pci/cx23885/cx23885-video.c b/drivers/media/pci/cx23885/cx23885-video.c index 2bbda43eb00e..ed08c89adde0 100644 --- a/drivers/media/pci/cx23885/cx23885-video.c +++ b/drivers/media/pci/cx23885/cx23885-video.c | |||
@@ -1259,13 +1259,13 @@ static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *id) | |||
1259 | return 0; | 1259 | return 0; |
1260 | } | 1260 | } |
1261 | 1261 | ||
1262 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *tvnorms) | 1262 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id tvnorms) |
1263 | { | 1263 | { |
1264 | struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev; | 1264 | struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev; |
1265 | dprintk(1, "%s()\n", __func__); | 1265 | dprintk(1, "%s()\n", __func__); |
1266 | 1266 | ||
1267 | mutex_lock(&dev->lock); | 1267 | mutex_lock(&dev->lock); |
1268 | cx23885_set_tvnorm(dev, *tvnorms); | 1268 | cx23885_set_tvnorm(dev, tvnorms); |
1269 | mutex_unlock(&dev->lock); | 1269 | mutex_unlock(&dev->lock); |
1270 | 1270 | ||
1271 | return 0; | 1271 | return 0; |
diff --git a/drivers/media/pci/cx25821/cx25821-video.c b/drivers/media/pci/cx25821/cx25821-video.c index 75281c1530d8..93c7d576199b 100644 --- a/drivers/media/pci/cx25821/cx25821-video.c +++ b/drivers/media/pci/cx25821/cx25821-video.c | |||
@@ -1203,7 +1203,7 @@ int cx25821_vidioc_s_priority(struct file *file, void *f, | |||
1203 | } | 1203 | } |
1204 | 1204 | ||
1205 | #ifdef TUNER_FLAG | 1205 | #ifdef TUNER_FLAG |
1206 | int cx25821_vidioc_s_std(struct file *file, void *priv, v4l2_std_id * tvnorms) | 1206 | int cx25821_vidioc_s_std(struct file *file, void *priv, v4l2_std_id tvnorms) |
1207 | { | 1207 | { |
1208 | struct cx25821_fh *fh = priv; | 1208 | struct cx25821_fh *fh = priv; |
1209 | struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev; | 1209 | struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev; |
@@ -1218,11 +1218,11 @@ int cx25821_vidioc_s_std(struct file *file, void *priv, v4l2_std_id * tvnorms) | |||
1218 | return err; | 1218 | return err; |
1219 | } | 1219 | } |
1220 | 1220 | ||
1221 | if (dev->tvnorm == *tvnorms) | 1221 | if (dev->tvnorm == tvnorms) |
1222 | return 0; | 1222 | return 0; |
1223 | 1223 | ||
1224 | mutex_lock(&dev->lock); | 1224 | mutex_lock(&dev->lock); |
1225 | cx25821_set_tvnorm(dev, *tvnorms); | 1225 | cx25821_set_tvnorm(dev, tvnorms); |
1226 | mutex_unlock(&dev->lock); | 1226 | mutex_unlock(&dev->lock); |
1227 | 1227 | ||
1228 | medusa_set_videostandard(dev); | 1228 | medusa_set_videostandard(dev); |
diff --git a/drivers/media/pci/cx25821/cx25821-video.h b/drivers/media/pci/cx25821/cx25821-video.h index f0e70ffbedd4..239f63c12f33 100644 --- a/drivers/media/pci/cx25821/cx25821-video.h +++ b/drivers/media/pci/cx25821/cx25821-video.h | |||
@@ -135,7 +135,7 @@ extern int cx25821_vidioc_querybuf(struct file *file, void *priv, | |||
135 | extern int cx25821_vidioc_qbuf(struct file *file, void *priv, | 135 | extern int cx25821_vidioc_qbuf(struct file *file, void *priv, |
136 | struct v4l2_buffer *p); | 136 | struct v4l2_buffer *p); |
137 | extern int cx25821_vidioc_s_std(struct file *file, void *priv, | 137 | extern int cx25821_vidioc_s_std(struct file *file, void *priv, |
138 | v4l2_std_id *tvnorms); | 138 | v4l2_std_id tvnorms); |
139 | extern int cx25821_enum_input(struct cx25821_dev *dev, struct v4l2_input *i); | 139 | extern int cx25821_enum_input(struct cx25821_dev *dev, struct v4l2_input *i); |
140 | extern int cx25821_vidioc_enum_input(struct file *file, void *priv, | 140 | extern int cx25821_vidioc_enum_input(struct file *file, void *priv, |
141 | struct v4l2_input *i); | 141 | struct v4l2_input *i); |
diff --git a/drivers/media/pci/cx88/cx88-blackbird.c b/drivers/media/pci/cx88/cx88-blackbird.c index 486ca8d5f2a0..150bb76e7839 100644 --- a/drivers/media/pci/cx88/cx88-blackbird.c +++ b/drivers/media/pci/cx88/cx88-blackbird.c | |||
@@ -939,12 +939,12 @@ static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *tvnorm) | |||
939 | return 0; | 939 | return 0; |
940 | } | 940 | } |
941 | 941 | ||
942 | static int vidioc_s_std (struct file *file, void *priv, v4l2_std_id *id) | 942 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id id) |
943 | { | 943 | { |
944 | struct cx88_core *core = ((struct cx8802_fh *)priv)->dev->core; | 944 | struct cx88_core *core = ((struct cx8802_fh *)priv)->dev->core; |
945 | 945 | ||
946 | mutex_lock(&core->lock); | 946 | mutex_lock(&core->lock); |
947 | cx88_set_tvnorm(core,*id); | 947 | cx88_set_tvnorm(core, id); |
948 | mutex_unlock(&core->lock); | 948 | mutex_unlock(&core->lock); |
949 | return 0; | 949 | return 0; |
950 | } | 950 | } |
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c index ede6f139b5cc..ead5be58303d 100644 --- a/drivers/media/pci/cx88/cx88-video.c +++ b/drivers/media/pci/cx88/cx88-video.c | |||
@@ -1193,12 +1193,12 @@ static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *tvnorm) | |||
1193 | return 0; | 1193 | return 0; |
1194 | } | 1194 | } |
1195 | 1195 | ||
1196 | static int vidioc_s_std (struct file *file, void *priv, v4l2_std_id *tvnorms) | 1196 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id tvnorms) |
1197 | { | 1197 | { |
1198 | struct cx88_core *core = ((struct cx8800_fh *)priv)->dev->core; | 1198 | struct cx88_core *core = ((struct cx8800_fh *)priv)->dev->core; |
1199 | 1199 | ||
1200 | mutex_lock(&core->lock); | 1200 | mutex_lock(&core->lock); |
1201 | cx88_set_tvnorm(core,*tvnorms); | 1201 | cx88_set_tvnorm(core, tvnorms); |
1202 | mutex_unlock(&core->lock); | 1202 | mutex_unlock(&core->lock); |
1203 | 1203 | ||
1204 | return 0; | 1204 | return 0; |
diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c index 2928e7287da8..07b8460953b6 100644 --- a/drivers/media/pci/ivtv/ivtv-driver.c +++ b/drivers/media/pci/ivtv/ivtv-driver.c | |||
@@ -1387,7 +1387,7 @@ int ivtv_init_on_first_open(struct ivtv *itv) | |||
1387 | if (!itv->has_cx23415) | 1387 | if (!itv->has_cx23415) |
1388 | write_reg_sync(0x03, IVTV_REG_DMACONTROL); | 1388 | write_reg_sync(0x03, IVTV_REG_DMACONTROL); |
1389 | 1389 | ||
1390 | ivtv_s_std_enc(itv, &itv->tuner_std); | 1390 | ivtv_s_std_enc(itv, itv->tuner_std); |
1391 | 1391 | ||
1392 | /* Default interrupts enabled. For the PVR350 this includes the | 1392 | /* Default interrupts enabled. For the PVR350 this includes the |
1393 | decoder VSYNC interrupt, which is always on. It is not only used | 1393 | decoder VSYNC interrupt, which is always on. It is not only used |
@@ -1397,7 +1397,7 @@ int ivtv_init_on_first_open(struct ivtv *itv) | |||
1397 | if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) { | 1397 | if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) { |
1398 | ivtv_clear_irq_mask(itv, IVTV_IRQ_MASK_INIT | IVTV_IRQ_DEC_VSYNC); | 1398 | ivtv_clear_irq_mask(itv, IVTV_IRQ_MASK_INIT | IVTV_IRQ_DEC_VSYNC); |
1399 | ivtv_set_osd_alpha(itv); | 1399 | ivtv_set_osd_alpha(itv); |
1400 | ivtv_s_std_dec(itv, &itv->tuner_std); | 1400 | ivtv_s_std_dec(itv, itv->tuner_std); |
1401 | } else { | 1401 | } else { |
1402 | ivtv_clear_irq_mask(itv, IVTV_IRQ_MASK_INIT); | 1402 | ivtv_clear_irq_mask(itv, IVTV_IRQ_MASK_INIT); |
1403 | } | 1403 | } |
diff --git a/drivers/media/pci/ivtv/ivtv-firmware.c b/drivers/media/pci/ivtv/ivtv-firmware.c index 68387d4369d6..ed73edd2bcd3 100644 --- a/drivers/media/pci/ivtv/ivtv-firmware.c +++ b/drivers/media/pci/ivtv/ivtv-firmware.c | |||
@@ -302,7 +302,7 @@ static int ivtv_firmware_restart(struct ivtv *itv) | |||
302 | /* Restore encoder video standard */ | 302 | /* Restore encoder video standard */ |
303 | std = itv->std; | 303 | std = itv->std; |
304 | itv->std = 0; | 304 | itv->std = 0; |
305 | ivtv_s_std_enc(itv, &std); | 305 | ivtv_s_std_enc(itv, std); |
306 | 306 | ||
307 | if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) { | 307 | if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) { |
308 | ivtv_init_mpeg_decoder(itv); | 308 | ivtv_init_mpeg_decoder(itv); |
@@ -310,7 +310,7 @@ static int ivtv_firmware_restart(struct ivtv *itv) | |||
310 | /* Restore decoder video standard */ | 310 | /* Restore decoder video standard */ |
311 | std = itv->std_out; | 311 | std = itv->std_out; |
312 | itv->std_out = 0; | 312 | itv->std_out = 0; |
313 | ivtv_s_std_dec(itv, &std); | 313 | ivtv_s_std_dec(itv, std); |
314 | 314 | ||
315 | /* Restore framebuffer if active */ | 315 | /* Restore framebuffer if active */ |
316 | if (itv->ivtvfb_restore) | 316 | if (itv->ivtvfb_restore) |
diff --git a/drivers/media/pci/ivtv/ivtv-ioctl.c b/drivers/media/pci/ivtv/ivtv-ioctl.c index 852f11e0d636..080f179070a6 100644 --- a/drivers/media/pci/ivtv/ivtv-ioctl.c +++ b/drivers/media/pci/ivtv/ivtv-ioctl.c | |||
@@ -1103,10 +1103,10 @@ static int ivtv_g_std(struct file *file, void *fh, v4l2_std_id *std) | |||
1103 | return 0; | 1103 | return 0; |
1104 | } | 1104 | } |
1105 | 1105 | ||
1106 | void ivtv_s_std_enc(struct ivtv *itv, v4l2_std_id *std) | 1106 | void ivtv_s_std_enc(struct ivtv *itv, v4l2_std_id std) |
1107 | { | 1107 | { |
1108 | itv->std = *std; | 1108 | itv->std = std; |
1109 | itv->is_60hz = (*std & V4L2_STD_525_60) ? 1 : 0; | 1109 | itv->is_60hz = (std & V4L2_STD_525_60) ? 1 : 0; |
1110 | itv->is_50hz = !itv->is_60hz; | 1110 | itv->is_50hz = !itv->is_60hz; |
1111 | cx2341x_handler_set_50hz(&itv->cxhdl, itv->is_50hz); | 1111 | cx2341x_handler_set_50hz(&itv->cxhdl, itv->is_50hz); |
1112 | itv->cxhdl.width = 720; | 1112 | itv->cxhdl.width = 720; |
@@ -1122,15 +1122,15 @@ void ivtv_s_std_enc(struct ivtv *itv, v4l2_std_id *std) | |||
1122 | ivtv_call_all(itv, core, s_std, itv->std); | 1122 | ivtv_call_all(itv, core, s_std, itv->std); |
1123 | } | 1123 | } |
1124 | 1124 | ||
1125 | void ivtv_s_std_dec(struct ivtv *itv, v4l2_std_id *std) | 1125 | void ivtv_s_std_dec(struct ivtv *itv, v4l2_std_id std) |
1126 | { | 1126 | { |
1127 | struct yuv_playback_info *yi = &itv->yuv_info; | 1127 | struct yuv_playback_info *yi = &itv->yuv_info; |
1128 | DEFINE_WAIT(wait); | 1128 | DEFINE_WAIT(wait); |
1129 | int f; | 1129 | int f; |
1130 | 1130 | ||
1131 | /* set display standard */ | 1131 | /* set display standard */ |
1132 | itv->std_out = *std; | 1132 | itv->std_out = std; |
1133 | itv->is_out_60hz = (*std & V4L2_STD_525_60) ? 1 : 0; | 1133 | itv->is_out_60hz = (std & V4L2_STD_525_60) ? 1 : 0; |
1134 | itv->is_out_50hz = !itv->is_out_60hz; | 1134 | itv->is_out_50hz = !itv->is_out_60hz; |
1135 | ivtv_call_all(itv, video, s_std_output, itv->std_out); | 1135 | ivtv_call_all(itv, video, s_std_output, itv->std_out); |
1136 | 1136 | ||
@@ -1168,14 +1168,14 @@ void ivtv_s_std_dec(struct ivtv *itv, v4l2_std_id *std) | |||
1168 | } | 1168 | } |
1169 | } | 1169 | } |
1170 | 1170 | ||
1171 | static int ivtv_s_std(struct file *file, void *fh, v4l2_std_id *std) | 1171 | static int ivtv_s_std(struct file *file, void *fh, v4l2_std_id std) |
1172 | { | 1172 | { |
1173 | struct ivtv *itv = fh2id(fh)->itv; | 1173 | struct ivtv *itv = fh2id(fh)->itv; |
1174 | 1174 | ||
1175 | if ((*std & V4L2_STD_ALL) == 0) | 1175 | if ((std & V4L2_STD_ALL) == 0) |
1176 | return -EINVAL; | 1176 | return -EINVAL; |
1177 | 1177 | ||
1178 | if (*std == itv->std) | 1178 | if (std == itv->std) |
1179 | return 0; | 1179 | return 0; |
1180 | 1180 | ||
1181 | if (test_bit(IVTV_F_I_RADIO_USER, &itv->i_flags) || | 1181 | if (test_bit(IVTV_F_I_RADIO_USER, &itv->i_flags) || |
diff --git a/drivers/media/pci/ivtv/ivtv-ioctl.h b/drivers/media/pci/ivtv/ivtv-ioctl.h index 34c6bc132ebd..75c397756116 100644 --- a/drivers/media/pci/ivtv/ivtv-ioctl.h +++ b/drivers/media/pci/ivtv/ivtv-ioctl.h | |||
@@ -27,8 +27,8 @@ u16 ivtv_get_service_set(struct v4l2_sliced_vbi_format *fmt); | |||
27 | void ivtv_set_osd_alpha(struct ivtv *itv); | 27 | void ivtv_set_osd_alpha(struct ivtv *itv); |
28 | int ivtv_set_speed(struct ivtv *itv, int speed); | 28 | int ivtv_set_speed(struct ivtv *itv, int speed); |
29 | void ivtv_set_funcs(struct video_device *vdev); | 29 | void ivtv_set_funcs(struct video_device *vdev); |
30 | void ivtv_s_std_enc(struct ivtv *itv, v4l2_std_id *std); | 30 | void ivtv_s_std_enc(struct ivtv *itv, v4l2_std_id std); |
31 | void ivtv_s_std_dec(struct ivtv *itv, v4l2_std_id *std); | 31 | void ivtv_s_std_dec(struct ivtv *itv, v4l2_std_id std); |
32 | int ivtv_s_frequency(struct file *file, void *fh, const struct v4l2_frequency *vf); | 32 | int ivtv_s_frequency(struct file *file, void *fh, const struct v4l2_frequency *vf); |
33 | int ivtv_s_input(struct file *file, void *fh, unsigned int inp); | 33 | int ivtv_s_input(struct file *file, void *fh, unsigned int inp); |
34 | 34 | ||
diff --git a/drivers/media/pci/saa7134/saa7134-empress.c b/drivers/media/pci/saa7134/saa7134-empress.c index 4df79c656909..66a70814004c 100644 --- a/drivers/media/pci/saa7134/saa7134-empress.c +++ b/drivers/media/pci/saa7134/saa7134-empress.c | |||
@@ -428,7 +428,7 @@ static int empress_g_chip_ident(struct file *file, void *fh, | |||
428 | return -EINVAL; | 428 | return -EINVAL; |
429 | } | 429 | } |
430 | 430 | ||
431 | static int empress_s_std(struct file *file, void *priv, v4l2_std_id *id) | 431 | static int empress_s_std(struct file *file, void *priv, v4l2_std_id id) |
432 | { | 432 | { |
433 | struct saa7134_dev *dev = file->private_data; | 433 | struct saa7134_dev *dev = file->private_data; |
434 | 434 | ||
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c index 1e23547531b9..a6c69a4c7fbd 100644 --- a/drivers/media/pci/saa7134/saa7134-video.c +++ b/drivers/media/pci/saa7134/saa7134-video.c | |||
@@ -1828,7 +1828,7 @@ static int saa7134_querycap(struct file *file, void *priv, | |||
1828 | return 0; | 1828 | return 0; |
1829 | } | 1829 | } |
1830 | 1830 | ||
1831 | int saa7134_s_std_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, v4l2_std_id *id) | 1831 | int saa7134_s_std_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, v4l2_std_id id) |
1832 | { | 1832 | { |
1833 | unsigned long flags; | 1833 | unsigned long flags; |
1834 | unsigned int i; | 1834 | unsigned int i; |
@@ -1849,17 +1849,17 @@ int saa7134_s_std_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, v4l2_ | |||
1849 | } | 1849 | } |
1850 | 1850 | ||
1851 | for (i = 0; i < TVNORMS; i++) | 1851 | for (i = 0; i < TVNORMS; i++) |
1852 | if (*id == tvnorms[i].id) | 1852 | if (id == tvnorms[i].id) |
1853 | break; | 1853 | break; |
1854 | 1854 | ||
1855 | if (i == TVNORMS) | 1855 | if (i == TVNORMS) |
1856 | for (i = 0; i < TVNORMS; i++) | 1856 | for (i = 0; i < TVNORMS; i++) |
1857 | if (*id & tvnorms[i].id) | 1857 | if (id & tvnorms[i].id) |
1858 | break; | 1858 | break; |
1859 | if (i == TVNORMS) | 1859 | if (i == TVNORMS) |
1860 | return -EINVAL; | 1860 | return -EINVAL; |
1861 | 1861 | ||
1862 | if ((*id & V4L2_STD_SECAM) && (secam[0] != '-')) { | 1862 | if ((id & V4L2_STD_SECAM) && (secam[0] != '-')) { |
1863 | if (secam[0] == 'L' || secam[0] == 'l') { | 1863 | if (secam[0] == 'L' || secam[0] == 'l') { |
1864 | if (secam[1] == 'C' || secam[1] == 'c') | 1864 | if (secam[1] == 'C' || secam[1] == 'c') |
1865 | fixup = V4L2_STD_SECAM_LC; | 1865 | fixup = V4L2_STD_SECAM_LC; |
@@ -1879,7 +1879,7 @@ int saa7134_s_std_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, v4l2_ | |||
1879 | return -EINVAL; | 1879 | return -EINVAL; |
1880 | } | 1880 | } |
1881 | 1881 | ||
1882 | *id = tvnorms[i].id; | 1882 | id = tvnorms[i].id; |
1883 | 1883 | ||
1884 | mutex_lock(&dev->lock); | 1884 | mutex_lock(&dev->lock); |
1885 | if (fh && res_check(fh, RESOURCE_OVERLAY)) { | 1885 | if (fh && res_check(fh, RESOURCE_OVERLAY)) { |
@@ -1901,7 +1901,7 @@ int saa7134_s_std_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, v4l2_ | |||
1901 | } | 1901 | } |
1902 | EXPORT_SYMBOL_GPL(saa7134_s_std_internal); | 1902 | EXPORT_SYMBOL_GPL(saa7134_s_std_internal); |
1903 | 1903 | ||
1904 | static int saa7134_s_std(struct file *file, void *priv, v4l2_std_id *id) | 1904 | static int saa7134_s_std(struct file *file, void *priv, v4l2_std_id id) |
1905 | { | 1905 | { |
1906 | struct saa7134_fh *fh = priv; | 1906 | struct saa7134_fh *fh = priv; |
1907 | 1907 | ||
@@ -2396,7 +2396,7 @@ static int radio_s_input(struct file *filp, void *priv, unsigned int i) | |||
2396 | return 0; | 2396 | return 0; |
2397 | } | 2397 | } |
2398 | 2398 | ||
2399 | static int radio_s_std(struct file *file, void *fh, v4l2_std_id *norm) | 2399 | static int radio_s_std(struct file *file, void *fh, v4l2_std_id norm) |
2400 | { | 2400 | { |
2401 | return 0; | 2401 | return 0; |
2402 | } | 2402 | } |
diff --git a/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h index 71eefef5e324..62169dd74c6a 100644 --- a/drivers/media/pci/saa7134/saa7134.h +++ b/drivers/media/pci/saa7134/saa7134.h | |||
@@ -766,7 +766,7 @@ extern struct video_device saa7134_radio_template; | |||
766 | int saa7134_s_ctrl_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, struct v4l2_control *c); | 766 | int saa7134_s_ctrl_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, struct v4l2_control *c); |
767 | int saa7134_g_ctrl_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, struct v4l2_control *c); | 767 | int saa7134_g_ctrl_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, struct v4l2_control *c); |
768 | int saa7134_queryctrl(struct file *file, void *priv, struct v4l2_queryctrl *c); | 768 | int saa7134_queryctrl(struct file *file, void *priv, struct v4l2_queryctrl *c); |
769 | int saa7134_s_std_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, v4l2_std_id *id); | 769 | int saa7134_s_std_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, v4l2_std_id id); |
770 | 770 | ||
771 | int saa7134_videoport_init(struct saa7134_dev *dev); | 771 | int saa7134_videoport_init(struct saa7134_dev *dev); |
772 | void saa7134_set_tvnorm_hw(struct saa7134_dev *dev); | 772 | void saa7134_set_tvnorm_hw(struct saa7134_dev *dev); |
diff --git a/drivers/media/pci/saa7164/saa7164-encoder.c b/drivers/media/pci/saa7164/saa7164-encoder.c index e7fbd036ba44..538de52b9cfd 100644 --- a/drivers/media/pci/saa7164/saa7164-encoder.c +++ b/drivers/media/pci/saa7164/saa7164-encoder.c | |||
@@ -211,17 +211,17 @@ static int saa7164_encoder_initialize(struct saa7164_port *port) | |||
211 | } | 211 | } |
212 | 212 | ||
213 | /* -- V4L2 --------------------------------------------------------- */ | 213 | /* -- V4L2 --------------------------------------------------------- */ |
214 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *id) | 214 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id id) |
215 | { | 215 | { |
216 | struct saa7164_encoder_fh *fh = file->private_data; | 216 | struct saa7164_encoder_fh *fh = file->private_data; |
217 | struct saa7164_port *port = fh->port; | 217 | struct saa7164_port *port = fh->port; |
218 | struct saa7164_dev *dev = port->dev; | 218 | struct saa7164_dev *dev = port->dev; |
219 | unsigned int i; | 219 | unsigned int i; |
220 | 220 | ||
221 | dprintk(DBGLVL_ENC, "%s(id=0x%x)\n", __func__, (u32)*id); | 221 | dprintk(DBGLVL_ENC, "%s(id=0x%x)\n", __func__, (u32)id); |
222 | 222 | ||
223 | for (i = 0; i < ARRAY_SIZE(saa7164_tvnorms); i++) { | 223 | for (i = 0; i < ARRAY_SIZE(saa7164_tvnorms); i++) { |
224 | if (*id & saa7164_tvnorms[i].id) | 224 | if (id & saa7164_tvnorms[i].id) |
225 | break; | 225 | break; |
226 | } | 226 | } |
227 | if (i == ARRAY_SIZE(saa7164_tvnorms)) | 227 | if (i == ARRAY_SIZE(saa7164_tvnorms)) |
@@ -234,7 +234,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *id) | |||
234 | */ | 234 | */ |
235 | saa7164_api_set_audio_std(port); | 235 | saa7164_api_set_audio_std(port); |
236 | 236 | ||
237 | dprintk(DBGLVL_ENC, "%s(id=0x%x) OK\n", __func__, (u32)*id); | 237 | dprintk(DBGLVL_ENC, "%s(id=0x%x) OK\n", __func__, (u32)id); |
238 | 238 | ||
239 | return 0; | 239 | return 0; |
240 | } | 240 | } |
diff --git a/drivers/media/pci/saa7164/saa7164-vbi.c b/drivers/media/pci/saa7164/saa7164-vbi.c index bfc8cec110de..da224eb39b95 100644 --- a/drivers/media/pci/saa7164/saa7164-vbi.c +++ b/drivers/media/pci/saa7164/saa7164-vbi.c | |||
@@ -183,17 +183,17 @@ static int saa7164_vbi_initialize(struct saa7164_port *port) | |||
183 | } | 183 | } |
184 | 184 | ||
185 | /* -- V4L2 --------------------------------------------------------- */ | 185 | /* -- V4L2 --------------------------------------------------------- */ |
186 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *id) | 186 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id id) |
187 | { | 187 | { |
188 | struct saa7164_vbi_fh *fh = file->private_data; | 188 | struct saa7164_vbi_fh *fh = file->private_data; |
189 | struct saa7164_port *port = fh->port; | 189 | struct saa7164_port *port = fh->port; |
190 | struct saa7164_dev *dev = port->dev; | 190 | struct saa7164_dev *dev = port->dev; |
191 | unsigned int i; | 191 | unsigned int i; |
192 | 192 | ||
193 | dprintk(DBGLVL_VBI, "%s(id=0x%x)\n", __func__, (u32)*id); | 193 | dprintk(DBGLVL_VBI, "%s(id=0x%x)\n", __func__, (u32)id); |
194 | 194 | ||
195 | for (i = 0; i < ARRAY_SIZE(saa7164_tvnorms); i++) { | 195 | for (i = 0; i < ARRAY_SIZE(saa7164_tvnorms); i++) { |
196 | if (*id & saa7164_tvnorms[i].id) | 196 | if (id & saa7164_tvnorms[i].id) |
197 | break; | 197 | break; |
198 | } | 198 | } |
199 | if (i == ARRAY_SIZE(saa7164_tvnorms)) | 199 | if (i == ARRAY_SIZE(saa7164_tvnorms)) |
@@ -206,7 +206,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *id) | |||
206 | */ | 206 | */ |
207 | saa7164_api_set_audio_std(port); | 207 | saa7164_api_set_audio_std(port); |
208 | 208 | ||
209 | dprintk(DBGLVL_VBI, "%s(id=0x%x) OK\n", __func__, (u32)*id); | 209 | dprintk(DBGLVL_VBI, "%s(id=0x%x) OK\n", __func__, (u32)id); |
210 | 210 | ||
211 | return 0; | 211 | return 0; |
212 | } | 212 | } |
diff --git a/drivers/media/pci/sta2x11/sta2x11_vip.c b/drivers/media/pci/sta2x11/sta2x11_vip.c index 4b703fe8c953..7005695aa4bd 100644 --- a/drivers/media/pci/sta2x11/sta2x11_vip.c +++ b/drivers/media/pci/sta2x11/sta2x11_vip.c | |||
@@ -439,22 +439,22 @@ static int vidioc_querycap(struct file *file, void *priv, | |||
439 | * | 439 | * |
440 | * other, returned from video DAC. | 440 | * other, returned from video DAC. |
441 | */ | 441 | */ |
442 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *std) | 442 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id std) |
443 | { | 443 | { |
444 | struct sta2x11_vip *vip = video_drvdata(file); | 444 | struct sta2x11_vip *vip = video_drvdata(file); |
445 | v4l2_std_id oldstd = vip->std, newstd; | 445 | v4l2_std_id oldstd = vip->std, newstd; |
446 | int status; | 446 | int status; |
447 | 447 | ||
448 | if (V4L2_STD_ALL == *std) { | 448 | if (V4L2_STD_ALL == std) { |
449 | v4l2_subdev_call(vip->decoder, core, s_std, *std); | 449 | v4l2_subdev_call(vip->decoder, core, s_std, std); |
450 | ssleep(2); | 450 | ssleep(2); |
451 | v4l2_subdev_call(vip->decoder, video, querystd, &newstd); | 451 | v4l2_subdev_call(vip->decoder, video, querystd, &newstd); |
452 | v4l2_subdev_call(vip->decoder, video, g_input_status, &status); | 452 | v4l2_subdev_call(vip->decoder, video, g_input_status, &status); |
453 | if (status & V4L2_IN_ST_NO_SIGNAL) | 453 | if (status & V4L2_IN_ST_NO_SIGNAL) |
454 | return -EIO; | 454 | return -EIO; |
455 | *std = vip->std = newstd; | 455 | std = vip->std = newstd; |
456 | if (oldstd != *std) { | 456 | if (oldstd != std) { |
457 | if (V4L2_STD_525_60 & (*std)) | 457 | if (V4L2_STD_525_60 & std) |
458 | vip->format = formats_60[0]; | 458 | vip->format = formats_60[0]; |
459 | else | 459 | else |
460 | vip->format = formats_50[0]; | 460 | vip->format = formats_50[0]; |
@@ -462,14 +462,14 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *std) | |||
462 | return 0; | 462 | return 0; |
463 | } | 463 | } |
464 | 464 | ||
465 | if (oldstd != *std) { | 465 | if (oldstd != std) { |
466 | if (V4L2_STD_525_60 & (*std)) | 466 | if (V4L2_STD_525_60 & std) |
467 | vip->format = formats_60[0]; | 467 | vip->format = formats_60[0]; |
468 | else | 468 | else |
469 | vip->format = formats_50[0]; | 469 | vip->format = formats_50[0]; |
470 | } | 470 | } |
471 | 471 | ||
472 | return v4l2_subdev_call(vip->decoder, core, s_std, *std); | 472 | return v4l2_subdev_call(vip->decoder, core, s_std, std); |
473 | } | 473 | } |
474 | 474 | ||
475 | /** | 475 | /** |
diff --git a/drivers/media/pci/zoran/zoran_driver.c b/drivers/media/pci/zoran/zoran_driver.c index 2e8f518f298f..1168a84a737d 100644 --- a/drivers/media/pci/zoran/zoran_driver.c +++ b/drivers/media/pci/zoran/zoran_driver.c | |||
@@ -2435,14 +2435,14 @@ static int zoran_g_std(struct file *file, void *__fh, v4l2_std_id *std) | |||
2435 | return 0; | 2435 | return 0; |
2436 | } | 2436 | } |
2437 | 2437 | ||
2438 | static int zoran_s_std(struct file *file, void *__fh, v4l2_std_id *std) | 2438 | static int zoran_s_std(struct file *file, void *__fh, v4l2_std_id std) |
2439 | { | 2439 | { |
2440 | struct zoran_fh *fh = __fh; | 2440 | struct zoran_fh *fh = __fh; |
2441 | struct zoran *zr = fh->zr; | 2441 | struct zoran *zr = fh->zr; |
2442 | int res = 0; | 2442 | int res = 0; |
2443 | 2443 | ||
2444 | mutex_lock(&zr->resource_lock); | 2444 | mutex_lock(&zr->resource_lock); |
2445 | res = zoran_set_norm(zr, *std); | 2445 | res = zoran_set_norm(zr, std); |
2446 | if (res) | 2446 | if (res) |
2447 | goto sstd_unlock_and_return; | 2447 | goto sstd_unlock_and_return; |
2448 | 2448 | ||
diff --git a/drivers/media/platform/blackfin/bfin_capture.c b/drivers/media/platform/blackfin/bfin_capture.c index 476cfc88d144..96f6a4922d0c 100644 --- a/drivers/media/platform/blackfin/bfin_capture.c +++ b/drivers/media/platform/blackfin/bfin_capture.c | |||
@@ -633,7 +633,7 @@ static int bcap_g_std(struct file *file, void *priv, v4l2_std_id *std) | |||
633 | return 0; | 633 | return 0; |
634 | } | 634 | } |
635 | 635 | ||
636 | static int bcap_s_std(struct file *file, void *priv, v4l2_std_id *std) | 636 | static int bcap_s_std(struct file *file, void *priv, v4l2_std_id std) |
637 | { | 637 | { |
638 | struct bcap_device *bcap_dev = video_drvdata(file); | 638 | struct bcap_device *bcap_dev = video_drvdata(file); |
639 | int ret; | 639 | int ret; |
@@ -641,11 +641,11 @@ static int bcap_s_std(struct file *file, void *priv, v4l2_std_id *std) | |||
641 | if (vb2_is_busy(&bcap_dev->buffer_queue)) | 641 | if (vb2_is_busy(&bcap_dev->buffer_queue)) |
642 | return -EBUSY; | 642 | return -EBUSY; |
643 | 643 | ||
644 | ret = v4l2_subdev_call(bcap_dev->sd, core, s_std, *std); | 644 | ret = v4l2_subdev_call(bcap_dev->sd, core, s_std, std); |
645 | if (ret < 0) | 645 | if (ret < 0) |
646 | return ret; | 646 | return ret; |
647 | 647 | ||
648 | bcap_dev->std = *std; | 648 | bcap_dev->std = std; |
649 | return 0; | 649 | return 0; |
650 | } | 650 | } |
651 | 651 | ||
diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c index 2a49f00c4543..33b9660b7f77 100644 --- a/drivers/media/platform/davinci/vpbe.c +++ b/drivers/media/platform/davinci/vpbe.c | |||
@@ -431,7 +431,7 @@ static int vpbe_enum_dv_timings(struct vpbe_device *vpbe_dev, | |||
431 | * Sets the standard if supported by the current encoder. Return the status. | 431 | * Sets the standard if supported by the current encoder. Return the status. |
432 | * 0 - success & -EINVAL on error | 432 | * 0 - success & -EINVAL on error |
433 | */ | 433 | */ |
434 | static int vpbe_s_std(struct vpbe_device *vpbe_dev, v4l2_std_id *std_id) | 434 | static int vpbe_s_std(struct vpbe_device *vpbe_dev, v4l2_std_id std_id) |
435 | { | 435 | { |
436 | struct vpbe_config *cfg = vpbe_dev->cfg; | 436 | struct vpbe_config *cfg = vpbe_dev->cfg; |
437 | int out_index = vpbe_dev->current_out_index; | 437 | int out_index = vpbe_dev->current_out_index; |
@@ -442,14 +442,14 @@ static int vpbe_s_std(struct vpbe_device *vpbe_dev, v4l2_std_id *std_id) | |||
442 | V4L2_OUT_CAP_STD)) | 442 | V4L2_OUT_CAP_STD)) |
443 | return -EINVAL; | 443 | return -EINVAL; |
444 | 444 | ||
445 | ret = vpbe_get_std_info(vpbe_dev, *std_id); | 445 | ret = vpbe_get_std_info(vpbe_dev, std_id); |
446 | if (ret) | 446 | if (ret) |
447 | return ret; | 447 | return ret; |
448 | 448 | ||
449 | mutex_lock(&vpbe_dev->lock); | 449 | mutex_lock(&vpbe_dev->lock); |
450 | 450 | ||
451 | ret = v4l2_subdev_call(vpbe_dev->encoders[sd_index], video, | 451 | ret = v4l2_subdev_call(vpbe_dev->encoders[sd_index], video, |
452 | s_std_output, *std_id); | 452 | s_std_output, std_id); |
453 | /* set the lcd controller output for the given mode */ | 453 | /* set the lcd controller output for the given mode */ |
454 | if (!ret) { | 454 | if (!ret) { |
455 | struct osd_state *osd_device = vpbe_dev->osd_device; | 455 | struct osd_state *osd_device = vpbe_dev->osd_device; |
@@ -513,7 +513,7 @@ static int vpbe_set_mode(struct vpbe_device *vpbe_dev, | |||
513 | */ | 513 | */ |
514 | if (preset_mode->timings_type & VPBE_ENC_STD) | 514 | if (preset_mode->timings_type & VPBE_ENC_STD) |
515 | return vpbe_s_std(vpbe_dev, | 515 | return vpbe_s_std(vpbe_dev, |
516 | &preset_mode->std_id); | 516 | preset_mode->std_id); |
517 | if (preset_mode->timings_type & | 517 | if (preset_mode->timings_type & |
518 | VPBE_ENC_DV_TIMINGS) { | 518 | VPBE_ENC_DV_TIMINGS) { |
519 | dv_timings = | 519 | dv_timings = |
diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c index 30976dc9f346..bcf0ada3481d 100644 --- a/drivers/media/platform/davinci/vpbe_display.c +++ b/drivers/media/platform/davinci/vpbe_display.c | |||
@@ -983,7 +983,7 @@ static int vpbe_display_try_fmt(struct file *file, void *priv, | |||
983 | * 0 - success & -EINVAL on error | 983 | * 0 - success & -EINVAL on error |
984 | */ | 984 | */ |
985 | static int vpbe_display_s_std(struct file *file, void *priv, | 985 | static int vpbe_display_s_std(struct file *file, void *priv, |
986 | v4l2_std_id *std_id) | 986 | v4l2_std_id std_id) |
987 | { | 987 | { |
988 | struct vpbe_fh *fh = priv; | 988 | struct vpbe_fh *fh = priv; |
989 | struct vpbe_layer *layer = fh->layer; | 989 | struct vpbe_layer *layer = fh->layer; |
diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c index 3d1af6704822..20db8a077990 100644 --- a/drivers/media/platform/davinci/vpfe_capture.c +++ b/drivers/media/platform/davinci/vpfe_capture.c | |||
@@ -376,7 +376,7 @@ static int vpfe_config_ccdc_image_format(struct vpfe_device *vpfe_dev) | |||
376 | * values in ccdc | 376 | * values in ccdc |
377 | */ | 377 | */ |
378 | static int vpfe_config_image_format(struct vpfe_device *vpfe_dev, | 378 | static int vpfe_config_image_format(struct vpfe_device *vpfe_dev, |
379 | const v4l2_std_id *std_id) | 379 | v4l2_std_id std_id) |
380 | { | 380 | { |
381 | struct vpfe_subdev_info *sdinfo = vpfe_dev->current_subdev; | 381 | struct vpfe_subdev_info *sdinfo = vpfe_dev->current_subdev; |
382 | struct v4l2_mbus_framefmt mbus_fmt; | 382 | struct v4l2_mbus_framefmt mbus_fmt; |
@@ -384,7 +384,7 @@ static int vpfe_config_image_format(struct vpfe_device *vpfe_dev, | |||
384 | int i, ret = 0; | 384 | int i, ret = 0; |
385 | 385 | ||
386 | for (i = 0; i < ARRAY_SIZE(vpfe_standards); i++) { | 386 | for (i = 0; i < ARRAY_SIZE(vpfe_standards); i++) { |
387 | if (vpfe_standards[i].std_id & *std_id) { | 387 | if (vpfe_standards[i].std_id & std_id) { |
388 | vpfe_dev->std_info.active_pixels = | 388 | vpfe_dev->std_info.active_pixels = |
389 | vpfe_standards[i].width; | 389 | vpfe_standards[i].width; |
390 | vpfe_dev->std_info.active_lines = | 390 | vpfe_dev->std_info.active_lines = |
@@ -461,7 +461,7 @@ static int vpfe_initialize_device(struct vpfe_device *vpfe_dev) | |||
461 | 461 | ||
462 | /* Configure the default format information */ | 462 | /* Configure the default format information */ |
463 | ret = vpfe_config_image_format(vpfe_dev, | 463 | ret = vpfe_config_image_format(vpfe_dev, |
464 | &vpfe_standards[vpfe_dev->std_index].std_id); | 464 | vpfe_standards[vpfe_dev->std_index].std_id); |
465 | if (ret) | 465 | if (ret) |
466 | return ret; | 466 | return ret; |
467 | 467 | ||
@@ -1168,7 +1168,7 @@ static int vpfe_s_input(struct file *file, void *priv, unsigned int index) | |||
1168 | 1168 | ||
1169 | /* set the default image parameters in the device */ | 1169 | /* set the default image parameters in the device */ |
1170 | ret = vpfe_config_image_format(vpfe_dev, | 1170 | ret = vpfe_config_image_format(vpfe_dev, |
1171 | &vpfe_standards[vpfe_dev->std_index].std_id); | 1171 | vpfe_standards[vpfe_dev->std_index].std_id); |
1172 | unlock_out: | 1172 | unlock_out: |
1173 | mutex_unlock(&vpfe_dev->lock); | 1173 | mutex_unlock(&vpfe_dev->lock); |
1174 | return ret; | 1174 | return ret; |
@@ -1193,7 +1193,7 @@ static int vpfe_querystd(struct file *file, void *priv, v4l2_std_id *std_id) | |||
1193 | return ret; | 1193 | return ret; |
1194 | } | 1194 | } |
1195 | 1195 | ||
1196 | static int vpfe_s_std(struct file *file, void *priv, v4l2_std_id *std_id) | 1196 | static int vpfe_s_std(struct file *file, void *priv, v4l2_std_id std_id) |
1197 | { | 1197 | { |
1198 | struct vpfe_device *vpfe_dev = video_drvdata(file); | 1198 | struct vpfe_device *vpfe_dev = video_drvdata(file); |
1199 | struct vpfe_subdev_info *sdinfo; | 1199 | struct vpfe_subdev_info *sdinfo; |
@@ -1215,7 +1215,7 @@ static int vpfe_s_std(struct file *file, void *priv, v4l2_std_id *std_id) | |||
1215 | } | 1215 | } |
1216 | 1216 | ||
1217 | ret = v4l2_device_call_until_err(&vpfe_dev->v4l2_dev, sdinfo->grp_id, | 1217 | ret = v4l2_device_call_until_err(&vpfe_dev->v4l2_dev, sdinfo->grp_id, |
1218 | core, s_std, *std_id); | 1218 | core, s_std, std_id); |
1219 | if (ret < 0) { | 1219 | if (ret < 0) { |
1220 | v4l2_err(&vpfe_dev->v4l2_dev, "Failed to set standard\n"); | 1220 | v4l2_err(&vpfe_dev->v4l2_dev, "Failed to set standard\n"); |
1221 | goto unlock_out; | 1221 | goto unlock_out; |
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c index d869c8e868ee..00b7f9c5ac04 100644 --- a/drivers/media/platform/davinci/vpif_capture.c +++ b/drivers/media/platform/davinci/vpif_capture.c | |||
@@ -1395,7 +1395,7 @@ static int vpif_g_std(struct file *file, void *priv, v4l2_std_id *std) | |||
1395 | * @priv: file handle | 1395 | * @priv: file handle |
1396 | * @std_id: ptr to std id | 1396 | * @std_id: ptr to std id |
1397 | */ | 1397 | */ |
1398 | static int vpif_s_std(struct file *file, void *priv, v4l2_std_id *std_id) | 1398 | static int vpif_s_std(struct file *file, void *priv, v4l2_std_id std_id) |
1399 | { | 1399 | { |
1400 | struct vpif_fh *fh = priv; | 1400 | struct vpif_fh *fh = priv; |
1401 | struct channel_obj *ch = fh->channel; | 1401 | struct channel_obj *ch = fh->channel; |
@@ -1424,7 +1424,7 @@ static int vpif_s_std(struct file *file, void *priv, v4l2_std_id *std_id) | |||
1424 | fh->initialized = 1; | 1424 | fh->initialized = 1; |
1425 | 1425 | ||
1426 | /* Call encoder subdevice function to set the standard */ | 1426 | /* Call encoder subdevice function to set the standard */ |
1427 | ch->video.stdid = *std_id; | 1427 | ch->video.stdid = std_id; |
1428 | memset(&ch->video.dv_timings, 0, sizeof(ch->video.dv_timings)); | 1428 | memset(&ch->video.dv_timings, 0, sizeof(ch->video.dv_timings)); |
1429 | 1429 | ||
1430 | /* Get the information about the standard */ | 1430 | /* Get the information about the standard */ |
@@ -1437,7 +1437,7 @@ static int vpif_s_std(struct file *file, void *priv, v4l2_std_id *std_id) | |||
1437 | vpif_config_format(ch); | 1437 | vpif_config_format(ch); |
1438 | 1438 | ||
1439 | /* set standard in the sub device */ | 1439 | /* set standard in the sub device */ |
1440 | ret = v4l2_subdev_call(ch->sd, core, s_std, *std_id); | 1440 | ret = v4l2_subdev_call(ch->sd, core, s_std, std_id); |
1441 | if (ret && ret != -ENOIOCTLCMD && ret != -ENODEV) { | 1441 | if (ret && ret != -ENOIOCTLCMD && ret != -ENODEV) { |
1442 | vpif_dbg(1, debug, "Failed to set standard for sub devices\n"); | 1442 | vpif_dbg(1, debug, "Failed to set standard for sub devices\n"); |
1443 | return ret; | 1443 | return ret; |
diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c index 3bb187c9402b..f1dff9ec1ea2 100644 --- a/drivers/media/platform/davinci/vpif_display.c +++ b/drivers/media/platform/davinci/vpif_display.c | |||
@@ -1059,14 +1059,14 @@ static int vpif_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf) | |||
1059 | return vb2_qbuf(&common->buffer_queue, buf); | 1059 | return vb2_qbuf(&common->buffer_queue, buf); |
1060 | } | 1060 | } |
1061 | 1061 | ||
1062 | static int vpif_s_std(struct file *file, void *priv, v4l2_std_id *std_id) | 1062 | static int vpif_s_std(struct file *file, void *priv, v4l2_std_id std_id) |
1063 | { | 1063 | { |
1064 | struct vpif_fh *fh = priv; | 1064 | struct vpif_fh *fh = priv; |
1065 | struct channel_obj *ch = fh->channel; | 1065 | struct channel_obj *ch = fh->channel; |
1066 | struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX]; | 1066 | struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX]; |
1067 | int ret = 0; | 1067 | int ret = 0; |
1068 | 1068 | ||
1069 | if (!(*std_id & VPIF_V4L2_STD)) | 1069 | if (!(std_id & VPIF_V4L2_STD)) |
1070 | return -EINVAL; | 1070 | return -EINVAL; |
1071 | 1071 | ||
1072 | if (common->started) { | 1072 | if (common->started) { |
@@ -1075,7 +1075,7 @@ static int vpif_s_std(struct file *file, void *priv, v4l2_std_id *std_id) | |||
1075 | } | 1075 | } |
1076 | 1076 | ||
1077 | /* Call encoder subdevice function to set the standard */ | 1077 | /* Call encoder subdevice function to set the standard */ |
1078 | ch->video.stdid = *std_id; | 1078 | ch->video.stdid = std_id; |
1079 | memset(&ch->video.dv_timings, 0, sizeof(ch->video.dv_timings)); | 1079 | memset(&ch->video.dv_timings, 0, sizeof(ch->video.dv_timings)); |
1080 | /* Get the information about the standard */ | 1080 | /* Get the information about the standard */ |
1081 | if (vpif_update_resolution(ch)) | 1081 | if (vpif_update_resolution(ch)) |
@@ -1093,14 +1093,14 @@ static int vpif_s_std(struct file *file, void *priv, v4l2_std_id *std_id) | |||
1093 | vpif_config_format(ch); | 1093 | vpif_config_format(ch); |
1094 | 1094 | ||
1095 | ret = v4l2_device_call_until_err(&vpif_obj.v4l2_dev, 1, video, | 1095 | ret = v4l2_device_call_until_err(&vpif_obj.v4l2_dev, 1, video, |
1096 | s_std_output, *std_id); | 1096 | s_std_output, std_id); |
1097 | if (ret < 0) { | 1097 | if (ret < 0) { |
1098 | vpif_err("Failed to set output standard\n"); | 1098 | vpif_err("Failed to set output standard\n"); |
1099 | return ret; | 1099 | return ret; |
1100 | } | 1100 | } |
1101 | 1101 | ||
1102 | ret = v4l2_device_call_until_err(&vpif_obj.v4l2_dev, 1, core, | 1102 | ret = v4l2_device_call_until_err(&vpif_obj.v4l2_dev, 1, core, |
1103 | s_std, *std_id); | 1103 | s_std, std_id); |
1104 | if (ret < 0) | 1104 | if (ret < 0) |
1105 | vpif_err("Failed to set standard for sub devices\n"); | 1105 | vpif_err("Failed to set standard for sub devices\n"); |
1106 | return ret; | 1106 | return ret; |
diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c index 5f7db3f1f6f5..3a6a0dcdc3e4 100644 --- a/drivers/media/platform/fsl-viu.c +++ b/drivers/media/platform/fsl-viu.c | |||
@@ -957,12 +957,12 @@ static int vidioc_querystd(struct file *file, void *priv, v4l2_std_id *std_id) | |||
957 | return 0; | 957 | return 0; |
958 | } | 958 | } |
959 | 959 | ||
960 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *id) | 960 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id id) |
961 | { | 961 | { |
962 | struct viu_fh *fh = priv; | 962 | struct viu_fh *fh = priv; |
963 | 963 | ||
964 | fh->dev->std = *id; | 964 | fh->dev->std = id; |
965 | decoder_call(fh->dev, core, s_std, *id); | 965 | decoder_call(fh->dev, core, s_std, id); |
966 | return 0; | 966 | return 0; |
967 | } | 967 | } |
968 | 968 | ||
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c index 92a33f081852..76a862318a7e 100644 --- a/drivers/media/platform/marvell-ccic/mcam-core.c +++ b/drivers/media/platform/marvell-ccic/mcam-core.c | |||
@@ -1357,7 +1357,7 @@ static int mcam_vidioc_s_input(struct file *filp, void *priv, unsigned int i) | |||
1357 | } | 1357 | } |
1358 | 1358 | ||
1359 | /* from vivi.c */ | 1359 | /* from vivi.c */ |
1360 | static int mcam_vidioc_s_std(struct file *filp, void *priv, v4l2_std_id *a) | 1360 | static int mcam_vidioc_s_std(struct file *filp, void *priv, v4l2_std_id a) |
1361 | { | 1361 | { |
1362 | return 0; | 1362 | return 0; |
1363 | } | 1363 | } |
diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c index 9961e13f683d..ef0efdf422fe 100644 --- a/drivers/media/platform/s5p-tv/mixer_video.c +++ b/drivers/media/platform/s5p-tv/mixer_video.c | |||
@@ -574,7 +574,7 @@ static int mxr_dv_timings_cap(struct file *file, void *fh, | |||
574 | return ret ? -EINVAL : 0; | 574 | return ret ? -EINVAL : 0; |
575 | } | 575 | } |
576 | 576 | ||
577 | static int mxr_s_std(struct file *file, void *fh, v4l2_std_id *norm) | 577 | static int mxr_s_std(struct file *file, void *fh, v4l2_std_id norm) |
578 | { | 578 | { |
579 | struct mxr_layer *layer = video_drvdata(file); | 579 | struct mxr_layer *layer = video_drvdata(file); |
580 | struct mxr_device *mdev = layer->mdev; | 580 | struct mxr_device *mdev = layer->mdev; |
@@ -591,7 +591,7 @@ static int mxr_s_std(struct file *file, void *fh, v4l2_std_id *norm) | |||
591 | return -EBUSY; | 591 | return -EBUSY; |
592 | } | 592 | } |
593 | 593 | ||
594 | ret = v4l2_subdev_call(to_outsd(mdev), video, s_std_output, *norm); | 594 | ret = v4l2_subdev_call(to_outsd(mdev), video, s_std_output, norm); |
595 | 595 | ||
596 | mutex_unlock(&mdev->mutex); | 596 | mutex_unlock(&mdev->mutex); |
597 | 597 | ||
diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c index d853162586fa..8e3b95a6c29e 100644 --- a/drivers/media/platform/sh_vou.c +++ b/drivers/media/platform/sh_vou.c | |||
@@ -881,29 +881,29 @@ static u32 sh_vou_ntsc_mode(enum sh_vou_bus_fmt bus_fmt) | |||
881 | } | 881 | } |
882 | } | 882 | } |
883 | 883 | ||
884 | static int sh_vou_s_std(struct file *file, void *priv, v4l2_std_id *std_id) | 884 | static int sh_vou_s_std(struct file *file, void *priv, v4l2_std_id std_id) |
885 | { | 885 | { |
886 | struct sh_vou_device *vou_dev = video_drvdata(file); | 886 | struct sh_vou_device *vou_dev = video_drvdata(file); |
887 | int ret; | 887 | int ret; |
888 | 888 | ||
889 | dev_dbg(vou_dev->v4l2_dev.dev, "%s(): 0x%llx\n", __func__, *std_id); | 889 | dev_dbg(vou_dev->v4l2_dev.dev, "%s(): 0x%llx\n", __func__, std_id); |
890 | 890 | ||
891 | if (*std_id & ~vou_dev->vdev->tvnorms) | 891 | if (std_id & ~vou_dev->vdev->tvnorms) |
892 | return -EINVAL; | 892 | return -EINVAL; |
893 | 893 | ||
894 | ret = v4l2_device_call_until_err(&vou_dev->v4l2_dev, 0, video, | 894 | ret = v4l2_device_call_until_err(&vou_dev->v4l2_dev, 0, video, |
895 | s_std_output, *std_id); | 895 | s_std_output, std_id); |
896 | /* Shall we continue, if the subdev doesn't support .s_std_output()? */ | 896 | /* Shall we continue, if the subdev doesn't support .s_std_output()? */ |
897 | if (ret < 0 && ret != -ENOIOCTLCMD) | 897 | if (ret < 0 && ret != -ENOIOCTLCMD) |
898 | return ret; | 898 | return ret; |
899 | 899 | ||
900 | if (*std_id & V4L2_STD_525_60) | 900 | if (std_id & V4L2_STD_525_60) |
901 | sh_vou_reg_ab_set(vou_dev, VOUCR, | 901 | sh_vou_reg_ab_set(vou_dev, VOUCR, |
902 | sh_vou_ntsc_mode(vou_dev->pdata->bus_fmt) << 29, 7 << 29); | 902 | sh_vou_ntsc_mode(vou_dev->pdata->bus_fmt) << 29, 7 << 29); |
903 | else | 903 | else |
904 | sh_vou_reg_ab_set(vou_dev, VOUCR, 5 << 29, 7 << 29); | 904 | sh_vou_reg_ab_set(vou_dev, VOUCR, 5 << 29, 7 << 29); |
905 | 905 | ||
906 | vou_dev->std = *std_id; | 906 | vou_dev->std = std_id; |
907 | 907 | ||
908 | return 0; | 908 | return 0; |
909 | } | 909 | } |
diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c index 8ec98051ea73..3592968026cd 100644 --- a/drivers/media/platform/soc_camera/soc_camera.c +++ b/drivers/media/platform/soc_camera/soc_camera.c | |||
@@ -256,12 +256,12 @@ static int soc_camera_s_input(struct file *file, void *priv, unsigned int i) | |||
256 | return 0; | 256 | return 0; |
257 | } | 257 | } |
258 | 258 | ||
259 | static int soc_camera_s_std(struct file *file, void *priv, v4l2_std_id *a) | 259 | static int soc_camera_s_std(struct file *file, void *priv, v4l2_std_id a) |
260 | { | 260 | { |
261 | struct soc_camera_device *icd = file->private_data; | 261 | struct soc_camera_device *icd = file->private_data; |
262 | struct v4l2_subdev *sd = soc_camera_to_subdev(icd); | 262 | struct v4l2_subdev *sd = soc_camera_to_subdev(icd); |
263 | 263 | ||
264 | return v4l2_subdev_call(sd, core, s_std, *a); | 264 | return v4l2_subdev_call(sd, core, s_std, a); |
265 | } | 265 | } |
266 | 266 | ||
267 | static int soc_camera_g_std(struct file *file, void *priv, v4l2_std_id *a) | 267 | static int soc_camera_g_std(struct file *file, void *priv, v4l2_std_id *a) |
diff --git a/drivers/media/platform/timblogiw.c b/drivers/media/platform/timblogiw.c index 2d91eeb1d2ae..a2f7bdd5104f 100644 --- a/drivers/media/platform/timblogiw.c +++ b/drivers/media/platform/timblogiw.c | |||
@@ -336,7 +336,7 @@ static int timblogiw_g_std(struct file *file, void *priv, v4l2_std_id *std) | |||
336 | return 0; | 336 | return 0; |
337 | } | 337 | } |
338 | 338 | ||
339 | static int timblogiw_s_std(struct file *file, void *priv, v4l2_std_id *std) | 339 | static int timblogiw_s_std(struct file *file, void *priv, v4l2_std_id std) |
340 | { | 340 | { |
341 | struct video_device *vdev = video_devdata(file); | 341 | struct video_device *vdev = video_devdata(file); |
342 | struct timblogiw *lw = video_get_drvdata(vdev); | 342 | struct timblogiw *lw = video_get_drvdata(vdev); |
@@ -348,10 +348,10 @@ static int timblogiw_s_std(struct file *file, void *priv, v4l2_std_id *std) | |||
348 | mutex_lock(&lw->lock); | 348 | mutex_lock(&lw->lock); |
349 | 349 | ||
350 | if (TIMBLOGIW_HAS_DECODER(lw)) | 350 | if (TIMBLOGIW_HAS_DECODER(lw)) |
351 | err = v4l2_subdev_call(lw->sd_enc, core, s_std, *std); | 351 | err = v4l2_subdev_call(lw->sd_enc, core, s_std, std); |
352 | 352 | ||
353 | if (!err) | 353 | if (!err) |
354 | fh->cur_norm = timblogiw_get_norm(*std); | 354 | fh->cur_norm = timblogiw_get_norm(std); |
355 | 355 | ||
356 | mutex_unlock(&lw->lock); | 356 | mutex_unlock(&lw->lock); |
357 | 357 | ||
diff --git a/drivers/media/platform/via-camera.c b/drivers/media/platform/via-camera.c index b051c4a28554..a794cd6c4441 100644 --- a/drivers/media/platform/via-camera.c +++ b/drivers/media/platform/via-camera.c | |||
@@ -847,7 +847,7 @@ static int viacam_s_input(struct file *filp, void *priv, unsigned int i) | |||
847 | return 0; | 847 | return 0; |
848 | } | 848 | } |
849 | 849 | ||
850 | static int viacam_s_std(struct file *filp, void *priv, v4l2_std_id *std) | 850 | static int viacam_s_std(struct file *filp, void *priv, v4l2_std_id std) |
851 | { | 851 | { |
852 | return 0; | 852 | return 0; |
853 | } | 853 | } |
diff --git a/drivers/media/platform/vino.c b/drivers/media/platform/vino.c index eb5d6f955709..c6af974c5b45 100644 --- a/drivers/media/platform/vino.c +++ b/drivers/media/platform/vino.c | |||
@@ -3042,7 +3042,7 @@ static int vino_g_std(struct file *file, void *__fh, | |||
3042 | } | 3042 | } |
3043 | 3043 | ||
3044 | static int vino_s_std(struct file *file, void *__fh, | 3044 | static int vino_s_std(struct file *file, void *__fh, |
3045 | v4l2_std_id *std) | 3045 | v4l2_std_id std) |
3046 | { | 3046 | { |
3047 | struct vino_channel_settings *vcs = video_drvdata(file); | 3047 | struct vino_channel_settings *vcs = video_drvdata(file); |
3048 | unsigned long flags; | 3048 | unsigned long flags; |
@@ -3056,7 +3056,7 @@ static int vino_s_std(struct file *file, void *__fh, | |||
3056 | } | 3056 | } |
3057 | 3057 | ||
3058 | /* check if the standard is valid for the current input */ | 3058 | /* check if the standard is valid for the current input */ |
3059 | if ((*std) & vino_inputs[vcs->input].std) { | 3059 | if (std & vino_inputs[vcs->input].std) { |
3060 | dprintk("standard accepted\n"); | 3060 | dprintk("standard accepted\n"); |
3061 | 3061 | ||
3062 | /* change the video norm for SAA7191 | 3062 | /* change the video norm for SAA7191 |
@@ -3065,13 +3065,13 @@ static int vino_s_std(struct file *file, void *__fh, | |||
3065 | if (vcs->input == VINO_INPUT_D1) | 3065 | if (vcs->input == VINO_INPUT_D1) |
3066 | goto out; | 3066 | goto out; |
3067 | 3067 | ||
3068 | if ((*std) & V4L2_STD_PAL) { | 3068 | if (std & V4L2_STD_PAL) { |
3069 | ret = vino_set_data_norm(vcs, VINO_DATA_NORM_PAL, | 3069 | ret = vino_set_data_norm(vcs, VINO_DATA_NORM_PAL, |
3070 | &flags); | 3070 | &flags); |
3071 | } else if ((*std) & V4L2_STD_NTSC) { | 3071 | } else if (std & V4L2_STD_NTSC) { |
3072 | ret = vino_set_data_norm(vcs, VINO_DATA_NORM_NTSC, | 3072 | ret = vino_set_data_norm(vcs, VINO_DATA_NORM_NTSC, |
3073 | &flags); | 3073 | &flags); |
3074 | } else if ((*std) & V4L2_STD_SECAM) { | 3074 | } else if (std & V4L2_STD_SECAM) { |
3075 | ret = vino_set_data_norm(vcs, VINO_DATA_NORM_SECAM, | 3075 | ret = vino_set_data_norm(vcs, VINO_DATA_NORM_SECAM, |
3076 | &flags); | 3076 | &flags); |
3077 | } else { | 3077 | } else { |
diff --git a/drivers/media/usb/au0828/au0828-video.c b/drivers/media/usb/au0828/au0828-video.c index 11316f2f2e42..e9dd01c4b6ed 100644 --- a/drivers/media/usb/au0828/au0828-video.c +++ b/drivers/media/usb/au0828/au0828-video.c | |||
@@ -1320,7 +1320,7 @@ out: | |||
1320 | return rc; | 1320 | return rc; |
1321 | } | 1321 | } |
1322 | 1322 | ||
1323 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id * norm) | 1323 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id norm) |
1324 | { | 1324 | { |
1325 | struct au0828_fh *fh = priv; | 1325 | struct au0828_fh *fh = priv; |
1326 | struct au0828_dev *dev = fh->dev; | 1326 | struct au0828_dev *dev = fh->dev; |
@@ -1332,7 +1332,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id * norm) | |||
1332 | have to make the au0828 bridge adjust the size of its capture | 1332 | have to make the au0828 bridge adjust the size of its capture |
1333 | buffer, which is currently hardcoded at 720x480 */ | 1333 | buffer, which is currently hardcoded at 720x480 */ |
1334 | 1334 | ||
1335 | v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_std, *norm); | 1335 | v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_std, norm); |
1336 | dev->std_set_in_tuner_core = 1; | 1336 | dev->std_set_in_tuner_core = 1; |
1337 | 1337 | ||
1338 | if (dev->dvb.frontend && dev->dvb.frontend->ops.analog_ops.i2c_gate_ctrl) | 1338 | if (dev->dvb.frontend && dev->dvb.frontend->ops.analog_ops.i2c_gate_ctrl) |
diff --git a/drivers/media/usb/cx231xx/cx231xx-417.c b/drivers/media/usb/cx231xx/cx231xx-417.c index 49c842aa1f70..f548db8043d4 100644 --- a/drivers/media/usb/cx231xx/cx231xx-417.c +++ b/drivers/media/usb/cx231xx/cx231xx-417.c | |||
@@ -1492,14 +1492,14 @@ static int vidioc_g_std(struct file *file, void *fh0, v4l2_std_id *norm) | |||
1492 | return 0; | 1492 | return 0; |
1493 | } | 1493 | } |
1494 | 1494 | ||
1495 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *id) | 1495 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id id) |
1496 | { | 1496 | { |
1497 | struct cx231xx_fh *fh = file->private_data; | 1497 | struct cx231xx_fh *fh = file->private_data; |
1498 | struct cx231xx *dev = fh->dev; | 1498 | struct cx231xx *dev = fh->dev; |
1499 | unsigned int i; | 1499 | unsigned int i; |
1500 | 1500 | ||
1501 | for (i = 0; i < ARRAY_SIZE(cx231xx_tvnorms); i++) | 1501 | for (i = 0; i < ARRAY_SIZE(cx231xx_tvnorms); i++) |
1502 | if (*id & cx231xx_tvnorms[i].id) | 1502 | if (id & cx231xx_tvnorms[i].id) |
1503 | break; | 1503 | break; |
1504 | if (i == ARRAY_SIZE(cx231xx_tvnorms)) | 1504 | if (i == ARRAY_SIZE(cx231xx_tvnorms)) |
1505 | return -EINVAL; | 1505 | return -EINVAL; |
diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c index 53020a7e01fe..4cff2f4075e1 100644 --- a/drivers/media/usb/cx231xx/cx231xx-video.c +++ b/drivers/media/usb/cx231xx/cx231xx-video.c | |||
@@ -987,7 +987,7 @@ static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *id) | |||
987 | return 0; | 987 | return 0; |
988 | } | 988 | } |
989 | 989 | ||
990 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *norm) | 990 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id norm) |
991 | { | 991 | { |
992 | struct cx231xx_fh *fh = priv; | 992 | struct cx231xx_fh *fh = priv; |
993 | struct cx231xx *dev = fh->dev; | 993 | struct cx231xx *dev = fh->dev; |
@@ -998,13 +998,13 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *norm) | |||
998 | if (rc < 0) | 998 | if (rc < 0) |
999 | return rc; | 999 | return rc; |
1000 | 1000 | ||
1001 | if (dev->norm == *norm) | 1001 | if (dev->norm == norm) |
1002 | return 0; | 1002 | return 0; |
1003 | 1003 | ||
1004 | if (videobuf_queue_is_busy(&fh->vb_vidq)) | 1004 | if (videobuf_queue_is_busy(&fh->vb_vidq)) |
1005 | return -EBUSY; | 1005 | return -EBUSY; |
1006 | 1006 | ||
1007 | dev->norm = *norm; | 1007 | dev->norm = norm; |
1008 | 1008 | ||
1009 | /* Adjusts width/height, if needed */ | 1009 | /* Adjusts width/height, if needed */ |
1010 | dev->width = 720; | 1010 | dev->width = 720; |
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c index 3ef696d36c7e..96d84c22ef00 100644 --- a/drivers/media/usb/em28xx/em28xx-video.c +++ b/drivers/media/usb/em28xx/em28xx-video.c | |||
@@ -996,23 +996,23 @@ static int vidioc_querystd(struct file *file, void *priv, v4l2_std_id *norm) | |||
996 | return 0; | 996 | return 0; |
997 | } | 997 | } |
998 | 998 | ||
999 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *norm) | 999 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id norm) |
1000 | { | 1000 | { |
1001 | struct em28xx_fh *fh = priv; | 1001 | struct em28xx_fh *fh = priv; |
1002 | struct em28xx *dev = fh->dev; | 1002 | struct em28xx *dev = fh->dev; |
1003 | struct v4l2_format f; | 1003 | struct v4l2_format f; |
1004 | 1004 | ||
1005 | if (*norm == dev->norm) | 1005 | if (norm == dev->norm) |
1006 | return 0; | 1006 | return 0; |
1007 | 1007 | ||
1008 | if (dev->streaming_users > 0) | 1008 | if (dev->streaming_users > 0) |
1009 | return -EBUSY; | 1009 | return -EBUSY; |
1010 | 1010 | ||
1011 | dev->norm = *norm; | 1011 | dev->norm = norm; |
1012 | 1012 | ||
1013 | /* Adjusts width/height, if needed */ | 1013 | /* Adjusts width/height, if needed */ |
1014 | f.fmt.pix.width = 720; | 1014 | f.fmt.pix.width = 720; |
1015 | f.fmt.pix.height = (*norm & V4L2_STD_525_60) ? 480 : 576; | 1015 | f.fmt.pix.height = (norm & V4L2_STD_525_60) ? 480 : 576; |
1016 | vidioc_try_fmt_vid_cap(file, priv, &f); | 1016 | vidioc_try_fmt_vid_cap(file, priv, &f); |
1017 | 1017 | ||
1018 | /* set new image size */ | 1018 | /* set new image size */ |
diff --git a/drivers/media/usb/hdpvr/hdpvr-video.c b/drivers/media/usb/hdpvr/hdpvr-video.c index 6a15405360dc..2983bf0d5f0f 100644 --- a/drivers/media/usb/hdpvr/hdpvr-video.c +++ b/drivers/media/usb/hdpvr/hdpvr-video.c | |||
@@ -582,13 +582,13 @@ static int vidioc_querycap(struct file *file, void *priv, | |||
582 | } | 582 | } |
583 | 583 | ||
584 | static int vidioc_s_std(struct file *file, void *private_data, | 584 | static int vidioc_s_std(struct file *file, void *private_data, |
585 | v4l2_std_id *std) | 585 | v4l2_std_id std) |
586 | { | 586 | { |
587 | struct hdpvr_fh *fh = file->private_data; | 587 | struct hdpvr_fh *fh = file->private_data; |
588 | struct hdpvr_device *dev = fh->dev; | 588 | struct hdpvr_device *dev = fh->dev; |
589 | u8 std_type = 1; | 589 | u8 std_type = 1; |
590 | 590 | ||
591 | if (*std & (V4L2_STD_NTSC | V4L2_STD_PAL_60)) | 591 | if (std & (V4L2_STD_NTSC | V4L2_STD_PAL_60)) |
592 | std_type = 0; | 592 | std_type = 0; |
593 | 593 | ||
594 | return hdpvr_config_call(dev, CTRL_VIDEO_STD_TYPE, std_type); | 594 | return hdpvr_config_call(dev, CTRL_VIDEO_STD_TYPE, std_type); |
diff --git a/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c b/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c index 0f729c92e3cf..a7774e3836d4 100644 --- a/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | |||
@@ -196,13 +196,13 @@ static int pvr2_g_std(struct file *file, void *priv, v4l2_std_id *std) | |||
196 | return ret; | 196 | return ret; |
197 | } | 197 | } |
198 | 198 | ||
199 | static int pvr2_s_std(struct file *file, void *priv, v4l2_std_id *std) | 199 | static int pvr2_s_std(struct file *file, void *priv, v4l2_std_id std) |
200 | { | 200 | { |
201 | struct pvr2_v4l2_fh *fh = file->private_data; | 201 | struct pvr2_v4l2_fh *fh = file->private_data; |
202 | struct pvr2_hdw *hdw = fh->channel.mc_head->hdw; | 202 | struct pvr2_hdw *hdw = fh->channel.mc_head->hdw; |
203 | 203 | ||
204 | return pvr2_ctrl_set_value( | 204 | return pvr2_ctrl_set_value( |
205 | pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_STDCUR), *std); | 205 | pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_STDCUR), std); |
206 | } | 206 | } |
207 | 207 | ||
208 | static int pvr2_querystd(struct file *file, void *priv, v4l2_std_id *std) | 208 | static int pvr2_querystd(struct file *file, void *priv, v4l2_std_id *std) |
diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c index 2bd86132d3e3..ab97e7d0b4f2 100644 --- a/drivers/media/usb/s2255/s2255drv.c +++ b/drivers/media/usb/s2255/s2255drv.c | |||
@@ -1294,7 +1294,7 @@ static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i) | |||
1294 | return 0; | 1294 | return 0; |
1295 | } | 1295 | } |
1296 | 1296 | ||
1297 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *i) | 1297 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id i) |
1298 | { | 1298 | { |
1299 | struct s2255_fh *fh = priv; | 1299 | struct s2255_fh *fh = priv; |
1300 | struct s2255_mode mode; | 1300 | struct s2255_mode mode; |
@@ -1314,7 +1314,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *i) | |||
1314 | goto out_s_std; | 1314 | goto out_s_std; |
1315 | } | 1315 | } |
1316 | mode = fh->channel->mode; | 1316 | mode = fh->channel->mode; |
1317 | if (*i & V4L2_STD_525_60) { | 1317 | if (i & V4L2_STD_525_60) { |
1318 | dprintk(4, "%s 60 Hz\n", __func__); | 1318 | dprintk(4, "%s 60 Hz\n", __func__); |
1319 | /* if changing format, reset frame decimation/intervals */ | 1319 | /* if changing format, reset frame decimation/intervals */ |
1320 | if (mode.format != FORMAT_NTSC) { | 1320 | if (mode.format != FORMAT_NTSC) { |
@@ -1324,7 +1324,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *i) | |||
1324 | channel->width = LINE_SZ_4CIFS_NTSC; | 1324 | channel->width = LINE_SZ_4CIFS_NTSC; |
1325 | channel->height = NUM_LINES_4CIFS_NTSC * 2; | 1325 | channel->height = NUM_LINES_4CIFS_NTSC * 2; |
1326 | } | 1326 | } |
1327 | } else if (*i & V4L2_STD_625_50) { | 1327 | } else if (i & V4L2_STD_625_50) { |
1328 | dprintk(4, "%s 50 Hz\n", __func__); | 1328 | dprintk(4, "%s 50 Hz\n", __func__); |
1329 | if (mode.format != FORMAT_PAL) { | 1329 | if (mode.format != FORMAT_PAL) { |
1330 | mode.restart = 1; | 1330 | mode.restart = 1; |
@@ -1337,7 +1337,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *i) | |||
1337 | ret = -EINVAL; | 1337 | ret = -EINVAL; |
1338 | goto out_s_std; | 1338 | goto out_s_std; |
1339 | } | 1339 | } |
1340 | fh->channel->std = *i; | 1340 | fh->channel->std = i; |
1341 | if (mode.restart) | 1341 | if (mode.restart) |
1342 | s2255_set_mode(fh->channel, &mode); | 1342 | s2255_set_mode(fh->channel, &mode); |
1343 | out_s_std: | 1343 | out_s_std: |
diff --git a/drivers/media/usb/stk1160/stk1160-v4l.c b/drivers/media/usb/stk1160/stk1160-v4l.c index 5307a63e378f..f6a6cdc8b288 100644 --- a/drivers/media/usb/stk1160/stk1160-v4l.c +++ b/drivers/media/usb/stk1160/stk1160-v4l.c | |||
@@ -375,7 +375,7 @@ static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *norm) | |||
375 | return 0; | 375 | return 0; |
376 | } | 376 | } |
377 | 377 | ||
378 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *norm) | 378 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id norm) |
379 | { | 379 | { |
380 | struct stk1160 *dev = video_drvdata(file); | 380 | struct stk1160 *dev = video_drvdata(file); |
381 | struct vb2_queue *q = &dev->vb_vidq; | 381 | struct vb2_queue *q = &dev->vb_vidq; |
@@ -388,7 +388,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *norm) | |||
388 | return -ENODEV; | 388 | return -ENODEV; |
389 | 389 | ||
390 | /* We need to set this now, before we call stk1160_set_std */ | 390 | /* We need to set this now, before we call stk1160_set_std */ |
391 | dev->norm = *norm; | 391 | dev->norm = norm; |
392 | 392 | ||
393 | /* This is taken from saa7115 video decoder */ | 393 | /* This is taken from saa7115 video decoder */ |
394 | if (dev->norm & V4L2_STD_525_60) { | 394 | if (dev->norm & V4L2_STD_525_60) { |
diff --git a/drivers/media/usb/tlg2300/pd-video.c b/drivers/media/usb/tlg2300/pd-video.c index 9595309caed4..8df668d06552 100644 --- a/drivers/media/usb/tlg2300/pd-video.c +++ b/drivers/media/usb/tlg2300/pd-video.c | |||
@@ -801,7 +801,7 @@ static int vidioc_g_fmt_vbi(struct file *file, void *fh, | |||
801 | return 0; | 801 | return 0; |
802 | } | 802 | } |
803 | 803 | ||
804 | static int set_std(struct poseidon *pd, v4l2_std_id *norm) | 804 | static int set_std(struct poseidon *pd, v4l2_std_id norm) |
805 | { | 805 | { |
806 | struct video_data *video = &pd->video_data; | 806 | struct video_data *video = &pd->video_data; |
807 | struct vbi_data *vbi = &pd->vbi_data; | 807 | struct vbi_data *vbi = &pd->vbi_data; |
@@ -811,7 +811,7 @@ static int set_std(struct poseidon *pd, v4l2_std_id *norm) | |||
811 | int height; | 811 | int height; |
812 | 812 | ||
813 | for (i = 0; i < POSEIDON_TVNORMS; i++) { | 813 | for (i = 0; i < POSEIDON_TVNORMS; i++) { |
814 | if (*norm & poseidon_tvnorms[i].v4l2_id) { | 814 | if (norm & poseidon_tvnorms[i].v4l2_id) { |
815 | param = poseidon_tvnorms[i].tlg_tvnorm; | 815 | param = poseidon_tvnorms[i].tlg_tvnorm; |
816 | log("name : %s", poseidon_tvnorms[i].name); | 816 | log("name : %s", poseidon_tvnorms[i].name); |
817 | goto found; | 817 | goto found; |
@@ -846,7 +846,7 @@ out: | |||
846 | return ret; | 846 | return ret; |
847 | } | 847 | } |
848 | 848 | ||
849 | static int vidioc_s_std(struct file *file, void *fh, v4l2_std_id *norm) | 849 | static int vidioc_s_std(struct file *file, void *fh, v4l2_std_id norm) |
850 | { | 850 | { |
851 | struct front_face *front = fh; | 851 | struct front_face *front = fh; |
852 | 852 | ||
@@ -1270,7 +1270,7 @@ static int restore_v4l2_context(struct poseidon *pd, | |||
1270 | 1270 | ||
1271 | pd_video_checkmode(pd); | 1271 | pd_video_checkmode(pd); |
1272 | 1272 | ||
1273 | set_std(pd, &context->tvnormid); | 1273 | set_std(pd, context->tvnormid); |
1274 | vidioc_s_input(NULL, front, context->sig_index); | 1274 | vidioc_s_input(NULL, front, context->sig_index); |
1275 | pd_vidioc_s_tuner(pd, context->audio_idx); | 1275 | pd_vidioc_s_tuner(pd, context->audio_idx); |
1276 | pd_vidioc_s_fmt(pd, &context->pix); | 1276 | pd_vidioc_s_fmt(pd, &context->pix); |
diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c index b4618d7d9c4b..a78de1d1bc9e 100644 --- a/drivers/media/usb/tm6000/tm6000-video.c +++ b/drivers/media/usb/tm6000/tm6000-video.c | |||
@@ -1056,13 +1056,13 @@ static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i) | |||
1056 | return 0; | 1056 | return 0; |
1057 | } | 1057 | } |
1058 | 1058 | ||
1059 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *norm) | 1059 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id norm) |
1060 | { | 1060 | { |
1061 | int rc = 0; | 1061 | int rc = 0; |
1062 | struct tm6000_fh *fh = priv; | 1062 | struct tm6000_fh *fh = priv; |
1063 | struct tm6000_core *dev = fh->dev; | 1063 | struct tm6000_core *dev = fh->dev; |
1064 | 1064 | ||
1065 | dev->norm = *norm; | 1065 | dev->norm = norm; |
1066 | rc = tm6000_init_analog_mode(dev); | 1066 | rc = tm6000_init_analog_mode(dev); |
1067 | 1067 | ||
1068 | fh->width = dev->width; | 1068 | fh->width = dev->width; |
@@ -1134,7 +1134,7 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i) | |||
1134 | 1134 | ||
1135 | dev->input = i; | 1135 | dev->input = i; |
1136 | 1136 | ||
1137 | rc = vidioc_s_std(file, priv, &dev->vfd->current_norm); | 1137 | rc = vidioc_s_std(file, priv, dev->vfd->current_norm); |
1138 | 1138 | ||
1139 | return rc; | 1139 | return rc; |
1140 | } | 1140 | } |
diff --git a/drivers/media/usb/usbvision/usbvision-video.c b/drivers/media/usb/usbvision/usbvision-video.c index 874cfec0b8db..041f19e1b05b 100644 --- a/drivers/media/usb/usbvision/usbvision-video.c +++ b/drivers/media/usb/usbvision/usbvision-video.c | |||
@@ -595,11 +595,11 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int input) | |||
595 | return 0; | 595 | return 0; |
596 | } | 596 | } |
597 | 597 | ||
598 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *id) | 598 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id id) |
599 | { | 599 | { |
600 | struct usb_usbvision *usbvision = video_drvdata(file); | 600 | struct usb_usbvision *usbvision = video_drvdata(file); |
601 | 601 | ||
602 | usbvision->tvnorm_id = *id; | 602 | usbvision->tvnorm_id = id; |
603 | 603 | ||
604 | call_all(usbvision, core, s_std, usbvision->tvnorm_id); | 604 | call_all(usbvision, core, s_std, usbvision->tvnorm_id); |
605 | /* propagate the change to the decoder */ | 605 | /* propagate the change to the decoder */ |
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index 8ec8abe0ffe7..d80d8afba3fb 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c | |||
@@ -1383,15 +1383,15 @@ static int v4l_s_std(const struct v4l2_ioctl_ops *ops, | |||
1383 | struct file *file, void *fh, void *arg) | 1383 | struct file *file, void *fh, void *arg) |
1384 | { | 1384 | { |
1385 | struct video_device *vfd = video_devdata(file); | 1385 | struct video_device *vfd = video_devdata(file); |
1386 | v4l2_std_id *id = arg, norm; | 1386 | v4l2_std_id id = *(v4l2_std_id *)arg, norm; |
1387 | int ret; | 1387 | int ret; |
1388 | 1388 | ||
1389 | norm = (*id) & vfd->tvnorms; | 1389 | norm = id & vfd->tvnorms; |
1390 | if (vfd->tvnorms && !norm) /* Check if std is supported */ | 1390 | if (vfd->tvnorms && !norm) /* Check if std is supported */ |
1391 | return -EINVAL; | 1391 | return -EINVAL; |
1392 | 1392 | ||
1393 | /* Calls the specific handler */ | 1393 | /* Calls the specific handler */ |
1394 | ret = ops->vidioc_s_std(file, fh, &norm); | 1394 | ret = ops->vidioc_s_std(file, fh, norm); |
1395 | 1395 | ||
1396 | /* Updates standard information */ | 1396 | /* Updates standard information */ |
1397 | if (ret >= 0) | 1397 | if (ret >= 0) |
diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c index 19dc5b062d07..3670a7b0724e 100644 --- a/drivers/staging/media/davinci_vpfe/vpfe_video.c +++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c | |||
@@ -924,7 +924,7 @@ static int vpfe_querystd(struct file *file, void *priv, v4l2_std_id *std_id) | |||
924 | * | 924 | * |
925 | * Return 0 on success, error code otherwise | 925 | * Return 0 on success, error code otherwise |
926 | */ | 926 | */ |
927 | static int vpfe_s_std(struct file *file, void *priv, v4l2_std_id *std_id) | 927 | static int vpfe_s_std(struct file *file, void *priv, v4l2_std_id std_id) |
928 | { | 928 | { |
929 | struct vpfe_video_device *video = video_drvdata(file); | 929 | struct vpfe_video_device *video = video_drvdata(file); |
930 | struct vpfe_device *vpfe_dev = video->vpfe_dev; | 930 | struct vpfe_device *vpfe_dev = video->vpfe_dev; |
@@ -945,13 +945,13 @@ static int vpfe_s_std(struct file *file, void *priv, v4l2_std_id *std_id) | |||
945 | goto unlock_out; | 945 | goto unlock_out; |
946 | } | 946 | } |
947 | ret = v4l2_device_call_until_err(&vpfe_dev->v4l2_dev, sdinfo->grp_id, | 947 | ret = v4l2_device_call_until_err(&vpfe_dev->v4l2_dev, sdinfo->grp_id, |
948 | core, s_std, *std_id); | 948 | core, s_std, std_id); |
949 | if (ret < 0) { | 949 | if (ret < 0) { |
950 | v4l2_err(&vpfe_dev->v4l2_dev, "Failed to set standard\n"); | 950 | v4l2_err(&vpfe_dev->v4l2_dev, "Failed to set standard\n"); |
951 | video->stdid = V4L2_STD_UNKNOWN; | 951 | video->stdid = V4L2_STD_UNKNOWN; |
952 | goto unlock_out; | 952 | goto unlock_out; |
953 | } | 953 | } |
954 | video->stdid = *std_id; | 954 | video->stdid = std_id; |
955 | unlock_out: | 955 | unlock_out: |
956 | mutex_unlock(&video->lock); | 956 | mutex_unlock(&video->lock); |
957 | return ret; | 957 | return ret; |
diff --git a/drivers/staging/media/dt3155v4l/dt3155v4l.c b/drivers/staging/media/dt3155v4l/dt3155v4l.c index e33b7f55d84e..073b3b35f8f4 100644 --- a/drivers/staging/media/dt3155v4l/dt3155v4l.c +++ b/drivers/staging/media/dt3155v4l/dt3155v4l.c | |||
@@ -612,9 +612,9 @@ dt3155_ioc_g_std(struct file *filp, void *p, v4l2_std_id *norm) | |||
612 | } | 612 | } |
613 | 613 | ||
614 | static int | 614 | static int |
615 | dt3155_ioc_s_std(struct file *filp, void *p, v4l2_std_id *norm) | 615 | dt3155_ioc_s_std(struct file *filp, void *p, v4l2_std_id norm) |
616 | { | 616 | { |
617 | if (*norm & DT3155_CURRENT_NORM) | 617 | if (norm & DT3155_CURRENT_NORM) |
618 | return 0; | 618 | return 0; |
619 | return -EINVAL; | 619 | return -EINVAL; |
620 | } | 620 | } |
diff --git a/drivers/staging/media/go7007/go7007-v4l2.c b/drivers/staging/media/go7007/go7007-v4l2.c index 4e477f3b78f3..29fe94da5f71 100644 --- a/drivers/staging/media/go7007/go7007-v4l2.c +++ b/drivers/staging/media/go7007/go7007-v4l2.c | |||
@@ -1117,40 +1117,40 @@ static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *std) | |||
1117 | return 0; | 1117 | return 0; |
1118 | } | 1118 | } |
1119 | 1119 | ||
1120 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *std) | 1120 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id std) |
1121 | { | 1121 | { |
1122 | struct go7007 *go = ((struct go7007_file *) priv)->go; | 1122 | struct go7007 *go = ((struct go7007_file *) priv)->go; |
1123 | 1123 | ||
1124 | if (go->streaming) | 1124 | if (go->streaming) |
1125 | return -EBUSY; | 1125 | return -EBUSY; |
1126 | 1126 | ||
1127 | if (!(go->board_info->sensor_flags & GO7007_SENSOR_TV) && *std != 0) | 1127 | if (!(go->board_info->sensor_flags & GO7007_SENSOR_TV) && std != 0) |
1128 | return -EINVAL; | 1128 | return -EINVAL; |
1129 | 1129 | ||
1130 | if (*std == 0) | 1130 | if (std == 0) |
1131 | return -EINVAL; | 1131 | return -EINVAL; |
1132 | 1132 | ||
1133 | if ((go->board_info->flags & GO7007_BOARD_HAS_TUNER) && | 1133 | if ((go->board_info->flags & GO7007_BOARD_HAS_TUNER) && |
1134 | go->input == go->board_info->num_inputs - 1) { | 1134 | go->input == go->board_info->num_inputs - 1) { |
1135 | if (!go->i2c_adapter_online) | 1135 | if (!go->i2c_adapter_online) |
1136 | return -EIO; | 1136 | return -EIO; |
1137 | if (call_all(&go->v4l2_dev, core, s_std, *std) < 0) | 1137 | if (call_all(&go->v4l2_dev, core, s_std, std) < 0) |
1138 | return -EINVAL; | 1138 | return -EINVAL; |
1139 | } | 1139 | } |
1140 | 1140 | ||
1141 | if (*std & V4L2_STD_NTSC) { | 1141 | if (std & V4L2_STD_NTSC) { |
1142 | go->standard = GO7007_STD_NTSC; | 1142 | go->standard = GO7007_STD_NTSC; |
1143 | go->sensor_framerate = 30000; | 1143 | go->sensor_framerate = 30000; |
1144 | } else if (*std & V4L2_STD_PAL) { | 1144 | } else if (std & V4L2_STD_PAL) { |
1145 | go->standard = GO7007_STD_PAL; | 1145 | go->standard = GO7007_STD_PAL; |
1146 | go->sensor_framerate = 25025; | 1146 | go->sensor_framerate = 25025; |
1147 | } else if (*std & V4L2_STD_SECAM) { | 1147 | } else if (std & V4L2_STD_SECAM) { |
1148 | go->standard = GO7007_STD_PAL; | 1148 | go->standard = GO7007_STD_PAL; |
1149 | go->sensor_framerate = 25025; | 1149 | go->sensor_framerate = 25025; |
1150 | } else | 1150 | } else |
1151 | return -EINVAL; | 1151 | return -EINVAL; |
1152 | 1152 | ||
1153 | call_all(&go->v4l2_dev, core, s_std, *std); | 1153 | call_all(&go->v4l2_dev, core, s_std, std); |
1154 | set_capture_size(go, NULL, 0); | 1154 | set_capture_size(go, NULL, 0); |
1155 | 1155 | ||
1156 | return 0; | 1156 | return 0; |
diff --git a/drivers/staging/media/solo6x10/v4l2-enc.c b/drivers/staging/media/solo6x10/v4l2-enc.c index 4977e869d5b7..310b126e1288 100644 --- a/drivers/staging/media/solo6x10/v4l2-enc.c +++ b/drivers/staging/media/solo6x10/v4l2-enc.c | |||
@@ -1326,7 +1326,7 @@ static int solo_enc_streamoff(struct file *file, void *priv, | |||
1326 | return videobuf_streamoff(&fh->vidq); | 1326 | return videobuf_streamoff(&fh->vidq); |
1327 | } | 1327 | } |
1328 | 1328 | ||
1329 | static int solo_enc_s_std(struct file *file, void *priv, v4l2_std_id *i) | 1329 | static int solo_enc_s_std(struct file *file, void *priv, v4l2_std_id i) |
1330 | { | 1330 | { |
1331 | return 0; | 1331 | return 0; |
1332 | } | 1332 | } |
diff --git a/drivers/staging/media/solo6x10/v4l2.c b/drivers/staging/media/solo6x10/v4l2.c index ca774cc57539..87f3c0452ca4 100644 --- a/drivers/staging/media/solo6x10/v4l2.c +++ b/drivers/staging/media/solo6x10/v4l2.c | |||
@@ -773,7 +773,7 @@ static int solo_streamoff(struct file *file, void *priv, enum v4l2_buf_type i) | |||
773 | return videobuf_streamoff(&fh->vidq); | 773 | return videobuf_streamoff(&fh->vidq); |
774 | } | 774 | } |
775 | 775 | ||
776 | static int solo_s_std(struct file *file, void *priv, v4l2_std_id *i) | 776 | static int solo_s_std(struct file *file, void *priv, v4l2_std_id i) |
777 | { | 777 | { |
778 | return 0; | 778 | return 0; |
779 | } | 779 | } |
diff --git a/include/media/davinci/vpbe.h b/include/media/davinci/vpbe.h index a7ca4884c46c..57585c7004a4 100644 --- a/include/media/davinci/vpbe.h +++ b/include/media/davinci/vpbe.h | |||
@@ -132,7 +132,7 @@ struct vpbe_device_ops { | |||
132 | struct v4l2_enum_dv_timings *timings_info); | 132 | struct v4l2_enum_dv_timings *timings_info); |
133 | 133 | ||
134 | /* Set std at the output */ | 134 | /* Set std at the output */ |
135 | int (*s_std)(struct vpbe_device *vpbe_dev, v4l2_std_id *std_id); | 135 | int (*s_std)(struct vpbe_device *vpbe_dev, v4l2_std_id std_id); |
136 | 136 | ||
137 | /* Get the current std at the output */ | 137 | /* Get the current std at the output */ |
138 | int (*g_std)(struct vpbe_device *vpbe_dev, v4l2_std_id *std_id); | 138 | int (*g_std)(struct vpbe_device *vpbe_dev, v4l2_std_id *std_id); |
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h index 0da8682a0481..ee7b7c67c87a 100644 --- a/include/media/v4l2-ioctl.h +++ b/include/media/v4l2-ioctl.h | |||
@@ -132,7 +132,7 @@ struct v4l2_ioctl_ops { | |||
132 | ENUMSTD is handled by videodev.c | 132 | ENUMSTD is handled by videodev.c |
133 | */ | 133 | */ |
134 | int (*vidioc_g_std) (struct file *file, void *fh, v4l2_std_id *norm); | 134 | int (*vidioc_g_std) (struct file *file, void *fh, v4l2_std_id *norm); |
135 | int (*vidioc_s_std) (struct file *file, void *fh, v4l2_std_id *norm); | 135 | int (*vidioc_s_std) (struct file *file, void *fh, v4l2_std_id norm); |
136 | int (*vidioc_querystd) (struct file *file, void *fh, v4l2_std_id *a); | 136 | int (*vidioc_querystd) (struct file *file, void *fh, v4l2_std_id *a); |
137 | 137 | ||
138 | /* Input handling */ | 138 | /* Input handling */ |