Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[media] tveeprom: get rid of unused arg on tveeprom_hauppauge_analog()

tveeprom_hauppauge_analog() used to need the I2C adapter in
order to print debug messages. As it now uses pr_foo() facilities
since commit 6037b3ca28f4 ("[media] tveeprom: print log messages
using pr_foo()"), the first argument of the function is not
needed anymore.

So, get rid of it.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

+16 -21
+2 -2
drivers/media/common/tveeprom.c
··· 420 420 return 0; 421 421 } 422 422 423 - void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee, 424 - unsigned char *eeprom_data) 423 + void tveeprom_hauppauge_analog(struct tveeprom *tvee, 424 + unsigned char *eeprom_data) 425 425 { 426 426 /* ---------------------------------------------- 427 427 ** The hauppauge eeprom format is tagged
+1 -1
drivers/media/pci/bt8xx/bttv-cards.c
··· 3717 3717 { 3718 3718 struct tveeprom tv; 3719 3719 3720 - tveeprom_hauppauge_analog(&btv->i2c_client, &tv, eeprom_data); 3720 + tveeprom_hauppauge_analog(&tv, eeprom_data); 3721 3721 btv->tuner_type = tv.tuner_type; 3722 3722 btv->has_radio = tv.has_radio; 3723 3723
+1 -1
drivers/media/pci/cx18/cx18-driver.c
··· 339 339 case CX18_CARD_HVR_1600_ESMT: 340 340 case CX18_CARD_HVR_1600_SAMSUNG: 341 341 case CX18_CARD_HVR_1600_S5H1411: 342 - tveeprom_hauppauge_analog(c, tv, eedata); 342 + tveeprom_hauppauge_analog(tv, eedata); 343 343 break; 344 344 case CX18_CARD_YUAN_MPC718: 345 345 case CX18_CARD_GOTVIEW_PCI_DVD3:
+1 -2
drivers/media/pci/cx23885/cx23885-cards.c
··· 1143 1143 { 1144 1144 struct tveeprom tv; 1145 1145 1146 - tveeprom_hauppauge_analog(&dev->i2c_bus[0].i2c_client, &tv, 1147 - eeprom_data); 1146 + tveeprom_hauppauge_analog(&tv, eeprom_data); 1148 1147 1149 1148 /* Make sure we support the board model */ 1150 1149 switch (tv.model) {
+1 -1
drivers/media/pci/cx88/cx88-cards.c
··· 2854 2854 { 2855 2855 struct tveeprom tv; 2856 2856 2857 - tveeprom_hauppauge_analog(&core->i2c_client, &tv, eeprom_data); 2857 + tveeprom_hauppauge_analog(&tv, eeprom_data); 2858 2858 core->board.tuner_type = tv.tuner_type; 2859 2859 core->tuner_formats = tv.tuner_formats; 2860 2860 core->board.radio.type = tv.has_radio ? CX88_RADIO : 0;
+1 -1
drivers/media/pci/ivtv/ivtv-driver.c
··· 408 408 409 409 itv->i2c_client.addr = 0xA0 >> 1; 410 410 tveeprom_read(&itv->i2c_client, eedata, sizeof(eedata)); 411 - tveeprom_hauppauge_analog(&itv->i2c_client, tv, eedata); 411 + tveeprom_hauppauge_analog(tv, eedata); 412 412 } 413 413 414 414 static void ivtv_process_eeprom(struct ivtv *itv)
+1 -1
drivers/media/pci/saa7134/saa7134-cards.c
··· 7319 7319 { 7320 7320 struct tveeprom tv; 7321 7321 7322 - tveeprom_hauppauge_analog(&dev->i2c_client, &tv, eeprom_data); 7322 + tveeprom_hauppauge_analog(&tv, eeprom_data); 7323 7323 7324 7324 /* Make sure we support the board model */ 7325 7325 switch (tv.model) {
+1 -3
drivers/media/pci/saa7164/saa7164-cards.c
··· 780 780 { 781 781 struct tveeprom tv; 782 782 783 - /* TODO: Assumption: eeprom on bus 0 */ 784 - tveeprom_hauppauge_analog(&dev->i2c_bus[0].i2c_client, &tv, 785 - eeprom_data); 783 + tveeprom_hauppauge_analog(&tv, eeprom_data); 786 784 787 785 /* Make sure we support the board model */ 788 786 switch (tv.model) {
+1 -1
drivers/media/usb/au0828/au0828-cards.c
··· 153 153 { 154 154 struct tveeprom tv; 155 155 156 - tveeprom_hauppauge_analog(&dev->i2c_client, &tv, eeprom_data); 156 + tveeprom_hauppauge_analog(&tv, eeprom_data); 157 157 dev->board.tuner_type = tv.tuner_type; 158 158 159 159 /* Make sure we support the board model */
+1 -2
drivers/media/usb/cx231xx/cx231xx-cards.c
··· 1165 1165 e->client.addr = 0xa0 >> 1; 1166 1166 1167 1167 read_eeprom(dev, &e->client, e->eeprom, sizeof(e->eeprom)); 1168 - tveeprom_hauppauge_analog(&e->client, 1169 - &e->tvee, e->eeprom + 0xc0); 1168 + tveeprom_hauppauge_analog(&e->tvee, e->eeprom + 0xc0); 1170 1169 kfree(e); 1171 1170 break; 1172 1171 }
+2 -2
drivers/media/usb/dvb-usb-v2/mxl111sf.c
··· 938 938 ret = i2c_transfer(&d->i2c_adap, msg, 2); 939 939 if (mxl_fail(ret)) 940 940 return 0; 941 - tveeprom_hauppauge_analog(NULL, &state->tv, (0x84 == eeprom[0xa0]) ? 942 - eeprom + 0xa0 : eeprom + 0x80); 941 + tveeprom_hauppauge_analog(&state->tv, (0x84 == eeprom[0xa0]) ? 942 + eeprom + 0xa0 : eeprom + 0x80); 943 943 #if 0 944 944 switch (state->tv.model) { 945 945 case 117001:
+1 -2
drivers/media/usb/em28xx/em28xx-cards.c
··· 2974 2974 #endif 2975 2975 /* Call first TVeeprom */ 2976 2976 2977 - dev->i2c_client[dev->def_i2c_bus].addr = 0xa0 >> 1; 2978 - tveeprom_hauppauge_analog(&dev->i2c_client[dev->def_i2c_bus], &tv, dev->eedata); 2977 + tveeprom_hauppauge_analog(&tv, dev->eedata); 2979 2978 2980 2979 dev->tuner_type = tv.tuner_type; 2981 2980
+1 -1
drivers/media/usb/pvrusb2/pvrusb2-eeprom.c
··· 121 121 if (!eeprom) 122 122 return -EINVAL; 123 123 124 - tveeprom_hauppauge_analog(NULL, &tvdata, eeprom); 124 + tveeprom_hauppauge_analog(&tvdata, eeprom); 125 125 126 126 trace_eeprom("eeprom assumed v4l tveeprom module"); 127 127 trace_eeprom("eeprom direct call results:");
+1 -1
include/media/tveeprom.h
··· 100 100 * contain 256 bytes filled with the contents of the 101 101 * eeprom read from the Hauppauge device. 102 102 */ 103 - void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee, 103 + void tveeprom_hauppauge_analog(struct tveeprom *tvee, 104 104 unsigned char *eeprom_data); 105 105 106 106 /**