--- initial
+++ final
@@ -1,163 +1,163 @@
 static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data) {
   struct tveeprom tv;
-  tveeprom_hauppauge_analog(&dev->i2c_bus[0].i2c_client, &tv, eeprom_data);
+  tveeprom_hauppauge_analog(&tv, eeprom_data);
   /* Make sure we support the board model */
   switch (tv.model) {
   case 22001:
     /* WinTV-HVR1270 (PCIe, Retail, half height)
      * ATSC/QAM and basic analog, IR Blast */
   case 22009:
     /* WinTV-HVR1210 (PCIe, Retail, half height)
      * DVB-T and basic analog, IR Blast */
   case 22011:
     /* WinTV-HVR1270 (PCIe, Retail, half height)
      * ATSC/QAM and basic analog, IR Recv */
   case 22019:
     /* WinTV-HVR1210 (PCIe, Retail, half height)
      * DVB-T and basic analog, IR Recv */
   case 22021:
     /* WinTV-HVR1275 (PCIe, Retail, half height)
      * ATSC/QAM and basic analog, IR Recv */
   case 22029:
     /* WinTV-HVR1210 (PCIe, Retail, half height)
      * DVB-T and basic analog, IR Recv */
   case 22101:
     /* WinTV-HVR1270 (PCIe, Retail, full height)
      * ATSC/QAM and basic analog, IR Blast */
   case 22109:
     /* WinTV-HVR1210 (PCIe, Retail, full height)
      * DVB-T and basic analog, IR Blast */
   case 22111:
     /* WinTV-HVR1270 (PCIe, Retail, full height)
      * ATSC/QAM and basic analog, IR Recv */
   case 22119:
     /* WinTV-HVR1210 (PCIe, Retail, full height)
      * DVB-T and basic analog, IR Recv */
   case 22121:
     /* WinTV-HVR1275 (PCIe, Retail, full height)
      * ATSC/QAM and basic analog, IR Recv */
   case 22129:
     /* WinTV-HVR1210 (PCIe, Retail, full height)
      * DVB-T and basic analog, IR Recv */
   case 71009:
     /* WinTV-HVR1200 (PCIe, Retail, full height)
      * DVB-T and basic analog */
   case 71100:
     /* WinTV-ImpactVCB-e (PCIe, Retail, half height)
      * Basic analog */
   case 71359:
     /* WinTV-HVR1200 (PCIe, OEM, half height)
      * DVB-T and basic analog */
   case 71439:
     /* WinTV-HVR1200 (PCIe, OEM, half height)
      * DVB-T and basic analog */
   case 71449:
     /* WinTV-HVR1200 (PCIe, OEM, full height)
      * DVB-T and basic analog */
   case 71939:
     /* WinTV-HVR1200 (PCIe, OEM, half height)
      * DVB-T and basic analog */
   case 71949:
     /* WinTV-HVR1200 (PCIe, OEM, full height)
      * DVB-T and basic analog */
   case 71959:
     /* WinTV-HVR1200 (PCIe, OEM, full height)
      * DVB-T and basic analog */
   case 71979:
     /* WinTV-HVR1200 (PCIe, OEM, half height)
      * DVB-T and basic analog */
   case 71999:
     /* WinTV-HVR1200 (PCIe, OEM, full height)
      * DVB-T and basic analog */
   case 76601:
     /* WinTV-HVR1800lp (PCIe, Retail, No IR, Dual
             channel ATSC and MPEG2 HW Encoder */
   case 77001:
     /* WinTV-HVR1500 (Express Card, OEM, No IR, ATSC
             and Basic analog */
   case 77011:
     /* WinTV-HVR1500 (Express Card, Retail, No IR, ATSC
             and Basic analog */
   case 77041:
     /* WinTV-HVR1500Q (Express Card, OEM, No IR, ATSC/QAM
             and Basic analog */
   case 77051:
     /* WinTV-HVR1500Q (Express Card, Retail, No IR, ATSC/QAM
             and Basic analog */
   case 78011:
     /* WinTV-HVR1800 (PCIe, Retail, 3.5mm in, IR, No FM,
             Dual channel ATSC and MPEG2 HW Encoder */
   case 78501:
     /* WinTV-HVR1800 (PCIe, OEM, RCA in, No IR, FM,
             Dual channel ATSC and MPEG2 HW Encoder */
   case 78521:
     /* WinTV-HVR1800 (PCIe, OEM, RCA in, No IR, FM,
             Dual channel ATSC and MPEG2 HW Encoder */
   case 78531:
     /* WinTV-HVR1800 (PCIe, OEM, RCA in, No IR, No FM,
             Dual channel ATSC and MPEG2 HW Encoder */
   case 78631:
     /* WinTV-HVR1800 (PCIe, OEM, No IR, No FM,
             Dual channel ATSC and MPEG2 HW Encoder */
   case 79001:
     /* WinTV-HVR1250 (PCIe, Retail, IR, full height,
             ATSC and Basic analog */
   case 79101:
     /* WinTV-HVR1250 (PCIe, Retail, IR, half height,
             ATSC and Basic analog */
   case 79501:
     /* WinTV-HVR1250 (PCIe, No IR, half height,
             ATSC [at least] and Basic analog) */
   case 79561:
     /* WinTV-HVR1250 (PCIe, OEM, No IR, half height,
             ATSC and Basic analog */
   case 79571:
     /* WinTV-HVR1250 (PCIe, OEM, No IR, full height,
      ATSC and Basic analog */
   case 79671:
     /* WinTV-HVR1250 (PCIe, OEM, No IR, half height,
             ATSC and Basic analog */
   case 80019:
     /* WinTV-HVR1400 (Express Card, Retail, IR,
      * DVB-T and Basic analog */
   case 81509:
     /* WinTV-HVR1700 (PCIe, OEM, No IR, half height)
      * DVB-T and MPEG2 HW Encoder */
   case 81519:
     /* WinTV-HVR1700 (PCIe, OEM, No IR, full height)
      * DVB-T and MPEG2 HW Encoder */
     break;
   case 85021:
     /* WinTV-HVR1850 (PCIe, Retail, 3.5mm in, IR, FM,
             Dual channel ATSC and MPEG2 HW Encoder */
     break;
   case 85721:
     /* WinTV-HVR1290 (PCIe, OEM, RCA in, IR,
             Dual channel ATSC and Basic analog */
   case 150329:
     /* WinTV-HVR5525 (PCIe, DVB-S/S2, DVB-T/T2/C) */
     break;
   case 166100:
     /* WinTV-QuadHD (DVB) Tuner Pair 1 (PCIe, IR, half height,
        DVB-T/T2/C, DVB-T/T2/C */
     break;
   case 166101:
     /* WinTV-QuadHD (DVB) Tuner Pair 2 (PCIe, IR, half height,
        DVB-T/T2/C, DVB-T/T2/C */
     break;
   case 165100:
     /*
      * WinTV-QuadHD (ATSC) Tuner Pair 1 (PCIe, IR, half height,
      * ATSC, ATSC
      */
     break;
   case 165101:
     /*
      * WinTV-QuadHD (DVB) Tuner Pair 2 (PCIe, IR, half height,
      * ATSC, ATSC
      */
     break;
   default: pr_warn("%s: warning: unknown hauppauge model #%d\n", dev->name, tv.model); break;
   }
   pr_info("%s: hauppauge eeprom: model=%d\n", dev->name, tv.model);
 }<sep>@@
expression e1,e2,e3;
@@
tveeprom_hauppauge_analog(
- e1,
  e2,e3)