From bd41a918d1e82d045dbf7c19e4cd19a4df4cbf63 Mon Sep 17 00:00:00 2001 From: Devin Heitmueller Date: Wed, 18 Aug 2010 19:10:03 -0300 Subject: [PATCH] --- yaml --- r: 219266 b: refs/heads/master c: b522591a4580b54430873784e1b956646d7970d9 h: refs/heads/master v: v3 --- [refs] | 2 +- .../media/video/cx231xx/cx231xx-cards.c | 32 ------------------- .../drivers/media/video/cx231xx/cx231xx-i2c.c | 3 -- trunk/drivers/media/video/cx231xx/cx231xx.h | 1 - 4 files changed, 1 insertion(+), 37 deletions(-) diff --git a/[refs] b/[refs] index 1dac12727269..d1a460b8d6cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b43db320eba4d5ceba5804c38afa21e65f83016 +refs/heads/master: b522591a4580b54430873784e1b956646d7970d9 diff --git a/trunk/drivers/media/video/cx231xx/cx231xx-cards.c b/trunk/drivers/media/video/cx231xx/cx231xx-cards.c index b3a67605db2b..b516068b6edb 100644 --- a/trunk/drivers/media/video/cx231xx/cx231xx-cards.c +++ b/trunk/drivers/media/video/cx231xx/cx231xx-cards.c @@ -546,38 +546,6 @@ static void cx231xx_config_tuner(struct cx231xx *dev) } -/* ----------------------------------------------------------------------- */ -void cx231xx_register_i2c_ir(struct cx231xx *dev) -{ - if (disable_ir) - return; - - /* REVISIT: instantiate IR device */ - - /* detect & configure */ - switch (dev->model) { - - case CX231XX_BOARD_CNXT_CARRAERA: - break; - case CX231XX_BOARD_CNXT_RDE_250: - break; - case CX231XX_BOARD_CNXT_SHELBY: - break; - case CX231XX_BOARD_CNXT_RDU_250: - break; - case CX231XX_BOARD_CNXT_RDE_253S: - break; - case CX231XX_BOARD_CNXT_RDU_253S: - break; - case CX231XX_BOARD_CNXT_VIDEO_GRABBER: - break; - case CX231XX_BOARD_HAUPPAUGE_EXETER: - break; - default: - break; - } -} - void cx231xx_card_setup(struct cx231xx *dev) { diff --git a/trunk/drivers/media/video/cx231xx/cx231xx-i2c.c b/trunk/drivers/media/video/cx231xx/cx231xx-i2c.c index d64bc7c21c20..cce74e5a305b 100644 --- a/trunk/drivers/media/video/cx231xx/cx231xx-i2c.c +++ b/trunk/drivers/media/video/cx231xx/cx231xx-i2c.c @@ -509,9 +509,6 @@ int cx231xx_i2c_register(struct cx231xx_i2c *bus) if (0 == bus->i2c_rc) { if (i2c_scan) cx231xx_do_i2c_scan(dev, &bus->i2c_client); - - /* Instantiate the IR receiver device, if present */ - cx231xx_register_i2c_ir(dev); } else cx231xx_warn("%s: i2c bus %d register FAILED\n", dev->name, bus->nr); diff --git a/trunk/drivers/media/video/cx231xx/cx231xx.h b/trunk/drivers/media/video/cx231xx/cx231xx.h index e65e0fd88e4b..5ffdd36a1185 100644 --- a/trunk/drivers/media/video/cx231xx/cx231xx.h +++ b/trunk/drivers/media/video/cx231xx/cx231xx.h @@ -950,7 +950,6 @@ extern void cx231xx_card_setup(struct cx231xx *dev); extern struct cx231xx_board cx231xx_boards[]; extern struct usb_device_id cx231xx_id_table[]; extern const unsigned int cx231xx_bcount; -void cx231xx_register_i2c_ir(struct cx231xx *dev); int cx231xx_tuner_callback(void *ptr, int component, int command, int arg); /* Provided by cx231xx-input.c */