Skip to content

Commit

Permalink
[media] cx231xx: remove i2c ir stubs
Browse files Browse the repository at this point in the history
Nobody is ever going to implement an i2c based IR controller on a bridge that
has an onboard universal IR receiver.  This stuff was all copied from em28xx,
which has old enough versions of the chip that some didn't have onboard IR.

Remove the stubs related to i2c based IR (keeping the cx231xx-input code).

Signed-off-by: Devin Heitmueller <dheitmueller@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Devin Heitmueller authored and Mauro Carvalho Chehab committed Oct 21, 2010
1 parent 2b43db3 commit b522591
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 36 deletions.
32 changes: 0 additions & 32 deletions drivers/media/video/cx231xx/cx231xx-cards.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{

Expand Down
3 changes: 0 additions & 3 deletions drivers/media/video/cx231xx/cx231xx-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion drivers/media/video/cx231xx/cx231xx.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit b522591

Please sign in to comment.