V4L/DVB (6773): pvrusb2: rework device descriptor layout

The pvrusb2 driver tries to keep all device specific attributes in a
single data structure in one source file.  This change further cleans
up how that table is set up.  We now try to group everything together
for each specific device, and the number of symbols exported from this
module has now been reduced to a single global.

Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 1 insertions, 8 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 54d2c4ab7a31..41ae980405ed 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -1813,7 +1813,6 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
 {
         unsigned int idx,cnt1,cnt2;
         struct pvr2_hdw *hdw;
-        unsigned int hdw_type;
         int valid_std_mask;
         struct pvr2_ctrl *cptr;
         const struct pvr2_device_desc *hdw_desc;
@@ -1821,13 +1820,7 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
         struct v4l2_queryctrl qctrl;
         struct pvr2_ctl_info *ciptr;
 
-        hdw_type = devid - pvr2_device_table;
-        if (hdw_type >= pvr2_device_count) {
-                pvr2_trace(PVR2_TRACE_ERROR_LEGS,
-                           "Bogus device type of %u reported",hdw_type);
-                return NULL;
-        }
-        hdw_desc = pvr2_device_descriptions + hdw_type;
+        hdw_desc = (const struct pvr2_device_desc *)(devid->driver_info);
 
         hdw = kzalloc(sizeof(*hdw),GFP_KERNEL);
         pvr2_trace(PVR2_TRACE_INIT,"pvr2_hdw_create: hdw=%p, type \"%s\"",