8 files changed, 4 insertions, 21 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index 9a8dae811ddf..162a1e8fcdc8 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -121,7 +121,7 @@ static int ivtv_pci_latency = 1;
 
 int ivtv_debug = 0;
 
-int newi2c = -1;
+static int newi2c = -1;
 
 module_param_array(tuner, int, &tuner_c, 0644);
 module_param_array(radio, bool, &radio_c, 0644);
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index 90e0f51e635c..2f38bb14ace9 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -730,7 +730,7 @@ void ivtv_stop_capture(struct ivtv_open_id *id, int gop_end)
 	ivtv_release_stream(s);
 }
 
-void ivtv_stop_decoding(struct ivtv_open_id *id, int flags, u64 pts)
+static void ivtv_stop_decoding(struct ivtv_open_id *id, int flags, u64 pts)
 {
 	struct ivtv *itv = id->itv;
 	struct ivtv_stream *s = &itv->streams[id->type];
diff --git a/drivers/media/video/ivtv/ivtv-fileops.h b/drivers/media/video/ivtv/ivtv-fileops.h
index 1afa950209b8..74a1745fabbc 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.h
+++ b/drivers/media/video/ivtv/ivtv-fileops.h
@@ -30,7 +30,6 @@ unsigned int ivtv_v4l2_dec_poll(struct file *filp, poll_table * wait);
 int ivtv_start_capture(struct ivtv_open_id *id);
 void ivtv_stop_capture(struct ivtv_open_id *id, int gop_end);
 int ivtv_start_decoding(struct ivtv_open_id *id, int speed);
-void ivtv_stop_decoding(struct ivtv_open_id *id, int flags, u64 pts);
 void ivtv_mute(struct ivtv *itv);
 void ivtv_unmute(struct ivtv *itv);
 
diff --git a/drivers/media/video/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv-i2c.c
index 07c7ed0fe445..696af35e0282 100644
--- a/drivers/media/video/ivtv/ivtv-i2c.c
+++ b/drivers/media/video/ivtv/ivtv-i2c.c
@@ -574,7 +574,7 @@ int ivtv_call_i2c_client(struct ivtv *itv, int addr, unsigned int cmd, void *arg
 
 /* Find the i2c device based on the driver ID and return
    its i2c address or -ENODEV if no matching device was found. */
-int ivtv_i2c_id_addr(struct ivtv *itv, u32 id)
+static int ivtv_i2c_id_addr(struct ivtv *itv, u32 id)
 {
 	struct i2c_client *client;
 	int retval = -ENODEV;
@@ -681,11 +681,6 @@ int ivtv_saa717x(struct ivtv *itv, unsigned int cmd, void *arg)
 	return ivtv_call_i2c_client(itv, IVTV_SAA717x_I2C_ADDR, cmd, arg);
 }
 
-int ivtv_msp34xx(struct ivtv *itv, unsigned int cmd, void *arg)
-{
-	return ivtv_call_i2c_client(itv, IVTV_MSP3400_I2C_ADDR, cmd, arg);
-}
-
 int ivtv_upd64031a(struct ivtv *itv, unsigned int cmd, void *arg)
 {
 	return ivtv_call_i2c_client(itv, IVTV_UPD64031A_I2C_ADDR, cmd, arg);
diff --git a/drivers/media/video/ivtv/ivtv-i2c.h b/drivers/media/video/ivtv/ivtv-i2c.h
index 136dd684f4b5..5d210adb5c52 100644
--- a/drivers/media/video/ivtv/ivtv-i2c.h
+++ b/drivers/media/video/ivtv/ivtv-i2c.h
@@ -22,11 +22,9 @@ int ivtv_cx25840(struct ivtv *itv, unsigned int cmd, void *arg);
 int ivtv_saa7115(struct ivtv *itv, unsigned int cmd, void *arg);
 int ivtv_saa7127(struct ivtv *itv, unsigned int cmd, void *arg);
 int ivtv_saa717x(struct ivtv *itv, unsigned int cmd, void *arg);
-int ivtv_msp34xx(struct ivtv *itv, unsigned int cmd, void *arg);
 int ivtv_upd64031a(struct ivtv *itv, unsigned int cmd, void *arg);
 int ivtv_upd64083(struct ivtv *itv, unsigned int cmd, void *arg);
 
-int ivtv_i2c_id_addr(struct ivtv *itv, u32 id);
 int ivtv_i2c_hw_addr(struct ivtv *itv, u32 hw);
 int ivtv_i2c_hw(struct ivtv *itv, u32 hw, unsigned int cmd, void *arg);
 int ivtv_i2c_id(struct ivtv *itv, u32 id, unsigned int cmd, void *arg);
diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c
index 73a1c933d8f7..01a41a844a30 100644
--- a/drivers/media/video/ivtv/ivtv-streams.c
+++ b/drivers/media/video/ivtv/ivtv-streams.c
@@ -66,7 +66,7 @@ static struct file_operations ivtv_v4l2_dec_fops = {
       .poll = ivtv_v4l2_dec_poll,
 };
 
-struct {
+static struct {
 	const char *name;
 	int vfl_type;
 	int minor_offset;
diff --git a/drivers/media/video/ivtv/ivtv-video.c b/drivers/media/video/ivtv/ivtv-video.c
index 77e42d13cdee..5858b197d510 100644
--- a/drivers/media/video/ivtv/ivtv-video.c
+++ b/drivers/media/video/ivtv/ivtv-video.c
@@ -85,14 +85,6 @@ void ivtv_set_wss(struct ivtv *itv, int enabled, int mode)
 	ivtv_saa7127(itv, VIDIOC_INT_S_VBI_DATA, &data);
 }
 
-void ivtv_encoder_enable(struct ivtv *itv, int enabled)
-{
-	if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) {
-		ivtv_saa7127(itv, enabled ? VIDIOC_STREAMON : VIDIOC_STREAMOFF,
-				&enabled);
-	}
-}
-
 void ivtv_video_set_io(struct ivtv *itv)
 {
 	struct v4l2_routing route;
diff --git a/drivers/media/video/ivtv/ivtv-video.h b/drivers/media/video/ivtv/ivtv-video.h
index 5efedebe317b..c8ade5d3c413 100644
--- a/drivers/media/video/ivtv/ivtv-video.h
+++ b/drivers/media/video/ivtv/ivtv-video.h
@@ -21,5 +21,4 @@ void ivtv_set_wss(struct ivtv *itv, int enabled, int mode);
 void ivtv_set_cc(struct ivtv *itv, int mode, u8 cc1, u8 cc2, u8 cc3, u8 cc4);
 void ivtv_set_vps(struct ivtv *itv, int enabled, u8 vps1, u8 vps2, u8 vps3,
 		  u8 vps4, u8 vps5);
-void ivtv_encoder_enable(struct ivtv *itv, int enabled);
 void ivtv_video_set_io(struct ivtv *itv);