V4L/DVB (6692): pvrusb2: Centralize device specific attributes into a single place

The pvrusb2 driver currently supports two variants of the Hauppauge
PVR USB2.  However there are other hardware types potentially
supportable, but the driver at the moment is not structured to make it
easy to describe these minor variations.  This changeset is the first
set of changes to make such additional device support possible.
Device attributes are held in several tables all contained within
pvrusb2-devattr.c; all other device-specific driver behavior now
derives from these tables.

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

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
index f8b7bd1e0d89..7721ec85d572 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
@@ -980,14 +980,16 @@ void pvr2_i2c_core_init(struct pvr2_hdw *hdw)
                 printk(KERN_INFO "%s: IR disabled\n",hdw->name);
                 hdw->i2c_func[0x18] = i2c_black_hole;
         } else if (ir_mode[hdw->unit_number] == 1) {
-                if (hdw->hdw_type == PVR2_HDW_TYPE_24XXX) {
+                if (hdw->hdw_desc->flag_has_cx25840) {
                         hdw->i2c_func[0x18] = i2c_24xxx_ir;
                 }
         }
-        if (hdw->hdw_type == PVR2_HDW_TYPE_24XXX) {
-                hdw->i2c_func[0x1b] = i2c_hack_wm8775;
+        if (hdw->hdw_desc->flag_has_cx25840) {
                 hdw->i2c_func[0x44] = i2c_hack_cx25840;
         }
+        if (hdw->hdw_desc->flag_has_wm8775) {
+                hdw->i2c_func[0x1b] = i2c_hack_wm8775;
+        }
 
         // Configure the adapter and set up everything else related to it.
         memcpy(&hdw->i2c_adap,&pvr2_i2c_adap_template,sizeof(hdw->i2c_adap));