Commit 29bcae20 authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: firewire-lib: rename local functions for code cleanup 



The naming rule for local functions was inconsistent. This commit
rename them with a consistent manner.

Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Acked-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 727d3a0b

sound/firewire/amdtp.c

+30 −30
Original line number Diff line number Diff line
@@ -260,13 +260,13 @@ unsigned int amdtp_stream_get_max_payload(struct amdtp_stream *s) 
}

EXPORT_SYMBOL(amdtp_stream_get_max_payload);



static void amdtp_write_s16(struct amdtp_stream *s,

static void write_pcm_s16(struct amdtp_stream *s,

			  struct snd_pcm_substream *pcm,

			  __be32 *buffer, unsigned int frames);

static void amdtp_write_s32(struct amdtp_stream *s,

static void write_pcm_s32(struct amdtp_stream *s,

			  struct snd_pcm_substream *pcm,

			  __be32 *buffer, unsigned int frames);

static void amdtp_read_s32(struct amdtp_stream *s,

static void read_pcm_s32(struct amdtp_stream *s,

			 struct snd_pcm_substream *pcm,

			 __be32 *buffer, unsigned int frames);
@@ -291,16 +291,16 @@ void amdtp_stream_set_pcm_format(struct amdtp_stream *s, 
		/* fall through */

	case SNDRV_PCM_FORMAT_S16:

		if (s->direction == AMDTP_OUT_STREAM) {

			s->transfer_samples = amdtp_write_s16;

			s->transfer_samples = write_pcm_s16;

			break;

		}

		WARN_ON(1);

		/* fall through */

	case SNDRV_PCM_FORMAT_S32:

		if (s->direction == AMDTP_OUT_STREAM)

			s->transfer_samples = amdtp_write_s32;

			s->transfer_samples = write_pcm_s32;

		else

			s->transfer_samples = amdtp_read_s32;

			s->transfer_samples = read_pcm_s32;

		break;

	}

}
@@ -408,7 +408,7 @@ static unsigned int calculate_syt(struct amdtp_stream *s, 
	}

}



static void amdtp_write_s32(struct amdtp_stream *s,

static void write_pcm_s32(struct amdtp_stream *s,

			  struct snd_pcm_substream *pcm,

			  __be32 *buffer, unsigned int frames)

{
@@ -433,7 +433,7 @@ static void amdtp_write_s32(struct amdtp_stream *s, 
	}

}



static void amdtp_write_s16(struct amdtp_stream *s,

static void write_pcm_s16(struct amdtp_stream *s,

			  struct snd_pcm_substream *pcm,

			  __be32 *buffer, unsigned int frames)

{
@@ -458,7 +458,7 @@ static void amdtp_write_s16(struct amdtp_stream *s, 
	}

}



static void amdtp_read_s32(struct amdtp_stream *s,

static void read_pcm_s32(struct amdtp_stream *s,

			 struct snd_pcm_substream *pcm,

			 __be32 *buffer, unsigned int frames)

{
@@ -482,7 +482,7 @@ static void amdtp_read_s32(struct amdtp_stream *s, 
	}

}



static void amdtp_fill_pcm_silence(struct amdtp_stream *s,

static void write_pcm_silence(struct amdtp_stream *s,

			      __be32 *buffer, unsigned int frames)

{

	unsigned int i, c;
@@ -524,7 +524,7 @@ static void midi_rate_use_one_byte(struct amdtp_stream *s, unsigned int port) 
	s->midi_fifo_used[port] += amdtp_rate_table[s->sfc];

}



static void amdtp_fill_midi(struct amdtp_stream *s,

static void write_midi_messages(struct amdtp_stream *s,

				__be32 *buffer, unsigned int frames)

{

	unsigned int f, port;
@@ -551,7 +551,7 @@ static void amdtp_fill_midi(struct amdtp_stream *s, 
	}

}



static void amdtp_pull_midi(struct amdtp_stream *s,

static void read_midi_messages(struct amdtp_stream *s,

			       __be32 *buffer, unsigned int frames)

{

	unsigned int f, port;
@@ -666,9 +666,9 @@ static int handle_out_packet(struct amdtp_stream *s, unsigned int data_blocks, 
	if (pcm)

		s->transfer_samples(s, pcm, buffer, data_blocks);

	else

		amdtp_fill_pcm_silence(s, buffer, data_blocks);

		write_pcm_silence(s, buffer, data_blocks);

	if (s->midi_ports)

		amdtp_fill_midi(s, buffer, data_blocks);

		write_midi_messages(s, buffer, data_blocks);



	s->data_block_counter = (s->data_block_counter + data_blocks) & 0xff;
@@ -766,7 +766,7 @@ static int handle_in_packet(struct amdtp_stream *s, 
			s->transfer_samples(s, pcm, buffer, data_blocks);



		if (s->midi_ports)

			amdtp_pull_midi(s, buffer, data_blocks);

			read_midi_messages(s, buffer, data_blocks);

	}



	if (s->flags & CIP_DBC_IS_END_EVENT)

CRA Git | Maintained and supported by SUSTech CRA and CCSE