diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/cx231xx/cx231xx-cards.c | 32 | ||||
-rw-r--r-- | drivers/media/video/cx231xx/cx231xx-i2c.c | 3 | ||||
-rw-r--r-- | drivers/media/video/cx231xx/cx231xx.h | 1 |
3 files changed, 0 insertions, 36 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/video/cx231xx/cx231xx-cards.c index b3a67605db2b..b516068b6edb 100644 --- a/drivers/media/video/cx231xx/cx231xx-cards.c +++ b/drivers/media/video/cx231xx/cx231xx-cards.c | |||
@@ -546,38 +546,6 @@ static void cx231xx_config_tuner(struct cx231xx *dev) | |||
546 | 546 | ||
547 | } | 547 | } |
548 | 548 | ||
549 | /* ----------------------------------------------------------------------- */ | ||
550 | void cx231xx_register_i2c_ir(struct cx231xx *dev) | ||
551 | { | ||
552 | if (disable_ir) | ||
553 | return; | ||
554 | |||
555 | /* REVISIT: instantiate IR device */ | ||
556 | |||
557 | /* detect & configure */ | ||
558 | switch (dev->model) { | ||
559 | |||
560 | case CX231XX_BOARD_CNXT_CARRAERA: | ||
561 | break; | ||
562 | case CX231XX_BOARD_CNXT_RDE_250: | ||
563 | break; | ||
564 | case CX231XX_BOARD_CNXT_SHELBY: | ||
565 | break; | ||
566 | case CX231XX_BOARD_CNXT_RDU_250: | ||
567 | break; | ||
568 | case CX231XX_BOARD_CNXT_RDE_253S: | ||
569 | break; | ||
570 | case CX231XX_BOARD_CNXT_RDU_253S: | ||
571 | break; | ||
572 | case CX231XX_BOARD_CNXT_VIDEO_GRABBER: | ||
573 | break; | ||
574 | case CX231XX_BOARD_HAUPPAUGE_EXETER: | ||
575 | break; | ||
576 | default: | ||
577 | break; | ||
578 | } | ||
579 | } | ||
580 | |||
581 | void cx231xx_card_setup(struct cx231xx *dev) | 549 | void cx231xx_card_setup(struct cx231xx *dev) |
582 | { | 550 | { |
583 | 551 | ||
diff --git a/drivers/media/video/cx231xx/cx231xx-i2c.c b/drivers/media/video/cx231xx/cx231xx-i2c.c index d64bc7c21c20..cce74e5a305b 100644 --- a/drivers/media/video/cx231xx/cx231xx-i2c.c +++ b/drivers/media/video/cx231xx/cx231xx-i2c.c | |||
@@ -509,9 +509,6 @@ int cx231xx_i2c_register(struct cx231xx_i2c *bus) | |||
509 | if (0 == bus->i2c_rc) { | 509 | if (0 == bus->i2c_rc) { |
510 | if (i2c_scan) | 510 | if (i2c_scan) |
511 | cx231xx_do_i2c_scan(dev, &bus->i2c_client); | 511 | cx231xx_do_i2c_scan(dev, &bus->i2c_client); |
512 | |||
513 | /* Instantiate the IR receiver device, if present */ | ||
514 | cx231xx_register_i2c_ir(dev); | ||
515 | } else | 512 | } else |
516 | cx231xx_warn("%s: i2c bus %d register FAILED\n", | 513 | cx231xx_warn("%s: i2c bus %d register FAILED\n", |
517 | dev->name, bus->nr); | 514 | dev->name, bus->nr); |
diff --git a/drivers/media/video/cx231xx/cx231xx.h b/drivers/media/video/cx231xx/cx231xx.h index e65e0fd88e4b..5ffdd36a1185 100644 --- a/drivers/media/video/cx231xx/cx231xx.h +++ b/drivers/media/video/cx231xx/cx231xx.h | |||
@@ -950,7 +950,6 @@ extern void cx231xx_card_setup(struct cx231xx *dev); | |||
950 | extern struct cx231xx_board cx231xx_boards[]; | 950 | extern struct cx231xx_board cx231xx_boards[]; |
951 | extern struct usb_device_id cx231xx_id_table[]; | 951 | extern struct usb_device_id cx231xx_id_table[]; |
952 | extern const unsigned int cx231xx_bcount; | 952 | extern const unsigned int cx231xx_bcount; |
953 | void cx231xx_register_i2c_ir(struct cx231xx *dev); | ||
954 | int cx231xx_tuner_callback(void *ptr, int component, int command, int arg); | 953 | int cx231xx_tuner_callback(void *ptr, int component, int command, int arg); |
955 | 954 | ||
956 | /* Provided by cx231xx-input.c */ | 955 | /* Provided by cx231xx-input.c */ |