1 files changed, 30 insertions, 44 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index add3395d3248..0c745b142fb7 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -142,6 +142,15 @@ static const unsigned char *module_i2c_addresses[] = {
 };
 
 
+static const char *ir_scheme_names[] = {
+        [PVR2_IR_SCHEME_NONE] = "none",
+        [PVR2_IR_SCHEME_29XXX] = "29xxx",
+        [PVR2_IR_SCHEME_24XXX] = "24xxx (29xxx emulation)",
+        [PVR2_IR_SCHEME_24XXX_MCE] = "24xxx (MCE device)",
+        [PVR2_IR_SCHEME_ZILOG] = "Zilog",
+};
+
+
 /* Define the list of additional controls we'll dynamically construct based
    on query of the cx2341x module. */
 struct pvr2_mpeg_ids {
@@ -2170,7 +2179,7 @@ static void pvr2_hdw_setup_low(struct pvr2_hdw *hdw)
         }
 
         /* Take the IR chip out of reset, if appropriate */
-        if (hdw->hdw_desc->ir_scheme == PVR2_IR_SCHEME_ZILOG) {
+        if (hdw->ir_scheme_active == PVR2_IR_SCHEME_ZILOG) {
                 pvr2_issue_simple_cmd(hdw,
                                       FX2CMD_HCW_ZILOG_RESET |
                                       (1 << 8) |
@@ -2451,6 +2460,7 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
                                 GFP_KERNEL);
         if (!hdw->controls) goto fail;
         hdw->hdw_desc = hdw_desc;
+        hdw->ir_scheme_active = hdw->hdw_desc->ir_scheme;
         for (idx = 0; idx < hdw->control_cnt; idx++) {
                 cptr = hdw->controls + idx;
                 cptr->hdw = hdw;
@@ -4809,6 +4819,12 @@ static unsigned int pvr2_hdw_report_unlocked(struct pvr2_hdw *hdw,int which,
                         stats.buffers_processed,
                         stats.buffers_failed);
         }
+        case 6: {
+                unsigned int id = hdw->ir_scheme_active;
+                return scnprintf(buf, acnt, "ir scheme: id=%d %s", id,
+                                 (id >= ARRAY_SIZE(ir_scheme_names) ?
+                                  "?" : ir_scheme_names[id]));
+        }
         default: break;
         }
         return 0;
@@ -4825,65 +4841,35 @@ static unsigned int pvr2_hdw_report_clients(struct pvr2_hdw *hdw,
         unsigned int tcnt = 0;
         unsigned int ccnt;
         struct i2c_client *client;
-        struct list_head *item;
-        void *cd;
         const char *p;
         unsigned int id;
 
-        ccnt = scnprintf(buf, acnt, "Associated v4l2-subdev drivers:");
+        ccnt = scnprintf(buf, acnt, "Associated v4l2-subdev drivers and I2C clients:\n");
         tcnt += ccnt;
         v4l2_device_for_each_subdev(sd, &hdw->v4l2_dev) {
                 id = sd->grp_id;
                 p = NULL;
                 if (id < ARRAY_SIZE(module_names)) p = module_names[id];
                 if (p) {
-                        ccnt = scnprintf(buf + tcnt, acnt - tcnt, " %s", p);
+                        ccnt = scnprintf(buf + tcnt, acnt - tcnt, "  %s:", p);
                         tcnt += ccnt;
                 } else {
                         ccnt = scnprintf(buf + tcnt, acnt - tcnt,
-                                         " (unknown id=%u)", id);
+                                         "  (unknown id=%u):", id);
                         tcnt += ccnt;
                 }
-        }
-        ccnt = scnprintf(buf + tcnt, acnt - tcnt, "\n");
-        tcnt += ccnt;
-
-        ccnt = scnprintf(buf + tcnt, acnt - tcnt, "I2C clients:\n");
-        tcnt += ccnt;
-
-        mutex_lock(&hdw->i2c_adap.clist_lock);
-        list_for_each(item, &hdw->i2c_adap.clients) {
-                client = list_entry(item, struct i2c_client, list);
-                ccnt = scnprintf(buf + tcnt, acnt - tcnt,
-                                 "  %s: i2c=%02x", client->name, client->addr);
-                tcnt += ccnt;
-                cd = i2c_get_clientdata(client);
-                v4l2_device_for_each_subdev(sd, &hdw->v4l2_dev) {
-                        if (cd == sd) {
-                                id = sd->grp_id;
-                                p = NULL;
-                                if (id < ARRAY_SIZE(module_names)) {
-                                        p = module_names[id];
-                                }
-                                if (p) {
-                                        ccnt = scnprintf(buf + tcnt,
-                                                         acnt - tcnt,
-                                                         " subdev=%s", p);
-                                        tcnt += ccnt;
-                                } else {
-                                        ccnt = scnprintf(buf + tcnt,
-                                                         acnt - tcnt,
-                                                         " subdev= id %u)",
-                                                         id);
-                                        tcnt += ccnt;
-                                }
-                                break;
-                        }
+                client = v4l2_get_subdevdata(sd);
+                if (client) {
+                        ccnt = scnprintf(buf + tcnt, acnt - tcnt,
+                                         " %s @ %02x\n", client->name,
+                                         client->addr);
+                        tcnt += ccnt;
+                } else {
+                        ccnt = scnprintf(buf + tcnt, acnt - tcnt,
+                                         " no i2c client\n");
+                        tcnt += ccnt;
                 }
-                ccnt = scnprintf(buf + tcnt, acnt - tcnt, "\n");
-                tcnt += ccnt;
         }
-        mutex_unlock(&hdw->i2c_adap.clist_lock);
         return tcnt;
 }