diff options
Diffstat (limited to 'drivers/media/video/tda9887.c')
-rw-r--r-- | drivers/media/video/tda9887.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c index 080bd308073b..dfa2964d7ef3 100644 --- a/drivers/media/video/tda9887.c +++ b/drivers/media/video/tda9887.c | |||
@@ -24,14 +24,14 @@ static int tda9887_debug; | |||
24 | module_param_named(debug, tda9887_debug, int, 0644); | 24 | module_param_named(debug, tda9887_debug, int, 0644); |
25 | 25 | ||
26 | #define tda9887_info(fmt, arg...) do {\ | 26 | #define tda9887_info(fmt, arg...) do {\ |
27 | printk(KERN_INFO "%s %d-%04x: " fmt, priv->t->i2c.name, \ | 27 | printk(KERN_INFO "%s %d-%04x: " fmt, priv->t->i2c->name, \ |
28 | i2c_adapter_id(priv->t->i2c.adapter), \ | 28 | i2c_adapter_id(priv->t->i2c->adapter), \ |
29 | priv->t->i2c.addr, ##arg); } while (0) | 29 | priv->t->i2c->addr, ##arg); } while (0) |
30 | #define tda9887_dbg(fmt, arg...) do {\ | 30 | #define tda9887_dbg(fmt, arg...) do {\ |
31 | if (tda9887_debug) \ | 31 | if (tda9887_debug) \ |
32 | printk(KERN_INFO "%s %d-%04x: " fmt, priv->t->i2c.name, \ | 32 | printk(KERN_INFO "%s %d-%04x: " fmt, priv->t->i2c->name, \ |
33 | i2c_adapter_id(priv->t->i2c.adapter), \ | 33 | i2c_adapter_id(priv->t->i2c->adapter), \ |
34 | priv->t->i2c.addr, ##arg); } while (0) | 34 | priv->t->i2c->addr, ##arg); } while (0) |
35 | 35 | ||
36 | struct tda9887_priv { | 36 | struct tda9887_priv { |
37 | struct tuner_i2c_props i2c_props; | 37 | struct tuner_i2c_props i2c_props; |
@@ -651,14 +651,14 @@ int tda9887_attach(struct tuner *t) | |||
651 | return -ENOMEM; | 651 | return -ENOMEM; |
652 | t->fe.analog_demod_priv = priv; | 652 | t->fe.analog_demod_priv = priv; |
653 | 653 | ||
654 | priv->i2c_props.addr = t->i2c.addr; | 654 | priv->i2c_props.addr = t->i2c->addr; |
655 | priv->i2c_props.adap = t->i2c.adapter; | 655 | priv->i2c_props.adap = t->i2c->adapter; |
656 | priv->t = t; | 656 | priv->t = t; |
657 | 657 | ||
658 | strlcpy(t->i2c.name, "tda9887", sizeof(t->i2c.name)); | 658 | strlcpy(t->i2c->name, "tda9887", sizeof(t->i2c->name)); |
659 | 659 | ||
660 | tda9887_info("tda988[5/6/7] found @ 0x%x (%s)\n", t->i2c.addr, | 660 | tda9887_info("tda988[5/6/7] found @ 0x%x (%s)\n", t->i2c->addr, |
661 | t->i2c.driver->driver.name); | 661 | t->i2c->driver->driver.name); |
662 | 662 | ||
663 | t->fe.ops.analog_demod_ops = &tda9887_tuner_ops; | 663 | t->fe.ops.analog_demod_ops = &tda9887_tuner_ops; |
664 | 664 | ||