diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-11-17 18:12:46 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-29 11:16:50 +0100 |
| commit | 29e3ec19d5c88d534ced219d3962d67243e4d310 (patch) | |
| tree | e0812ae052cad72c48158ac9faf587a1576f22ee /drivers | |
| parent | [media] Rename all public generic RC functions from ir_ to rc_ (diff) | |
| download | linux-29e3ec19d5c88d534ced219d3962d67243e4d310.tar.xz linux-29e3ec19d5c88d534ced219d3962d67243e4d310.zip | |
[media] cx231xx: Properly name rc_map name
rc_map is confusing, as it may be understood as another thing. Properly
rename the field to indicate its usage.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/cx231xx/cx231xx-cards.c | 2 | ||||
| -rw-r--r-- | drivers/media/video/cx231xx/cx231xx-input.c | 4 | ||||
| -rw-r--r-- | drivers/media/video/cx231xx/cx231xx.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/video/cx231xx/cx231xx-cards.c index 83772eb8e391..2b6101763355 100644 --- a/drivers/media/video/cx231xx/cx231xx-cards.c +++ b/drivers/media/video/cx231xx/cx231xx-cards.c @@ -412,7 +412,7 @@ struct cx231xx_board cx231xx_boards[] = { .tuner_i2c_master = 2, .demod_i2c_master = 1, .ir_i2c_master = 2, - .rc_map = RC_MAP_PIXELVIEW_NEW, + .rc_map_name = RC_MAP_PIXELVIEW_NEW, .has_dvb = 1, .demod_addr = 0x10, .norm = V4L2_STD_PAL_M, diff --git a/drivers/media/video/cx231xx/cx231xx-input.c b/drivers/media/video/cx231xx/cx231xx-input.c index 65d951e03c17..1d043ed1bc32 100644 --- a/drivers/media/video/cx231xx/cx231xx-input.c +++ b/drivers/media/video/cx231xx/cx231xx-input.c @@ -57,7 +57,7 @@ int cx231xx_ir_init(struct cx231xx *dev) dev_dbg(&dev->udev->dev, "%s\n", __func__); /* Only initialize if a rc keycode map is defined */ - if (!cx231xx_boards[dev->model].rc_map) + if (!cx231xx_boards[dev->model].rc_map_name) return -ENODEV; request_module("ir-kbd-i2c"); @@ -80,7 +80,7 @@ int cx231xx_ir_init(struct cx231xx *dev) * an i2c device. */ dev->init_data.get_key = get_key_isdbt; - dev->init_data.ir_codes = cx231xx_boards[dev->model].rc_map; + dev->init_data.ir_codes = cx231xx_boards[dev->model].rc_map_name; /* The i2c micro-controller only outputs the cmd part of NEC protocol */ dev->init_data.rc_dev->scanmask = 0xff; dev->init_data.rc_dev->driver_name = "cx231xx"; diff --git a/drivers/media/video/cx231xx/cx231xx.h b/drivers/media/video/cx231xx/cx231xx.h index 87a20ae6fcc0..709cb87a7762 100644 --- a/drivers/media/video/cx231xx/cx231xx.h +++ b/drivers/media/video/cx231xx/cx231xx.h @@ -349,7 +349,7 @@ struct cx231xx_board { u8 ir_i2c_master; /* for devices with I2C chips for IR */ - char *rc_map; + char *rc_map_name; unsigned int max_range_640_480:1; unsigned int has_dvb:1; |