diff options
| author | Leonid V. Fedorenchik <leonidsbox@gmail.com> | 2011-09-02 11:55:30 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-12 16:46:04 +0200 |
| commit | 6100c579428cc31c636cf413beecb59bedc952c9 (patch) | |
| tree | 0463fec0954d73304d1f2819823de30b76ac3200 | |
| parent | 7ae70c8b8c8c22d4a4f333fa132b01da3c25a453 (diff) | |
| download | op-kernel-dev-6100c579428cc31c636cf413beecb59bedc952c9.zip op-kernel-dev-6100c579428cc31c636cf413beecb59bedc952c9.tar.gz | |
Staging: cx25821: Rename member name in struct cx25821_dev
Rename _audio_upstream_channel_select to _audio_upstream_channel in
in struct cx25821_dev in cx25821.h and all usages of that struct member
as well, because _audio_upstream_channel_select is seems to be too long
for a variable name.
Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Reviewed-By: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/cx25821/cx25821-audio-upstream.c | 10 | ||||
| -rw-r--r-- | drivers/staging/cx25821/cx25821.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/cx25821/cx25821-audio-upstream.c b/drivers/staging/cx25821/cx25821-audio-upstream.c index 0f9ca77..55df658 100644 --- a/drivers/staging/cx25821/cx25821-audio-upstream.c +++ b/drivers/staging/cx25821/cx25821-audio-upstream.c @@ -107,7 +107,7 @@ static __le32 *cx25821_risc_field_upstream_audio(struct cx25821_dev *dev, { unsigned int line; struct sram_channel *sram_ch = - dev->channels[dev->_audio_upstream_channel_select].sram_channels; + dev->channels[dev->_audio_upstream_channel].sram_channels; int offset = 0; /* scan lines */ @@ -351,7 +351,7 @@ static void cx25821_audioups_handler(struct work_struct *work) cx25821_get_audio_data(dev, dev->channels[dev-> - _audio_upstream_channel_select]. + _audio_upstream_channel]. sram_channels); } @@ -604,7 +604,7 @@ static irqreturn_t cx25821_upstream_irq_audio(int irq, void *dev_id) if (!dev) return -1; - sram_ch = dev->channels[dev->_audio_upstream_channel_select].sram_channels; + sram_ch = dev->channels[dev->_audio_upstream_channel].sram_channels; msk_stat = cx_read(sram_ch->int_mstat); audio_status = cx_read(sram_ch->int_stat); @@ -614,7 +614,7 @@ static irqreturn_t cx25821_upstream_irq_audio(int irq, void *dev_id) handled = cx25821_audio_upstream_irq(dev, dev-> - _audio_upstream_channel_select, + _audio_upstream_channel, audio_status); } @@ -726,7 +726,7 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select) return 0; } - dev->_audio_upstream_channel_select = channel_select; + dev->_audio_upstream_channel = channel_select; sram_ch = dev->channels[channel_select].sram_channels; /* Work queue */ diff --git a/drivers/staging/cx25821/cx25821.h b/drivers/staging/cx25821/cx25821.h index a282592..db2615b 100644 --- a/drivers/staging/cx25821/cx25821.h +++ b/drivers/staging/cx25821/cx25821.h @@ -310,7 +310,7 @@ struct cx25821_dev { int _audiofile_status; int _audio_lines_count; int _audioframe_count; - int _audio_upstream_channel_select; + int _audio_upstream_channel; int _last_index_irq; /* The last interrupt index processed. */ __le32 *_risc_audio_jmp_addr; |
