diff options
| author | Leonid V. Fedorenchik <leonidsbox@gmail.com> | 2011-09-02 11:55:38 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-12 16:46:06 +0200 |
| commit | 1531e889ab5eaaa87f1a5440c7cbf4af3c1a9bb9 (patch) | |
| tree | 97833d5ce882626df9113a494758a947819812fc | |
| parent | cc4600c9f46d83d2ced3310e05ea9e94a5c130fb (diff) | |
| download | op-kernel-dev-1531e889ab5eaaa87f1a5440c7cbf4af3c1a9bb9.zip op-kernel-dev-1531e889ab5eaaa87f1a5440c7cbf4af3c1a9bb9.tar.gz | |
Staging: cx25821: Fix obscure line endings in cx25821-audio-upstream.c
Change obscure line endings to less obscure ones. Rationale: more
readable.
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 | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/drivers/staging/cx25821/cx25821-audio-upstream.c b/drivers/staging/cx25821/cx25821-audio-upstream.c index 55df658..e6c4b34 100644 --- a/drivers/staging/cx25821/cx25821-audio-upstream.c +++ b/drivers/staging/cx25821/cx25821-audio-upstream.c @@ -349,10 +349,8 @@ static void cx25821_audioups_handler(struct work_struct *work) return; } - cx25821_get_audio_data(dev, - dev->channels[dev-> - _audio_upstream_channel]. - sram_channels); + cx25821_get_audio_data(dev, dev->channels[dev->_audio_upstream_channel]. + sram_channels); } int cx25821_openfile_audio(struct cx25821_dev *dev, @@ -555,8 +553,7 @@ int cx25821_audio_upstream_irq(struct cx25821_dev *dev, int chan_num, } } /* Jump to 2nd Audio Frame */ - *(rp++) = - cpu_to_le32(RISC_JUMP | RISC_IRQ1 | + *(rp++) = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_RESET); *(rp++) = cpu_to_le32(risc_phys_jump_addr); *(rp++) = cpu_to_le32(0); @@ -611,11 +608,8 @@ static irqreturn_t cx25821_upstream_irq_audio(int irq, void *dev_id) /* Only deal with our interrupt */ if (audio_status) { - handled = - cx25821_audio_upstream_irq(dev, - dev-> - _audio_upstream_channel, - audio_status); + handled = cx25821_audio_upstream_irq(dev, + dev->_audio_upstream_channel, audio_status); } if (handled < 0) @@ -770,9 +764,8 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select) memcpy(dev->_audiofilename, _defaultAudioName, str_length + 1); } - retval = - cx25821_sram_channel_setup_upstream_audio(dev, sram_ch, _line_size, - 0); + retval = cx25821_sram_channel_setup_upstream_audio(dev, sram_ch, + _line_size, 0); dev->audio_upstream_riscbuf_size = AUDIO_RISC_DMA_BUF_SIZE * NUM_AUDIO_PROGS + @@ -780,8 +773,8 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select) dev->audio_upstream_databuf_size = AUDIO_DATA_BUF_SZ * NUM_AUDIO_PROGS; /* Allocating buffers and prepare RISC program */ - retval = - cx25821_audio_upstream_buffer_prepare(dev, sram_ch, _line_size); + retval = cx25821_audio_upstream_buffer_prepare(dev, sram_ch, + _line_size); if (retval < 0) { pr_err("%s: Failed to set up Audio upstream buffers!\n", dev->name); |
