diff options
Diffstat (limited to 'drivers/media/video/cx23885')
-rw-r--r-- | drivers/media/video/cx23885/cx23885-cards.c | 6 | ||||
-rw-r--r-- | drivers/media/video/cx23885/cx23885-dvb.c | 7 | ||||
-rw-r--r-- | drivers/media/video/cx23885/cx23885.h | 2 |
3 files changed, 5 insertions, 10 deletions
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c index ee3f1b099145..2d414dad5c31 100644 --- a/drivers/media/video/cx23885/cx23885-cards.c +++ b/drivers/media/video/cx23885/cx23885-cards.c | |||
@@ -247,9 +247,9 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data) | |||
247 | /* Tuner callback function for cx23885 boards. Currently only needed | 247 | /* Tuner callback function for cx23885 boards. Currently only needed |
248 | * for HVR1500Q, which has an xc5000 tuner. | 248 | * for HVR1500Q, which has an xc5000 tuner. |
249 | */ | 249 | */ |
250 | int cx23885_tuner_callback(void *i2c_bus, int command, int arg) | 250 | int cx23885_tuner_callback(void *priv, int command, int arg) |
251 | { | 251 | { |
252 | struct cx23885_i2c *bus = i2c_bus; | 252 | struct cx23885_i2c *bus = priv; |
253 | struct cx23885_dev *dev = bus->dev; | 253 | struct cx23885_dev *dev = bus->dev; |
254 | 254 | ||
255 | switch(dev->board) { | 255 | switch(dev->board) { |
@@ -271,7 +271,7 @@ int cx23885_tuner_callback(void *i2c_bus, int command, int arg) | |||
271 | 271 | ||
272 | return 0; /* Should never be here */ | 272 | return 0; /* Should never be here */ |
273 | } | 273 | } |
274 | EXPORT_SYMBOL(cx23885_tuner_callback); | 274 | |
275 | void cx23885_gpio_setup(struct cx23885_dev *dev) | 275 | void cx23885_gpio_setup(struct cx23885_dev *dev) |
276 | { | 276 | { |
277 | switch(dev->board) { | 277 | switch(dev->board) { |
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c index 61d75d04db8d..ed465c007cea 100644 --- a/drivers/media/video/cx23885/cx23885-dvb.c +++ b/drivers/media/video/cx23885/cx23885-dvb.c | |||
@@ -156,7 +156,6 @@ static struct s5h1409_config hauppauge_hvr1500q_config = { | |||
156 | static struct xc5000_config hauppauge_hvr1500q_tunerconfig = { | 156 | static struct xc5000_config hauppauge_hvr1500q_tunerconfig = { |
157 | .i2c_address = 0x61, | 157 | .i2c_address = 0x61, |
158 | .if_khz = 5380, | 158 | .if_khz = 5380, |
159 | /* cannot set .video_dev here, do it before attach. */ | ||
160 | .tuner_callback = cx23885_tuner_callback | 159 | .tuner_callback = cx23885_tuner_callback |
161 | }; | 160 | }; |
162 | 161 | ||
@@ -282,11 +281,7 @@ static int dvb_register(struct cx23885_tsport *port) | |||
282 | &hauppauge_hvr1500q_config, | 281 | &hauppauge_hvr1500q_config, |
283 | &dev->i2c_bus[0].i2c_adap); | 282 | &dev->i2c_bus[0].i2c_adap); |
284 | if (port->dvb.frontend != NULL) { | 283 | if (port->dvb.frontend != NULL) { |
285 | /* tunerconfig.video_dev must point to | 284 | hauppauge_hvr1500q_tunerconfig.priv = i2c_bus; |
286 | * i2c_adap.algo_data | ||
287 | */ | ||
288 | hauppauge_hvr1500q_tunerconfig.video_dev = | ||
289 | i2c_bus->i2c_adap.algo_data; | ||
290 | dvb_attach(xc5000_attach, port->dvb.frontend, | 285 | dvb_attach(xc5000_attach, port->dvb.frontend, |
291 | &i2c_bus->i2c_adap, | 286 | &i2c_bus->i2c_adap, |
292 | &hauppauge_hvr1500q_tunerconfig); | 287 | &hauppauge_hvr1500q_tunerconfig); |
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h index ac9a76624e98..7cb2179f2622 100644 --- a/drivers/media/video/cx23885/cx23885.h +++ b/drivers/media/video/cx23885/cx23885.h | |||
@@ -393,7 +393,7 @@ extern const unsigned int cx23885_bcount; | |||
393 | extern struct cx23885_subid cx23885_subids[]; | 393 | extern struct cx23885_subid cx23885_subids[]; |
394 | extern const unsigned int cx23885_idcount; | 394 | extern const unsigned int cx23885_idcount; |
395 | 395 | ||
396 | extern int cx23885_tuner_callback(void *i2c_bus, int command, int arg); | 396 | extern int cx23885_tuner_callback(void *priv, int command, int arg); |
397 | extern void cx23885_card_list(struct cx23885_dev *dev); | 397 | extern void cx23885_card_list(struct cx23885_dev *dev); |
398 | extern int cx23885_ir_init(struct cx23885_dev *dev); | 398 | extern int cx23885_ir_init(struct cx23885_dev *dev); |
399 | extern void cx23885_gpio_setup(struct cx23885_dev *dev); | 399 | extern void cx23885_gpio_setup(struct cx23885_dev *dev); |