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

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: 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 7ae70c8b

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

+5 −5
Original line number Diff line number Diff line
@@ -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 */

drivers/staging/cx25821/cx25821.h

+1 −1
Original line number Diff line number Diff line
@@ -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;