45 files changed, 179 insertions, 410 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-audio.c b/drivers/media/video/pvrusb2/pvrusb2-audio.c
index 8d859ccd48ec..cdedaa55f152 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-audio.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-audio.c
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
diff --git a/drivers/media/video/pvrusb2/pvrusb2-audio.h b/drivers/media/video/pvrusb2/pvrusb2-audio.h
index 536339b68843..ac54eed3721b 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-audio.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-audio.h
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
diff --git a/drivers/media/video/pvrusb2/pvrusb2-context.c b/drivers/media/video/pvrusb2/pvrusb2-context.c
index 73dcb1c57ae6..7c19ff72e6b3 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-context.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-context.c
@@ -1,5 +1,4 @@
 /*
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *
diff --git a/drivers/media/video/pvrusb2/pvrusb2-context.h b/drivers/media/video/pvrusb2/pvrusb2-context.h
index 745e270233c2..61801291c2af 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-context.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-context.h
@@ -1,5 +1,4 @@
 /*
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *
diff --git a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
index 91a42f2473a7..0764fbfffb73 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *
diff --git a/drivers/media/video/pvrusb2/pvrusb2-ctrl.h b/drivers/media/video/pvrusb2/pvrusb2-ctrl.h
index c1680053cd64..0371ae6e6e4e 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-ctrl.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-ctrl.h
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *
diff --git a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
index 29d50597c88a..895859ec495a 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
diff --git a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h
index 54b2844e7a71..66abf77f51fd 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
diff --git a/drivers/media/video/pvrusb2/pvrusb2-debug.h b/drivers/media/video/pvrusb2/pvrusb2-debug.h
index 707d2d9635d7..be79249f8628 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-debug.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-debug.h
@@ -1,5 +1,4 @@
 /*
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *
diff --git a/drivers/media/video/pvrusb2/pvrusb2-debugifc.c b/drivers/media/video/pvrusb2/pvrusb2-debugifc.c
index b53121c78ff9..ca892fb78a5b 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-debugifc.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-debugifc.c
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *
diff --git a/drivers/media/video/pvrusb2/pvrusb2-debugifc.h b/drivers/media/video/pvrusb2/pvrusb2-debugifc.h
index 990b02d35d36..e24ff59f8605 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-debugifc.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-debugifc.h
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *
diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
index 5bf6d8fda1f9..5d036e7e3f07 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2007 Mike Isely <isely@pobox.com>
  *
@@ -182,7 +181,7 @@ static int pvr2_lgh06xf_attach(struct pvr2_dvb_adapter *adap)
         return 0;
 }
 
-struct pvr2_dvb_props pvr2_onair_creator_fe_props = {
+static struct pvr2_dvb_props pvr2_onair_creator_fe_props = {
         .frontend_attach = pvr2_lgdt3303_attach,
         .tuner_attach    = pvr2_lgh06xf_attach,
 };
@@ -242,7 +241,7 @@ static int pvr2_fcv1236d_attach(struct pvr2_dvb_adapter *adap)
         return 0;
 }
 
-struct pvr2_dvb_props pvr2_onair_usb2_fe_props = {
+static struct pvr2_dvb_props pvr2_onair_usb2_fe_props = {
         .frontend_attach = pvr2_lgdt3302_attach,
         .tuner_attach    = pvr2_fcv1236d_attach,
 };
@@ -315,7 +314,7 @@ static int pvr2_73xxx_tda18271_8295_attach(struct pvr2_dvb_adapter *adap)
         return 0;
 }
 
-struct pvr2_dvb_props pvr2_73xxx_dvb_props = {
+static struct pvr2_dvb_props pvr2_73xxx_dvb_props = {
         .frontend_attach = pvr2_tda10048_attach,
         .tuner_attach    = pvr2_73xxx_tda18271_8295_attach,
 };
@@ -418,12 +417,12 @@ static int pvr2_tda18271_8295_attach(struct pvr2_dvb_adapter *adap)
         return 0;
 }
 
-struct pvr2_dvb_props pvr2_750xx_dvb_props = {
+static struct pvr2_dvb_props pvr2_750xx_dvb_props = {
         .frontend_attach = pvr2_s5h1409_attach,
         .tuner_attach    = pvr2_tda18271_8295_attach,
 };
 
-struct pvr2_dvb_props pvr2_751xx_dvb_props = {
+static struct pvr2_dvb_props pvr2_751xx_dvb_props = {
         .frontend_attach = pvr2_s5h1411_attach,
         .tuner_attach    = pvr2_tda18271_8295_attach,
 };
diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.h b/drivers/media/video/pvrusb2/pvrusb2-devattr.h
index d016f8b6c70b..e23ce1d2edd7 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-devattr.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.h
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *
diff --git a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
index 5ef005947b04..299afa4fa969 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
diff --git a/drivers/media/video/pvrusb2/pvrusb2-eeprom.h b/drivers/media/video/pvrusb2/pvrusb2-eeprom.h
index 84242975dea7..cca3216f94cc 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-eeprom.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-eeprom.h
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
diff --git a/drivers/media/video/pvrusb2/pvrusb2-encoder.c b/drivers/media/video/pvrusb2/pvrusb2-encoder.c
index c46d367f7472..a1252d673b41 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-encoder.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-encoder.c
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
diff --git a/drivers/media/video/pvrusb2/pvrusb2-encoder.h b/drivers/media/video/pvrusb2/pvrusb2-encoder.h
index 54caf2e3c428..232fefbcd1ac 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-encoder.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-encoder.h
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
diff --git a/drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h b/drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h
index abaada31e66e..b58369e7f30b 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2007 Michael Krufky <mkrufky@linuxtv.org>
  *
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
index a3fe251d6fd9..657f861593b3 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 0a868888f389..a5217a2cf4c0 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *
@@ -40,6 +39,23 @@
 #define TV_MIN_FREQ     55250000L
 #define TV_MAX_FREQ    850000000L
 
+/* This defines a minimum interval that the decoder must remain quiet
+   before we are allowed to start it running. */
+#define TIME_MSEC_DECODER_WAIT 50
+
+/* This defines a minimum interval that the encoder must remain quiet
+   before we are allowed to configure it.  I had this originally set to
+   50msec, but Martin Dauskardt <martin.dauskardt@gmx.de> reports that
+   things work better when it's set to 100msec. */
+#define TIME_MSEC_ENCODER_WAIT 100
+
+/* This defines the minimum interval that the encoder must successfully run
+   before we consider that the encoder has run at least once since its
+   firmware has been loaded.  This measurement is in important for cases
+   where we can't do something until we know that the encoder has been run
+   at least once. */
+#define TIME_MSEC_ENCODER_OK 250
+
 static struct pvr2_hdw *unit_pointers[PVR_NUM] = {[ 0 ... PVR_NUM-1 ] = NULL};
 static DEFINE_MUTEX(pvr2_unit_mtx);
 
@@ -67,6 +83,16 @@ MODULE_PARM_DESC(video_std,"specify initial video standard");
 module_param_array(tolerance,    int, NULL, 0444);
 MODULE_PARM_DESC(tolerance,"specify stream error tolerance");
 
+/* US Broadcast channel 7 (175.25 MHz) */
+static int default_tv_freq    = 175250000L;
+/* 104.3 MHz, a usable FM station for my area */
+static int default_radio_freq = 104300000L;
+
+module_param_named(tv_freq, default_tv_freq, int, 0444);
+MODULE_PARM_DESC(tv_freq, "specify initial television frequency");
+module_param_named(radio_freq, default_radio_freq, int, 0444);
+MODULE_PARM_DESC(radio_freq, "specify initial radio frequency");
+
 #define PVR2_CTL_WRITE_ENDPOINT  0x01
 #define PVR2_CTL_READ_ENDPOINT   0x81
 
@@ -1701,10 +1727,8 @@ static void pvr2_hdw_setup_low(struct pvr2_hdw *hdw)
            are, but I set them to something usable in the Chicago area just
            to make driver testing a little easier. */
 
-        /* US Broadcast channel 7 (175.25 MHz) */
-        hdw->freqValTelevision = 175250000L;
-        /* 104.3 MHz, a usable FM station for my area */
-        hdw->freqValRadio = 104300000L;
+        hdw->freqValTelevision = default_tv_freq;
+        hdw->freqValRadio = default_radio_freq;
 
         // Do not use pvr2_reset_ctl_endpoints() here.  It is not
         // thread-safe against the normal pvr2_send_request() mechanism.
@@ -1989,7 +2013,8 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
                 case V4L2_CTRL_TYPE_MENU:
                         ciptr->type = pvr2_ctl_enum;
                         ciptr->def.type_enum.value_names =
-                                cx2341x_ctrl_get_menu(ciptr->v4l_id);
+                                cx2341x_ctrl_get_menu(&hdw->enc_ctl_state,
+                                                                ciptr->v4l_id);
                         for (cnt1 = 0;
                              ciptr->def.type_enum.value_names[cnt1] != NULL;
                              cnt1++) { }
@@ -2428,22 +2453,38 @@ static int pvr2_hdw_commit_execute(struct pvr2_hdw *hdw)
         struct pvr2_ctrl *cptr;
         int disruptive_change;
 
-        /* When video standard changes, reset the hres and vres values -
-           but if the user has pending changes there, then let the changes
-           take priority. */
+        /* Handle some required side effects when the video standard is
+           changed.... */
         if (hdw->std_dirty) {
-                /* Rewrite the vertical resolution to be appropriate to the
-                   video standard that has been selected. */
                 int nvres;
+                int gop_size;
                 if (hdw->std_mask_cur & V4L2_STD_525_60) {
                         nvres = 480;
+                        gop_size = 15;
                 } else {
                         nvres = 576;
+                        gop_size = 12;
                 }
+                /* Rewrite the vertical resolution to be appropriate to the
+                   video standard that has been selected. */
                 if (nvres != hdw->res_ver_val) {
                         hdw->res_ver_val = nvres;
                         hdw->res_ver_dirty = !0;
                 }
+                /* Rewrite the GOP size to be appropriate to the video
+                   standard that has been selected. */
+                if (gop_size != hdw->enc_ctl_state.video_gop_size) {
+                        struct v4l2_ext_controls cs;
+                        struct v4l2_ext_control c1;
+                        memset(&cs, 0, sizeof(cs));
+                        memset(&c1, 0, sizeof(c1));
+                        cs.controls = &c1;
+                        cs.count = 1;
+                        c1.id = V4L2_CID_MPEG_VIDEO_GOP_SIZE;
+                        c1.value = gop_size;
+                        cx2341x_ext_ctrls(&hdw->enc_ctl_state, 0, &cs,
+                                          VIDIOC_S_EXT_CTRLS);
+                }
         }
 
         if (hdw->input_dirty && hdw->state_pathway_ok &&
@@ -3421,7 +3462,7 @@ static void pvr2_hdw_cmd_modeswitch(struct pvr2_hdw *hdw,int digitalFl)
 }
 
 
-void pvr2_led_ctrl_hauppauge(struct pvr2_hdw *hdw, int onoff)
+static void pvr2_led_ctrl_hauppauge(struct pvr2_hdw *hdw, int onoff)
 {
         /* change some GPIO data
          *
@@ -3601,7 +3642,9 @@ static int state_eval_encoder_config(struct pvr2_hdw *hdw)
                                    the encoder. */
                                 if (!hdw->state_encoder_waitok) {
                                         hdw->encoder_wait_timer.expires =
-                                                jiffies + (HZ*50/1000);
+                                                jiffies +
+                                                (HZ * TIME_MSEC_ENCODER_WAIT
+                                                 / 1000);
                                         add_timer(&hdw->encoder_wait_timer);
                                 }
                         }
@@ -3725,7 +3768,7 @@ static int state_eval_encoder_run(struct pvr2_hdw *hdw)
                 hdw->state_encoder_run = !0;
                 if (!hdw->state_encoder_runok) {
                         hdw->encoder_run_timer.expires =
-                                jiffies + (HZ*250/1000);
+                                jiffies + (HZ * TIME_MSEC_ENCODER_OK / 1000);
                         add_timer(&hdw->encoder_run_timer);
                 }
         }
@@ -3800,7 +3843,9 @@ static int state_eval_decoder_run(struct pvr2_hdw *hdw)
                                    but before we did the pending check. */
                                 if (!hdw->state_decoder_quiescent) {
                                         hdw->quiescent_timer.expires =
-                                                jiffies + (HZ*50/1000);
+                                                jiffies +
+                                                (HZ * TIME_MSEC_DECODER_WAIT
+                                                 / 1000);
                                         add_timer(&hdw->quiescent_timer);
                                 }
                         }
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.h b/drivers/media/video/pvrusb2/pvrusb2-hdw.h
index 20295e0c1995..c04956d304a7 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.h
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
index 49773764383b..ccdb429fc7af 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
index c650e02ccd00..55f04a0b2047 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h
index c838df6167f9..7fa38683b3b1 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
index 793c89a8d672..9d3c18b24744 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.h b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.h
index bd0807b905bb..6ef7a1c0e935 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.h
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *
diff --git a/drivers/media/video/pvrusb2/pvrusb2-io.c b/drivers/media/video/pvrusb2/pvrusb2-io.c
index 7aff8b720064..20b6ae0bb40d 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-io.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-io.c
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *
diff --git a/drivers/media/video/pvrusb2/pvrusb2-io.h b/drivers/media/video/pvrusb2/pvrusb2-io.h
index 42fcf8281a87..afb7e87c0394 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-io.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-io.h
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *
diff --git a/drivers/media/video/pvrusb2/pvrusb2-ioread.c b/drivers/media/video/pvrusb2/pvrusb2-ioread.c
index c572212c9f15..05a1376405e7 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-ioread.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-ioread.c
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *
diff --git a/drivers/media/video/pvrusb2/pvrusb2-ioread.h b/drivers/media/video/pvrusb2/pvrusb2-ioread.h
index 1d362f833588..100e0780e1aa 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-ioread.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-ioread.h
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *
diff --git a/drivers/media/video/pvrusb2/pvrusb2-main.c b/drivers/media/video/pvrusb2/pvrusb2-main.c
index 332aced8a5a1..ad0d98c2ebb4 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-main.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-main.c
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
diff --git a/drivers/media/video/pvrusb2/pvrusb2-std.c b/drivers/media/video/pvrusb2/pvrusb2-std.c
index fdc5a2b49ca8..ca9f83a85ca5 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-std.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-std.c
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *
diff --git a/drivers/media/video/pvrusb2/pvrusb2-std.h b/drivers/media/video/pvrusb2/pvrusb2-std.h
index 07c399375341..a35c53d0b320 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-std.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-std.h
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *
diff --git a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
index 0ff7a836a8a2..46a8c39ba030 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *
@@ -71,6 +70,7 @@ struct pvr2_sysfs_ctl_item {
         struct device_attribute attr_val;
         struct device_attribute attr_custom;
         struct pvr2_ctrl *cptr;
+        int ctl_id;
         struct pvr2_sysfs *chptr;
         struct pvr2_sysfs_ctl_item *item_next;
         struct attribute *attr_gen[7];
@@ -83,38 +83,29 @@ struct pvr2_sysfs_class {
         struct class class;
 };
 
-static ssize_t show_name(int id,struct device *class_dev,char *buf)
+static ssize_t show_name(struct device *class_dev,
+                         struct device_attribute *attr,
+                         char *buf)
 {
-        struct pvr2_ctrl *cptr;
-        struct pvr2_sysfs *sfp;
+        struct pvr2_sysfs_ctl_item *cip;
         const char *name;
-
-        sfp = (struct pvr2_sysfs *)class_dev->driver_data;
-        if (!sfp) return -EINVAL;
-        cptr = pvr2_hdw_get_ctrl_by_index(sfp->channel.hdw,id);
-        if (!cptr) return -EINVAL;
-
-        name = pvr2_ctrl_get_desc(cptr);
-        pvr2_sysfs_trace("pvr2_sysfs(%p) show_name(cid=%d) is %s",sfp,id,name);
-
+        cip = container_of(attr, struct pvr2_sysfs_ctl_item, attr_name);
+        name = pvr2_ctrl_get_desc(cip->cptr);
+        pvr2_sysfs_trace("pvr2_sysfs(%p) show_name(cid=%d) is %s",
+                         cip->chptr, cip->ctl_id, name);
         if (!name) return -EINVAL;
-
-        return scnprintf(buf,PAGE_SIZE,"%s\n",name);
+        return scnprintf(buf, PAGE_SIZE, "%s\n", name);
 }
 
-static ssize_t show_type(int id,struct device *class_dev,char *buf)
+static ssize_t show_type(struct device *class_dev,
+                         struct device_attribute *attr,
+                         char *buf)
 {
-        struct pvr2_ctrl *cptr;
-        struct pvr2_sysfs *sfp;
+        struct pvr2_sysfs_ctl_item *cip;
         const char *name;
         enum pvr2_ctl_type tp;
-
-        sfp = (struct pvr2_sysfs *)class_dev->driver_data;
-        if (!sfp) return -EINVAL;
-        cptr = pvr2_hdw_get_ctrl_by_index(sfp->channel.hdw,id);
-        if (!cptr) return -EINVAL;
-
-        tp = pvr2_ctrl_get_type(cptr);
+        cip = container_of(attr, struct pvr2_sysfs_ctl_item, attr_type);
+        tp = pvr2_ctrl_get_type(cip->cptr);
         switch (tp) {
         case pvr2_ctl_int: name = "integer"; break;
         case pvr2_ctl_enum: name = "enum"; break;
@@ -122,403 +113,178 @@ static ssize_t show_type(int id,struct device *class_dev,char *buf)
         case pvr2_ctl_bool: name = "boolean"; break;
         default: name = "?"; break;
         }
-        pvr2_sysfs_trace("pvr2_sysfs(%p) show_type(cid=%d) is %s",sfp,id,name);
-
+        pvr2_sysfs_trace("pvr2_sysfs(%p) show_type(cid=%d) is %s",
+                         cip->chptr, cip->ctl_id, name);
         if (!name) return -EINVAL;
-
-        return scnprintf(buf,PAGE_SIZE,"%s\n",name);
+        return scnprintf(buf, PAGE_SIZE, "%s\n", name);
 }
 
-static ssize_t show_min(int id,struct device *class_dev,char *buf)
+static ssize_t show_min(struct device *class_dev,
+                        struct device_attribute *attr,
+                        char *buf)
 {
-        struct pvr2_ctrl *cptr;
-        struct pvr2_sysfs *sfp;
+        struct pvr2_sysfs_ctl_item *cip;
         long val;
-
-        sfp = (struct pvr2_sysfs *)class_dev->driver_data;
-        if (!sfp) return -EINVAL;
-        cptr = pvr2_hdw_get_ctrl_by_index(sfp->channel.hdw,id);
-        if (!cptr) return -EINVAL;
-        val = pvr2_ctrl_get_min(cptr);
-
-        pvr2_sysfs_trace("pvr2_sysfs(%p) show_min(cid=%d) is %ld",sfp,id,val);
-
-        return scnprintf(buf,PAGE_SIZE,"%ld\n",val);
+        cip = container_of(attr, struct pvr2_sysfs_ctl_item, attr_min);
+        val = pvr2_ctrl_get_min(cip->cptr);
+        pvr2_sysfs_trace("pvr2_sysfs(%p) show_min(cid=%d) is %ld",
+                         cip->chptr, cip->ctl_id, val);
+        return scnprintf(buf, PAGE_SIZE, "%ld\n", val);
 }
 
-static ssize_t show_max(int id,struct device *class_dev,char *buf)
+static ssize_t show_max(struct device *class_dev,
+                        struct device_attribute *attr,
+                        char *buf)
 {
-        struct pvr2_ctrl *cptr;
-        struct pvr2_sysfs *sfp;
+        struct pvr2_sysfs_ctl_item *cip;
         long val;
-
-        sfp = (struct pvr2_sysfs *)class_dev->driver_data;
-        if (!sfp) return -EINVAL;
-        cptr = pvr2_hdw_get_ctrl_by_index(sfp->channel.hdw,id);
-        if (!cptr) return -EINVAL;
-        val = pvr2_ctrl_get_max(cptr);
-
-        pvr2_sysfs_trace("pvr2_sysfs(%p) show_max(cid=%d) is %ld",sfp,id,val);
-
-        return scnprintf(buf,PAGE_SIZE,"%ld\n",val);
+        cip = container_of(attr, struct pvr2_sysfs_ctl_item, attr_max);
+        val = pvr2_ctrl_get_max(cip->cptr);
+        pvr2_sysfs_trace("pvr2_sysfs(%p) show_max(cid=%d) is %ld",
+                         cip->chptr, cip->ctl_id, val);
+        return scnprintf(buf, PAGE_SIZE, "%ld\n", val);
 }
 
-static ssize_t show_val_norm(int id,struct device *class_dev,char *buf)
+static ssize_t show_val_norm(struct device *class_dev,
+                             struct device_attribute *attr,
+                             char *buf)
 {
-        struct pvr2_ctrl *cptr;
-        struct pvr2_sysfs *sfp;
-        int val,ret;
+        struct pvr2_sysfs_ctl_item *cip;
+        int val;
+        int ret;
         unsigned int cnt = 0;
-
-        sfp = (struct pvr2_sysfs *)class_dev->driver_data;
-        if (!sfp) return -EINVAL;
-        cptr = pvr2_hdw_get_ctrl_by_index(sfp->channel.hdw,id);
-        if (!cptr) return -EINVAL;
-
-        ret = pvr2_ctrl_get_value(cptr,&val);
+        cip = container_of(attr, struct pvr2_sysfs_ctl_item, attr_val);
+        ret = pvr2_ctrl_get_value(cip->cptr, &val);
         if (ret < 0) return ret;
-
-        ret = pvr2_ctrl_value_to_sym(cptr,~0,val,
-                                     buf,PAGE_SIZE-1,&cnt);
-
+        ret = pvr2_ctrl_value_to_sym(cip->cptr, ~0, val,
+                                     buf, PAGE_SIZE - 1, &cnt);
         pvr2_sysfs_trace("pvr2_sysfs(%p) show_val_norm(cid=%d) is %.*s (%d)",
-                         sfp,id,cnt,buf,val);
+                         cip->chptr, cip->ctl_id, cnt, buf, val);
         buf[cnt] = '\n';
         return cnt+1;
 }
 
-static ssize_t show_val_custom(int id,struct device *class_dev,char *buf)
+static ssize_t show_val_custom(struct device *class_dev,
+                               struct device_attribute *attr,
+                               char *buf)
 {
-        struct pvr2_ctrl *cptr;
-        struct pvr2_sysfs *sfp;
-        int val,ret;
+        struct pvr2_sysfs_ctl_item *cip;
+        int val;
+        int ret;
         unsigned int cnt = 0;
-
-        sfp = (struct pvr2_sysfs *)class_dev->driver_data;
-        if (!sfp) return -EINVAL;
-        cptr = pvr2_hdw_get_ctrl_by_index(sfp->channel.hdw,id);
-        if (!cptr) return -EINVAL;
-
-        ret = pvr2_ctrl_get_value(cptr,&val);
+        cip = container_of(attr, struct pvr2_sysfs_ctl_item, attr_custom);
+        ret = pvr2_ctrl_get_value(cip->cptr, &val);
         if (ret < 0) return ret;
-
-        ret = pvr2_ctrl_custom_value_to_sym(cptr,~0,val,
-                                            buf,PAGE_SIZE-1,&cnt);
-
+        ret = pvr2_ctrl_custom_value_to_sym(cip->cptr, ~0, val,
+                                            buf, PAGE_SIZE - 1, &cnt);
         pvr2_sysfs_trace("pvr2_sysfs(%p) show_val_custom(cid=%d) is %.*s (%d)",
-                         sfp,id,cnt,buf,val);
+                         cip->chptr, cip->ctl_id, cnt, buf, val);
         buf[cnt] = '\n';
         return cnt+1;
 }
 
-static ssize_t show_enum(int id,struct device *class_dev,char *buf)
+static ssize_t show_enum(struct device *class_dev,
+                         struct device_attribute *attr,
+                         char *buf)
 {
-        struct pvr2_ctrl *cptr;
-        struct pvr2_sysfs *sfp;
+        struct pvr2_sysfs_ctl_item *cip;
         long val;
-        unsigned int bcnt,ccnt,ecnt;
-
-        sfp = (struct pvr2_sysfs *)class_dev->driver_data;
-        if (!sfp) return -EINVAL;
-        cptr = pvr2_hdw_get_ctrl_by_index(sfp->channel.hdw,id);
-        if (!cptr) return -EINVAL;
-        ecnt = pvr2_ctrl_get_cnt(cptr);
+        unsigned int bcnt, ccnt, ecnt;
+        cip = container_of(attr, struct pvr2_sysfs_ctl_item, attr_enum);
+        ecnt = pvr2_ctrl_get_cnt(cip->cptr);
         bcnt = 0;
         for (val = 0; val < ecnt; val++) {
-                pvr2_ctrl_get_valname(cptr,val,buf+bcnt,PAGE_SIZE-bcnt,&ccnt);
+                pvr2_ctrl_get_valname(cip->cptr, val, buf + bcnt,
+                                      PAGE_SIZE - bcnt, &ccnt);
                 if (!ccnt) continue;
                 bcnt += ccnt;
                 if (bcnt >= PAGE_SIZE) break;
                 buf[bcnt] = '\n';
                 bcnt++;
         }
-        pvr2_sysfs_trace("pvr2_sysfs(%p) show_enum(cid=%d)",sfp,id);
+        pvr2_sysfs_trace("pvr2_sysfs(%p) show_enum(cid=%d)",
+                         cip->chptr, cip->ctl_id);
         return bcnt;
 }
 
-static ssize_t show_bits(int id,struct device *class_dev,char *buf)
+static ssize_t show_bits(struct device *class_dev,
+                         struct device_attribute *attr,
+                         char *buf)
 {
-        struct pvr2_ctrl *cptr;
-        struct pvr2_sysfs *sfp;
-        int valid_bits,msk;
-        unsigned int bcnt,ccnt;
-
-        sfp = (struct pvr2_sysfs *)class_dev->driver_data;
-        if (!sfp) return -EINVAL;
-        cptr = pvr2_hdw_get_ctrl_by_index(sfp->channel.hdw,id);
-        if (!cptr) return -EINVAL;
-        valid_bits = pvr2_ctrl_get_mask(cptr);
+        struct pvr2_sysfs_ctl_item *cip;
+        int valid_bits, msk;
+        unsigned int bcnt, ccnt;
+        cip = container_of(attr, struct pvr2_sysfs_ctl_item, attr_bits);
+        valid_bits = pvr2_ctrl_get_mask(cip->cptr);
         bcnt = 0;
         for (msk = 1; valid_bits; msk <<= 1) {
                 if (!(msk & valid_bits)) continue;
                 valid_bits &= ~msk;
-                pvr2_ctrl_get_valname(cptr,msk,buf+bcnt,PAGE_SIZE-bcnt,&ccnt);
+                pvr2_ctrl_get_valname(cip->cptr, msk, buf + bcnt,
+                                      PAGE_SIZE - bcnt, &ccnt);
                 bcnt += ccnt;
                 if (bcnt >= PAGE_SIZE) break;
                 buf[bcnt] = '\n';
                 bcnt++;
         }
-        pvr2_sysfs_trace("pvr2_sysfs(%p) show_bits(cid=%d)",sfp,id);
+        pvr2_sysfs_trace("pvr2_sysfs(%p) show_bits(cid=%d)",
+                         cip->chptr, cip->ctl_id);
         return bcnt;
 }
 
-static int store_val_any(int id,int customfl,struct pvr2_sysfs *sfp,
+static int store_val_any(struct pvr2_sysfs_ctl_item *cip, int customfl,
                          const char *buf,unsigned int count)
 {
-        struct pvr2_ctrl *cptr;
         int ret;
         int mask,val;
-
-        cptr = pvr2_hdw_get_ctrl_by_index(sfp->channel.hdw,id);
         if (customfl) {
-                ret = pvr2_ctrl_custom_sym_to_value(cptr,buf,count,&mask,&val);
+                ret = pvr2_ctrl_custom_sym_to_value(cip->cptr, buf, count,
+                                                    &mask, &val);
         } else {
-                ret = pvr2_ctrl_sym_to_value(cptr,buf,count,&mask,&val);
+                ret = pvr2_ctrl_sym_to_value(cip->cptr, buf, count,
+                                             &mask, &val);
         }
         if (ret < 0) return ret;
-        ret = pvr2_ctrl_set_mask_value(cptr,mask,val);
-        pvr2_hdw_commit_ctl(sfp->channel.hdw);
+        ret = pvr2_ctrl_set_mask_value(cip->cptr, mask, val);
+        pvr2_hdw_commit_ctl(cip->chptr->channel.hdw);
         return ret;
 }
 
-static ssize_t store_val_norm(int id,struct device *class_dev,
-                             const char *buf,size_t count)
+static ssize_t store_val_norm(struct device *class_dev,
+                              struct device_attribute *attr,
+                              const char *buf, size_t count)
 {
-        struct pvr2_sysfs *sfp;
+        struct pvr2_sysfs_ctl_item *cip;
         int ret;
-        sfp = (struct pvr2_sysfs *)class_dev->driver_data;
+        cip = container_of(attr, struct pvr2_sysfs_ctl_item, attr_val);
         pvr2_sysfs_trace("pvr2_sysfs(%p) store_val_norm(cid=%d) \"%.*s\"",
-                         sfp,id,(int)count,buf);
-        ret = store_val_any(id,0,sfp,buf,count);
+                         cip->chptr, cip->ctl_id, (int)count, buf);
+        ret = store_val_any(cip, 0, buf, count);
         if (!ret) ret = count;
         return ret;
 }
 
-static ssize_t store_val_custom(int id,struct device *class_dev,
-                                const char *buf,size_t count)
+static ssize_t store_val_custom(struct device *class_dev,
+                                struct device_attribute *attr,
+                                const char *buf, size_t count)
 {
-        struct pvr2_sysfs *sfp;
+        struct pvr2_sysfs_ctl_item *cip;
         int ret;
-        sfp = (struct pvr2_sysfs *)class_dev->driver_data;
+        cip = container_of(attr, struct pvr2_sysfs_ctl_item, attr_custom);
         pvr2_sysfs_trace("pvr2_sysfs(%p) store_val_custom(cid=%d) \"%.*s\"",
-                         sfp,id,(int)count,buf);
-        ret = store_val_any(id,1,sfp,buf,count);
+                         cip->chptr, cip->ctl_id, (int)count, buf);
+        ret = store_val_any(cip, 1, buf, count);
         if (!ret) ret = count;
         return ret;
 }
 
-/*
-  Mike Isely <isely@pobox.com> 30-April-2005
-
-  This next batch of horrible preprocessor hackery is needed because the
-  kernel's device_attribute mechanism fails to pass the actual
-  attribute through to the show / store functions, which means we have no
-  way to package up any attribute-specific parameters, like for example the
-  control id.  So we work around this brain-damage by encoding the control
-  id into the show / store functions themselves and pick the function based
-  on the control id we're setting up.  These macros try to ease the pain.
-  Yuck.
-*/
-
-#define CREATE_SHOW_INSTANCE(sf_name,ctl_id) \
-static ssize_t sf_name##_##ctl_id(struct device *class_dev, \
-struct device_attribute *attr, char *buf) \
-{ return sf_name(ctl_id,class_dev,buf); }
-
-#define CREATE_STORE_INSTANCE(sf_name,ctl_id) \
-static ssize_t sf_name##_##ctl_id(struct device *class_dev, \
-struct device_attribute *attr, const char *buf, size_t count) \
-{ return sf_name(ctl_id,class_dev,buf,count); }
-
-#define CREATE_BATCH(ctl_id) \
-CREATE_SHOW_INSTANCE(show_name,ctl_id) \
-CREATE_SHOW_INSTANCE(show_type,ctl_id) \
-CREATE_SHOW_INSTANCE(show_min,ctl_id) \
-CREATE_SHOW_INSTANCE(show_max,ctl_id) \
-CREATE_SHOW_INSTANCE(show_val_norm,ctl_id) \
-CREATE_SHOW_INSTANCE(show_val_custom,ctl_id) \
-CREATE_SHOW_INSTANCE(show_enum,ctl_id) \
-CREATE_SHOW_INSTANCE(show_bits,ctl_id) \
-CREATE_STORE_INSTANCE(store_val_norm,ctl_id) \
-CREATE_STORE_INSTANCE(store_val_custom,ctl_id) \
-
-CREATE_BATCH(0)
-CREATE_BATCH(1)
-CREATE_BATCH(2)
-CREATE_BATCH(3)
-CREATE_BATCH(4)
-CREATE_BATCH(5)
-CREATE_BATCH(6)
-CREATE_BATCH(7)
-CREATE_BATCH(8)
-CREATE_BATCH(9)
-CREATE_BATCH(10)
-CREATE_BATCH(11)
-CREATE_BATCH(12)
-CREATE_BATCH(13)
-CREATE_BATCH(14)
-CREATE_BATCH(15)
-CREATE_BATCH(16)
-CREATE_BATCH(17)
-CREATE_BATCH(18)
-CREATE_BATCH(19)
-CREATE_BATCH(20)
-CREATE_BATCH(21)
-CREATE_BATCH(22)
-CREATE_BATCH(23)
-CREATE_BATCH(24)
-CREATE_BATCH(25)
-CREATE_BATCH(26)
-CREATE_BATCH(27)
-CREATE_BATCH(28)
-CREATE_BATCH(29)
-CREATE_BATCH(30)
-CREATE_BATCH(31)
-CREATE_BATCH(32)
-CREATE_BATCH(33)
-CREATE_BATCH(34)
-CREATE_BATCH(35)
-CREATE_BATCH(36)
-CREATE_BATCH(37)
-CREATE_BATCH(38)
-CREATE_BATCH(39)
-CREATE_BATCH(40)
-CREATE_BATCH(41)
-CREATE_BATCH(42)
-CREATE_BATCH(43)
-CREATE_BATCH(44)
-CREATE_BATCH(45)
-CREATE_BATCH(46)
-CREATE_BATCH(47)
-CREATE_BATCH(48)
-CREATE_BATCH(49)
-CREATE_BATCH(50)
-CREATE_BATCH(51)
-CREATE_BATCH(52)
-CREATE_BATCH(53)
-CREATE_BATCH(54)
-CREATE_BATCH(55)
-CREATE_BATCH(56)
-CREATE_BATCH(57)
-CREATE_BATCH(58)
-CREATE_BATCH(59)
-
-struct pvr2_sysfs_func_set {
-        ssize_t (*show_name)(struct device *,
-                             struct device_attribute *attr, char *);
-        ssize_t (*show_type)(struct device *,
-                             struct device_attribute *attr, char *);
-        ssize_t (*show_min)(struct device *,
-                            struct device_attribute *attr, char *);
-        ssize_t (*show_max)(struct device *,
-                            struct device_attribute *attr, char *);
-        ssize_t (*show_enum)(struct device *,
-                             struct device_attribute *attr, char *);
-        ssize_t (*show_bits)(struct device *,
-                             struct device_attribute *attr, char *);
-        ssize_t (*show_val_norm)(struct device *,
-                                 struct device_attribute *attr, char *);
-        ssize_t (*store_val_norm)(struct device *,
-                                  struct device_attribute *attr,
-                                  const char *,size_t);
-        ssize_t (*show_val_custom)(struct device *,
-                                   struct device_attribute *attr, char *);
-        ssize_t (*store_val_custom)(struct device *,
-                                    struct device_attribute *attr,
-                                    const char *,size_t);
-};
-
-#define INIT_BATCH(ctl_id) \
-[ctl_id] = { \
-    .show_name = show_name_##ctl_id, \
-    .show_type = show_type_##ctl_id, \
-    .show_min = show_min_##ctl_id, \
-    .show_max = show_max_##ctl_id, \
-    .show_enum = show_enum_##ctl_id, \
-    .show_bits = show_bits_##ctl_id, \
-    .show_val_norm = show_val_norm_##ctl_id, \
-    .store_val_norm = store_val_norm_##ctl_id, \
-    .show_val_custom = show_val_custom_##ctl_id, \
-    .store_val_custom = store_val_custom_##ctl_id, \
-} \
-
-static struct pvr2_sysfs_func_set funcs[] = {
-        INIT_BATCH(0),
-        INIT_BATCH(1),
-        INIT_BATCH(2),
-        INIT_BATCH(3),
-        INIT_BATCH(4),
-        INIT_BATCH(5),
-        INIT_BATCH(6),
-        INIT_BATCH(7),
-        INIT_BATCH(8),
-        INIT_BATCH(9),
-        INIT_BATCH(10),
-        INIT_BATCH(11),
-        INIT_BATCH(12),
-        INIT_BATCH(13),
-        INIT_BATCH(14),
-        INIT_BATCH(15),
-        INIT_BATCH(16),
-        INIT_BATCH(17),
-        INIT_BATCH(18),
-        INIT_BATCH(19),
-        INIT_BATCH(20),
-        INIT_BATCH(21),
-        INIT_BATCH(22),
-        INIT_BATCH(23),
-        INIT_BATCH(24),
-        INIT_BATCH(25),
-        INIT_BATCH(26),
-        INIT_BATCH(27),
-        INIT_BATCH(28),
-        INIT_BATCH(29),
-        INIT_BATCH(30),
-        INIT_BATCH(31),
-        INIT_BATCH(32),
-        INIT_BATCH(33),
-        INIT_BATCH(34),
-        INIT_BATCH(35),
-        INIT_BATCH(36),
-        INIT_BATCH(37),
-        INIT_BATCH(38),
-        INIT_BATCH(39),
-        INIT_BATCH(40),
-        INIT_BATCH(41),
-        INIT_BATCH(42),
-        INIT_BATCH(43),
-        INIT_BATCH(44),
-        INIT_BATCH(45),
-        INIT_BATCH(46),
-        INIT_BATCH(47),
-        INIT_BATCH(48),
-        INIT_BATCH(49),
-        INIT_BATCH(50),
-        INIT_BATCH(51),
-        INIT_BATCH(52),
-        INIT_BATCH(53),
-        INIT_BATCH(54),
-        INIT_BATCH(55),
-        INIT_BATCH(56),
-        INIT_BATCH(57),
-        INIT_BATCH(58),
-        INIT_BATCH(59),
-};
-
-
 static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id)
 {
         struct pvr2_sysfs_ctl_item *cip;
-        struct pvr2_sysfs_func_set *fp;
         struct pvr2_ctrl *cptr;
         unsigned int cnt,acnt;
         int ret;
 
-        if ((ctl_id < 0) || (ctl_id >= ARRAY_SIZE(funcs))) {
-                return;
-        }
-
-        fp = funcs + ctl_id;
         cptr = pvr2_hdw_get_ctrl_by_index(sfp->channel.hdw,ctl_id);
         if (!cptr) return;
 
@@ -527,6 +293,7 @@ static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id)
         pvr2_sysfs_trace("Creating pvr2_sysfs_ctl_item id=%p",cip);
 
         cip->cptr = cptr;
+        cip->ctl_id = ctl_id;
 
         cip->chptr = sfp;
         cip->item_next = NULL;
@@ -539,19 +306,19 @@ static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id)
 
         cip->attr_name.attr.name = "name";
         cip->attr_name.attr.mode = S_IRUGO;
-        cip->attr_name.show = fp->show_name;
+        cip->attr_name.show = show_name;
 
         cip->attr_type.attr.name = "type";
         cip->attr_type.attr.mode = S_IRUGO;
-        cip->attr_type.show = fp->show_type;
+        cip->attr_type.show = show_type;
 
         cip->attr_min.attr.name = "min_val";
         cip->attr_min.attr.mode = S_IRUGO;
-        cip->attr_min.show = fp->show_min;
+        cip->attr_min.show = show_min;
 
         cip->attr_max.attr.name = "max_val";
         cip->attr_max.attr.mode = S_IRUGO;
-        cip->attr_max.show = fp->show_max;
+        cip->attr_max.show = show_max;
 
         cip->attr_val.attr.name = "cur_val";
         cip->attr_val.attr.mode = S_IRUGO;
@@ -561,11 +328,11 @@ static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id)
 
         cip->attr_enum.attr.name = "enum_val";
         cip->attr_enum.attr.mode = S_IRUGO;
-        cip->attr_enum.show = fp->show_enum;
+        cip->attr_enum.show = show_enum;
 
         cip->attr_bits.attr.name = "bit_val";
         cip->attr_bits.attr.mode = S_IRUGO;
-        cip->attr_bits.show = fp->show_bits;
+        cip->attr_bits.show = show_bits;
 
         if (pvr2_ctrl_is_writable(cptr)) {
                 cip->attr_val.attr.mode |= S_IWUSR|S_IWGRP;
@@ -576,12 +343,12 @@ static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id)
         cip->attr_gen[acnt++] = &cip->attr_name.attr;
         cip->attr_gen[acnt++] = &cip->attr_type.attr;
         cip->attr_gen[acnt++] = &cip->attr_val.attr;
-        cip->attr_val.show = fp->show_val_norm;
-        cip->attr_val.store = fp->store_val_norm;
+        cip->attr_val.show = show_val_norm;
+        cip->attr_val.store = store_val_norm;
         if (pvr2_ctrl_has_custom_symbols(cptr)) {
                 cip->attr_gen[acnt++] = &cip->attr_custom.attr;
-                cip->attr_custom.show = fp->show_val_custom;
-                cip->attr_custom.store = fp->store_val_custom;
+                cip->attr_custom.show = show_val_custom;
+                cip->attr_custom.store = store_val_custom;
         }
         switch (pvr2_ctrl_get_type(cptr)) {
         case pvr2_ctl_enum:
diff --git a/drivers/media/video/pvrusb2/pvrusb2-sysfs.h b/drivers/media/video/pvrusb2/pvrusb2-sysfs.h
index ff9373b47f8f..6d875bfe7991 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-sysfs.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-sysfs.h
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *
diff --git a/drivers/media/video/pvrusb2/pvrusb2-tuner.c b/drivers/media/video/pvrusb2/pvrusb2-tuner.c
index 05e65ce2e3a9..07775d1aad4e 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-tuner.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-tuner.c
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
diff --git a/drivers/media/video/pvrusb2/pvrusb2-tuner.h b/drivers/media/video/pvrusb2/pvrusb2-tuner.h
index 556f12aa9160..ef4afaf37b0a 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-tuner.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-tuner.h
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *
diff --git a/drivers/media/video/pvrusb2/pvrusb2-util.h b/drivers/media/video/pvrusb2/pvrusb2-util.h
index e53aee416f56..92b75544ee2e 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-util.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-util.h
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index e9b5d4e91327..0d72dc470fef 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.h b/drivers/media/video/pvrusb2/pvrusb2-v4l2.h
index 9a995e2d2256..34c011a7b107 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.h
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *
diff --git a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
index 2433a3160041..4059648c7056 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
diff --git a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.h b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.h
index 2b917fda02e4..4ff5b892b303 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.h
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
diff --git a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c b/drivers/media/video/pvrusb2/pvrusb2-wm8775.c
index 66b4d36ef765..f6fcf0ac6118 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-wm8775.c
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
diff --git a/drivers/media/video/pvrusb2/pvrusb2-wm8775.h b/drivers/media/video/pvrusb2/pvrusb2-wm8775.h
index 8aaeff4e1e20..807090961255 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-wm8775.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-wm8775.h
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
diff --git a/drivers/media/video/pvrusb2/pvrusb2.h b/drivers/media/video/pvrusb2/pvrusb2.h
index 1a9a4baf12b8..240de9b35661 100644
--- a/drivers/media/video/pvrusb2/pvrusb2.h
+++ b/drivers/media/video/pvrusb2/pvrusb2.h
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>