[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 6037b3ca28
("[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>
This commit is contained in:
Родитель
3406e89ae1
Коммит
446aba663b
|
@ -420,8 +420,8 @@ static int hasRadioTuner(int tunerType)
|
|||
return 0;
|
||||
}
|
||||
|
||||
void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
|
||||
unsigned char *eeprom_data)
|
||||
void tveeprom_hauppauge_analog(struct tveeprom *tvee,
|
||||
unsigned char *eeprom_data)
|
||||
{
|
||||
/* ----------------------------------------------
|
||||
** The hauppauge eeprom format is tagged
|
||||
|
|
|
@ -3717,7 +3717,7 @@ static void hauppauge_eeprom(struct bttv *btv)
|
|||
{
|
||||
struct tveeprom tv;
|
||||
|
||||
tveeprom_hauppauge_analog(&btv->i2c_client, &tv, eeprom_data);
|
||||
tveeprom_hauppauge_analog(&tv, eeprom_data);
|
||||
btv->tuner_type = tv.tuner_type;
|
||||
btv->has_radio = tv.has_radio;
|
||||
|
||||
|
|
|
@ -339,7 +339,7 @@ void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv)
|
|||
case CX18_CARD_HVR_1600_ESMT:
|
||||
case CX18_CARD_HVR_1600_SAMSUNG:
|
||||
case CX18_CARD_HVR_1600_S5H1411:
|
||||
tveeprom_hauppauge_analog(c, tv, eedata);
|
||||
tveeprom_hauppauge_analog(tv, eedata);
|
||||
break;
|
||||
case CX18_CARD_YUAN_MPC718:
|
||||
case CX18_CARD_GOTVIEW_PCI_DVD3:
|
||||
|
|
|
@ -1143,8 +1143,7 @@ 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) {
|
||||
|
|
|
@ -2854,7 +2854,7 @@ static void hauppauge_eeprom(struct cx88_core *core, u8 *eeprom_data)
|
|||
{
|
||||
struct tveeprom tv;
|
||||
|
||||
tveeprom_hauppauge_analog(&core->i2c_client, &tv, eeprom_data);
|
||||
tveeprom_hauppauge_analog(&tv, eeprom_data);
|
||||
core->board.tuner_type = tv.tuner_type;
|
||||
core->tuner_formats = tv.tuner_formats;
|
||||
core->board.radio.type = tv.has_radio ? CX88_RADIO : 0;
|
||||
|
|
|
@ -408,7 +408,7 @@ void ivtv_read_eeprom(struct ivtv *itv, struct tveeprom *tv)
|
|||
|
||||
itv->i2c_client.addr = 0xA0 >> 1;
|
||||
tveeprom_read(&itv->i2c_client, eedata, sizeof(eedata));
|
||||
tveeprom_hauppauge_analog(&itv->i2c_client, tv, eedata);
|
||||
tveeprom_hauppauge_analog(tv, eedata);
|
||||
}
|
||||
|
||||
static void ivtv_process_eeprom(struct ivtv *itv)
|
||||
|
|
|
@ -7319,7 +7319,7 @@ static void hauppauge_eeprom(struct saa7134_dev *dev, u8 *eeprom_data)
|
|||
{
|
||||
struct tveeprom tv;
|
||||
|
||||
tveeprom_hauppauge_analog(&dev->i2c_client, &tv, eeprom_data);
|
||||
tveeprom_hauppauge_analog(&tv, eeprom_data);
|
||||
|
||||
/* Make sure we support the board model */
|
||||
switch (tv.model) {
|
||||
|
|
|
@ -780,9 +780,7 @@ static void hauppauge_eeprom(struct saa7164_dev *dev, u8 *eeprom_data)
|
|||
{
|
||||
struct tveeprom tv;
|
||||
|
||||
/* TODO: Assumption: eeprom on bus 0 */
|
||||
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) {
|
||||
|
|
|
@ -153,7 +153,7 @@ static void hauppauge_eeprom(struct au0828_dev *dev, u8 *eeprom_data)
|
|||
{
|
||||
struct tveeprom tv;
|
||||
|
||||
tveeprom_hauppauge_analog(&dev->i2c_client, &tv, eeprom_data);
|
||||
tveeprom_hauppauge_analog(&tv, eeprom_data);
|
||||
dev->board.tuner_type = tv.tuner_type;
|
||||
|
||||
/* Make sure we support the board model */
|
||||
|
|
|
@ -1165,8 +1165,7 @@ void cx231xx_card_setup(struct cx231xx *dev)
|
|||
e->client.addr = 0xa0 >> 1;
|
||||
|
||||
read_eeprom(dev, &e->client, e->eeprom, sizeof(e->eeprom));
|
||||
tveeprom_hauppauge_analog(&e->client,
|
||||
&e->tvee, e->eeprom + 0xc0);
|
||||
tveeprom_hauppauge_analog(&e->tvee, e->eeprom + 0xc0);
|
||||
kfree(e);
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -938,8 +938,8 @@ static int mxl111sf_init(struct dvb_usb_device *d)
|
|||
ret = i2c_transfer(&d->i2c_adap, msg, 2);
|
||||
if (mxl_fail(ret))
|
||||
return 0;
|
||||
tveeprom_hauppauge_analog(NULL, &state->tv, (0x84 == eeprom[0xa0]) ?
|
||||
eeprom + 0xa0 : eeprom + 0x80);
|
||||
tveeprom_hauppauge_analog(&state->tv, (0x84 == eeprom[0xa0]) ?
|
||||
eeprom + 0xa0 : eeprom + 0x80);
|
||||
#if 0
|
||||
switch (state->tv.model) {
|
||||
case 117001:
|
||||
|
|
|
@ -2974,8 +2974,7 @@ static void em28xx_card_setup(struct em28xx *dev)
|
|||
#endif
|
||||
/* Call first TVeeprom */
|
||||
|
||||
dev->i2c_client[dev->def_i2c_bus].addr = 0xa0 >> 1;
|
||||
tveeprom_hauppauge_analog(&dev->i2c_client[dev->def_i2c_bus], &tv, dev->eedata);
|
||||
tveeprom_hauppauge_analog(&tv, dev->eedata);
|
||||
|
||||
dev->tuner_type = tv.tuner_type;
|
||||
|
||||
|
|
|
@ -121,7 +121,7 @@ int pvr2_eeprom_analyze(struct pvr2_hdw *hdw)
|
|||
if (!eeprom)
|
||||
return -EINVAL;
|
||||
|
||||
tveeprom_hauppauge_analog(NULL, &tvdata, eeprom);
|
||||
tveeprom_hauppauge_analog(&tvdata, eeprom);
|
||||
|
||||
trace_eeprom("eeprom assumed v4l tveeprom module");
|
||||
trace_eeprom("eeprom direct call results:");
|
||||
|
|
|
@ -100,7 +100,7 @@ struct tveeprom {
|
|||
* contain 256 bytes filled with the contents of the
|
||||
* eeprom read from the Hauppauge device.
|
||||
*/
|
||||
void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
|
||||
void tveeprom_hauppauge_analog(struct tveeprom *tvee,
|
||||
unsigned char *eeprom_data);
|
||||
|
||||
/**
|
||||
|
|
Загрузка…
Ссылка в новой задаче