diff options
| author | Sri Deevi <Srinivasa.Deevi@conexant.com> | 2009-03-21 22:00:20 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-06 21:44:07 -0300 |
| commit | ecc67d108d6ade14d79c8546f5db36613c780d59 (patch) | |
| tree | 638c133624821d7f409fce13c1a71524d4ce6215 /drivers/media/video/cx231xx/cx231xx-core.c | |
| parent | b1196126b016d0f28a99c16b27c403d0ecac501a (diff) | |
| download | kernel_samsung_smdk4412-ecc67d108d6ade14d79c8546f5db36613c780d59.zip kernel_samsung_smdk4412-ecc67d108d6ade14d79c8546f5db36613c780d59.tar.gz kernel_samsung_smdk4412-ecc67d108d6ade14d79c8546f5db36613c780d59.tar.bz2 | |
V4L/DVB (11129): cx231xx: Use generic names for each device block
Signed-off-by: Srinivasa Deevi <srinivasa.deevi@conexant.com>
Reviewed-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx231xx/cx231xx-core.c')
| -rw-r--r-- | drivers/media/video/cx231xx/cx231xx-core.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-core.c b/drivers/media/video/cx231xx/cx231xx-core.c index 80deffe..d0a4d4d 100644 --- a/drivers/media/video/cx231xx/cx231xx-core.c +++ b/drivers/media/video/cx231xx/cx231xx-core.c @@ -883,7 +883,7 @@ int cx231xx_dev_init(struct cx231xx *dev) /* init hardware */ /* Note : with out calling set power mode function, - colibri can not be set up correctly */ + afe can not be set up correctly */ errCode = cx231xx_set_power_mode(dev, POLARIS_AVMODE_ANALOGT_TV); if (errCode < 0) { cx231xx_errdev @@ -893,17 +893,17 @@ int cx231xx_dev_init(struct cx231xx *dev) } /* initialize Colibri block */ - errCode = cx231xx_colibri_init_super_block(dev, 0x23c); + errCode = cx231xx_afe_init_super_block(dev, 0x23c); if (errCode < 0) { cx231xx_errdev - ("%s: cx231xx_colibri init super block - errCode [%d]!\n", + ("%s: cx231xx_afe init super block - errCode [%d]!\n", __func__, errCode); return errCode; } - errCode = cx231xx_colibri_init_channels(dev); + errCode = cx231xx_afe_init_channels(dev); if (errCode < 0) { cx231xx_errdev - ("%s: cx231xx_colibri init channels - errCode [%d]!\n", + ("%s: cx231xx_afe init channels - errCode [%d]!\n", __func__, errCode); return errCode; } @@ -917,11 +917,11 @@ int cx231xx_dev_init(struct cx231xx *dev) return errCode; } - /* flatiron related functions */ - errCode = cx231xx_flatiron_initialize(dev); + /* I2S block related functions */ + errCode = cx231xx_i2s_blk_initialize(dev); if (errCode < 0) { cx231xx_errdev - ("%s: cx231xx_flatiron initialize - errCode [%d]!\n", + ("%s: cx231xx_i2s block initialize - errCode [%d]!\n", __func__, errCode); return errCode; } |