Commit 1531e889 authored by Leonid V. Fedorenchik's avatar Leonid V. Fedorenchik Committed by Greg Kroah-Hartman
Browse files

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: default avatarLeonid V. Fedorenchik <leonidsbox@gmail.com>
Reviewed-By: default avatarValdis Kletnieks <valdis.kletnieks@vt.edu>
Reviewed-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent cc4600c9

drivers/staging/cx25821/cx25821-audio-upstream.c

+9 −16
Original line number Diff line number Diff line
@@ -349,9 +349,7 @@ static void cx25821_audioups_handler(struct work_struct *work) 
		return;

	}



	cx25821_get_audio_data(dev,

			      dev->channels[dev->

				       _audio_upstream_channel].

	cx25821_get_audio_data(dev, dev->channels[dev->_audio_upstream_channel].

			sram_channels);

}
@@ -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);