4 files changed, 15 insertions, 15 deletions

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)
         if (!itv->has_cx23415)
                 write_reg_sync(0x03, IVTV_REG_DMACONTROL);
 
-        ivtv_s_std_enc(itv, &itv->tuner_std);
+        ivtv_s_std_enc(itv, itv->tuner_std);
 
         /* Default interrupts enabled. For the PVR350 this includes the
            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)
         if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) {
                 ivtv_clear_irq_mask(itv, IVTV_IRQ_MASK_INIT | IVTV_IRQ_DEC_VSYNC);
                 ivtv_set_osd_alpha(itv);
-                ivtv_s_std_dec(itv, &itv->tuner_std);
+                ivtv_s_std_dec(itv, itv->tuner_std);
         } else {
                 ivtv_clear_irq_mask(itv, IVTV_IRQ_MASK_INIT);
         }
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)
         /* Restore encoder video standard */
         std = itv->std;
         itv->std = 0;
-        ivtv_s_std_enc(itv, &std);
+        ivtv_s_std_enc(itv, std);
 
         if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) {
                 ivtv_init_mpeg_decoder(itv);
@@ -310,7 +310,7 @@ static int ivtv_firmware_restart(struct ivtv *itv)
                 /* Restore decoder video standard */
                 std = itv->std_out;
                 itv->std_out = 0;
-                ivtv_s_std_dec(itv, &std);
+                ivtv_s_std_dec(itv, std);
 
                 /* Restore framebuffer if active */
                 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)
         return 0;
 }
 
-void ivtv_s_std_enc(struct ivtv *itv, v4l2_std_id *std)
+void ivtv_s_std_enc(struct ivtv *itv, v4l2_std_id std)
 {
-        itv->std = *std;
-        itv->is_60hz = (*std & V4L2_STD_525_60) ? 1 : 0;
+        itv->std = std;
+        itv->is_60hz = (std & V4L2_STD_525_60) ? 1 : 0;
         itv->is_50hz = !itv->is_60hz;
         cx2341x_handler_set_50hz(&itv->cxhdl, itv->is_50hz);
         itv->cxhdl.width = 720;
@@ -1122,15 +1122,15 @@ void ivtv_s_std_enc(struct ivtv *itv, v4l2_std_id *std)
         ivtv_call_all(itv, core, s_std, itv->std);
 }
 
-void ivtv_s_std_dec(struct ivtv *itv, v4l2_std_id *std)
+void ivtv_s_std_dec(struct ivtv *itv, v4l2_std_id std)
 {
         struct yuv_playback_info *yi = &itv->yuv_info;
         DEFINE_WAIT(wait);
         int f;
 
         /* set display standard */
-        itv->std_out = *std;
-        itv->is_out_60hz = (*std & V4L2_STD_525_60) ? 1 : 0;
+        itv->std_out = std;
+        itv->is_out_60hz = (std & V4L2_STD_525_60) ? 1 : 0;
         itv->is_out_50hz = !itv->is_out_60hz;
         ivtv_call_all(itv, video, s_std_output, itv->std_out);
 
@@ -1168,14 +1168,14 @@ void ivtv_s_std_dec(struct ivtv *itv, v4l2_std_id *std)
         }
 }
 
-static int ivtv_s_std(struct file *file, void *fh, v4l2_std_id *std)
+static int ivtv_s_std(struct file *file, void *fh, v4l2_std_id std)
 {
         struct ivtv *itv = fh2id(fh)->itv;
 
-        if ((*std & V4L2_STD_ALL) == 0)
+        if ((std & V4L2_STD_ALL) == 0)
                 return -EINVAL;
 
-        if (*std == itv->std)
+        if (std == itv->std)
                 return 0;
 
         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);
 void ivtv_set_osd_alpha(struct ivtv *itv);
 int ivtv_set_speed(struct ivtv *itv, int speed);
 void ivtv_set_funcs(struct video_device *vdev);
-void ivtv_s_std_enc(struct ivtv *itv, v4l2_std_id *std);
-void ivtv_s_std_dec(struct ivtv *itv, v4l2_std_id *std);
+void ivtv_s_std_enc(struct ivtv *itv, v4l2_std_id std);
+void ivtv_s_std_dec(struct ivtv *itv, v4l2_std_id std);
 int ivtv_s_frequency(struct file *file, void *fh, const struct v4l2_frequency *vf);
 int ivtv_s_input(struct file *file, void *fh, unsigned int inp);