9 files changed, 37 insertions, 56 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-audio.c b/drivers/media/video/pvrusb2/pvrusb2-audio.c
index ccf2a3c7ad06..10ef1a2c13ea 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-audio.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-audio.c
@@ -58,9 +58,9 @@ static const struct routing_scheme routing_schemes[] = {
 void pvr2_msp3400_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
 {
         if (hdw->input_dirty || hdw->force_dirty) {
-                struct v4l2_routing route;
                 const struct routing_scheme *sp;
                 unsigned int sid = hdw->hdw_desc->signal_routing_scheme;
+                u32 input;
 
                 pvr2_trace(PVR2_TRACE_CHIPS, "subdev msp3400 v4l2 set_stereo");
 
@@ -68,7 +68,7 @@ void pvr2_msp3400_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
                     ((sp = routing_schemes + sid) != NULL) &&
                     (hdw->input_val >= 0) &&
                     (hdw->input_val < sp->cnt)) {
-                        route.input = sp->def[hdw->input_val];
+                        input = sp->def[hdw->input_val];
                 } else {
                         pvr2_trace(PVR2_TRACE_ERROR_LEGS,
                                    "*** WARNING *** subdev msp3400 set_input:"
@@ -77,8 +77,8 @@ void pvr2_msp3400_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
                                    sid, hdw->input_val);
                         return;
                 }
-                route.output = MSP_OUTPUT(MSP_SC_IN_DSP_SCART1);
-                sd->ops->audio->s_routing(sd, &route);
+                sd->ops->audio->s_routing(sd, input,
+                        MSP_OUTPUT(MSP_SC_IN_DSP_SCART1), 0);
         }
 }
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c b/drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c
index b5c3428ebb9f..9023adf3fdcc 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c
@@ -60,16 +60,16 @@ static const struct routing_scheme routing_schemes[] = {
 void pvr2_cs53l32a_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
 {
         if (hdw->input_dirty || hdw->force_dirty) {
-                struct v4l2_routing route;
                 const struct routing_scheme *sp;
                 unsigned int sid = hdw->hdw_desc->signal_routing_scheme;
+                u32 input;
                 pvr2_trace(PVR2_TRACE_CHIPS, "subdev v4l2 set_input(%d)",
                            hdw->input_val);
                 if ((sid < ARRAY_SIZE(routing_schemes)) &&
                     ((sp = routing_schemes + sid) != NULL) &&
                     (hdw->input_val >= 0) &&
                     (hdw->input_val < sp->cnt)) {
-                        route.input = sp->def[hdw->input_val];
+                        input = sp->def[hdw->input_val];
                 } else {
                         pvr2_trace(PVR2_TRACE_ERROR_LEGS,
                                    "*** WARNING *** subdev v4l2 set_input:"
@@ -78,8 +78,7 @@ void pvr2_cs53l32a_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
                                    sid, hdw->input_val);
                         return;
                 }
-                route.output = 0;
-                sd->ops->audio->s_routing(sd, &route);
+                sd->ops->audio->s_routing(sd, input, 0, 0);
         }
 }
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
index 203f54cd18a1..1b992b847198 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
@@ -137,14 +137,12 @@ int pvr2_ctrl_get_min(struct pvr2_ctrl *cptr)
 int pvr2_ctrl_get_def(struct pvr2_ctrl *cptr, int *valptr)
 {
         int ret = 0;
-        if (!cptr) return 0;
+        if (!cptr) return -EINVAL;
         LOCK_TAKE(cptr->hdw->big_lock); do {
-                if (cptr->info->type == pvr2_ctl_int) {
-                        if (cptr->info->get_def_value) {
-                                ret = cptr->info->get_def_value(cptr, valptr);
-                        } else {
-                                *valptr = cptr->info->default_value;
-                        }
+                if (cptr->info->get_def_value) {
+                        ret = cptr->info->get_def_value(cptr, valptr);
+                } else {
+                        *valptr = cptr->info->default_value;
                 }
         } while(0); LOCK_GIVE(cptr->hdw->big_lock);
         return ret;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
index 4e017ff26c36..05e52358ae49 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
@@ -105,14 +105,11 @@ void pvr2_cx25840_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
 {
         pvr2_trace(PVR2_TRACE_CHIPS, "subdev cx2584x update...");
         if (hdw->input_dirty || hdw->force_dirty) {
-                struct v4l2_routing route;
                 enum cx25840_video_input vid_input;
                 enum cx25840_audio_input aud_input;
                 const struct routing_scheme *sp;
                 unsigned int sid = hdw->hdw_desc->signal_routing_scheme;
 
-                memset(&route, 0, sizeof(route));
-
                 if ((sid < ARRAY_SIZE(routing_schemes)) &&
                     ((sp = routing_schemes + sid) != NULL) &&
                     (hdw->input_val >= 0) &&
@@ -131,10 +128,8 @@ void pvr2_cx25840_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
                 pvr2_trace(PVR2_TRACE_CHIPS,
                            "subdev cx2584x set_input vid=0x%x aud=0x%x",
                            vid_input, aud_input);
-                route.input = (u32)vid_input;
-                sd->ops->video->s_routing(sd, &route);
-                route.input = (u32)aud_input;
-                sd->ops->audio->s_routing(sd, &route);
+                sd->ops->video->s_routing(sd, (u32)vid_input, 0, 0);
+                sd->ops->audio->s_routing(sd, (u32)aud_input, 0, 0);
         }
 }
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 7a65b42a4f53..d9d974a8f52a 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -2039,7 +2039,7 @@ static int pvr2_hdw_load_subdev(struct pvr2_hdw *hdw,
                            "Module ID %u:"
                            " Setting up with specified i2c address 0x%x",
                            mid, i2caddr[0]);
-                sd = v4l2_i2c_new_subdev(&hdw->i2c_adap,
+                sd = v4l2_i2c_new_subdev(&hdw->v4l2_dev, &hdw->i2c_adap,
                                          fname, fname,
                                          i2caddr[0]);
         } else {
@@ -2047,7 +2047,7 @@ static int pvr2_hdw_load_subdev(struct pvr2_hdw *hdw,
                            "Module ID %u:"
                            " Setting up with address probe list",
                            mid);
-                sd = v4l2_i2c_new_probed_subdev(&hdw->i2c_adap,
+                sd = v4l2_i2c_new_probed_subdev(&hdw->v4l2_dev, &hdw->i2c_adap,
                                                 fname, fname,
                                                 i2caddr);
         }
@@ -2185,7 +2185,7 @@ static void pvr2_hdw_setup_low(struct pvr2_hdw *hdw)
         pvr2_hdw_load_modules(hdw);
         if (!pvr2_hdw_dev_ok(hdw)) return;
 
-        v4l2_device_call_all(&hdw->v4l2_dev, 0, core, init, 0);
+        v4l2_device_call_all(&hdw->v4l2_dev, 0, core, load_fw);
 
         for (idx = 0; idx < CTRLDEF_COUNT; idx++) {
                 cptr = hdw->controls + idx;
@@ -2574,7 +2574,7 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
         hdw->ctl_read_urb = usb_alloc_urb(0,GFP_KERNEL);
         if (!hdw->ctl_read_urb) goto fail;
 
-        if (v4l2_device_register(&usb_dev->dev, &hdw->v4l2_dev) != 0) {
+        if (v4l2_device_register(&intf->dev, &hdw->v4l2_dev) != 0) {
                 pvr2_trace(PVR2_TRACE_ERROR_LEGS,
                            "Error registering with v4l core, giving up");
                 goto fail;
@@ -2926,6 +2926,7 @@ static void pvr2_subdev_update(struct pvr2_hdw *hdw)
                 pvr2_trace(PVR2_TRACE_CHIPS, "subdev tuner set_type(%d)",
                            hdw->tuner_type);
                 if (((int)(hdw->tuner_type)) >= 0) {
+                        memset(&setup, 0, sizeof(setup));
                         setup.addr = ADDR_UNSET;
                         setup.type = hdw->tuner_type;
                         setup.mode_mask = T_RADIO | T_ANALOG_TV;
@@ -2943,7 +2944,7 @@ static void pvr2_subdev_update(struct pvr2_hdw *hdw)
                         v4l2_std_id vs;
                         vs = hdw->std_mask_cur;
                         v4l2_device_call_all(&hdw->v4l2_dev, 0,
-                                             tuner, s_std, vs);
+                                             core, s_std, vs);
                 }
                 hdw->tuner_signal_stale = !0;
                 hdw->cropcap_stale = !0;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
index 9464862745fa..9af282f9e765 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
@@ -520,16 +520,6 @@ static u32 pvr2_i2c_functionality(struct i2c_adapter *adap)
         return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_I2C;
 }
 
-static int pvr2_i2c_attach_inform(struct i2c_client *client)
-{
-        return 0;
-}
-
-static int pvr2_i2c_detach_inform(struct i2c_client *client)
-{
-        return 0;
-}
-
 static struct i2c_algorithm pvr2_i2c_algo_template = {
         .master_xfer   = pvr2_i2c_xfer,
         .functionality = pvr2_i2c_functionality,
@@ -539,8 +529,6 @@ static struct i2c_adapter pvr2_i2c_adap_template = {
         .owner         = THIS_MODULE,
         .class         = 0,
         .id            = I2C_HW_B_BT848,
-        .client_register = pvr2_i2c_attach_inform,
-        .client_unregister = pvr2_i2c_detach_inform,
 };
 
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
index e20ba1e6e0ea..299c1cbc3832 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
@@ -153,14 +153,16 @@ static ssize_t show_def(struct device *class_dev,
         struct pvr2_sysfs_ctl_item *cip;
         int val;
         int ret;
+        unsigned int cnt = 0;
         cip = container_of(attr, struct pvr2_sysfs_ctl_item, attr_def);
         ret = pvr2_ctrl_get_def(cip->cptr, &val);
-        pvr2_sysfs_trace("pvr2_sysfs(%p) show_def(cid=%d) is %d, stat=%d",
-                         cip->chptr, cip->ctl_id, val, ret);
-        if (ret < 0) {
-                return ret;
-        }
-        return scnprintf(buf, PAGE_SIZE, "%d\n", val);
+        if (ret < 0) return ret;
+        ret = pvr2_ctrl_value_to_sym(cip->cptr, ~0, val,
+                                     buf, PAGE_SIZE - 1, &cnt);
+        pvr2_sysfs_trace("pvr2_sysfs(%p) show_def(cid=%d) is %.*s (%d)",
+                         cip->chptr, cip->ctl_id, cnt, buf, val);
+        buf[cnt] = '\n';
+        return cnt + 1;
 }
 
 static ssize_t show_val_norm(struct device *class_dev,
diff --git a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
index b3862f5554bd..d2fe7c8f2c3a 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
@@ -75,16 +75,17 @@ static const struct routing_scheme routing_schemes[] = {
 void pvr2_saa7115_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
 {
         if (hdw->input_dirty || hdw->force_dirty) {
-                struct v4l2_routing route;
                 const struct routing_scheme *sp;
                 unsigned int sid = hdw->hdw_desc->signal_routing_scheme;
+                u32 input;
+
                 pvr2_trace(PVR2_TRACE_CHIPS, "subdev v4l2 set_input(%d)",
                            hdw->input_val);
                 if ((sid < ARRAY_SIZE(routing_schemes)) &&
                     ((sp = routing_schemes + sid) != NULL) &&
                     (hdw->input_val >= 0) &&
                     (hdw->input_val < sp->cnt)) {
-                        route.input = sp->def[hdw->input_val];
+                        input = sp->def[hdw->input_val];
                 } else {
                         pvr2_trace(PVR2_TRACE_ERROR_LEGS,
                                    "*** WARNING *** subdev v4l2 set_input:"
@@ -93,8 +94,7 @@ void pvr2_saa7115_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
                                    sid, hdw->input_val);
                         return;
                 }
-                route.output = 0;
-                sd->ops->video->s_routing(sd, &route);
+                sd->ops->video->s_routing(sd, input, 0, 0);
         }
 }
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c b/drivers/media/video/pvrusb2/pvrusb2-wm8775.c
index 1670aa4051ce..8c1eae05aa08 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-wm8775.c
@@ -39,24 +39,22 @@
 void pvr2_wm8775_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
 {
         if (hdw->input_dirty || hdw->force_dirty) {
-                struct v4l2_routing route;
-
-                memset(&route, 0, sizeof(route));
+                u32 input;
 
                 switch (hdw->input_val) {
                 case PVR2_CVAL_INPUT_RADIO:
-                        route.input = 1;
+                        input = 1;
                         break;
                 default:
                         /* All other cases just use the second input */
-                        route.input = 2;
+                        input = 2;
                         break;
                 }
                 pvr2_trace(PVR2_TRACE_CHIPS, "subdev wm8775"
                            " set_input(val=%d route=0x%x)",
-                           hdw->input_val, route.input);
+                           hdw->input_val, input);
 
-                sd->ops->audio->s_routing(sd, &route);
+                sd->ops->audio->s_routing(sd, input, 0, 0);
         }
 }