Commit 74f94e41 authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: firewire-lib: localize kernel APIs to start/stop each AMDTP stream 



As a result to support AMDTP domain, no drivers call kernel APIs to
start/stop each AMDTP stream. This commit localize these APIs.

Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c9a9ce89

sound/firewire/amdtp-stream.c

+2 −4
Original line number Diff line number Diff line
@@ -894,7 +894,7 @@ static void amdtp_stream_first_callback(struct fw_iso_context *context, 
 * amdtp_stream_set_parameters() and it must be started before any PCM or MIDI

 * device can be started.

 */

int amdtp_stream_start(struct amdtp_stream *s, int channel, int speed)

static int amdtp_stream_start(struct amdtp_stream *s, int channel, int speed)

{

	static const struct {

		unsigned int data_block;
@@ -1027,7 +1027,6 @@ int amdtp_stream_start(struct amdtp_stream *s, int channel, int speed) 


	return err;

}

EXPORT_SYMBOL(amdtp_stream_start);



/**

 * amdtp_stream_pcm_pointer - get the PCM buffer position
@@ -1098,7 +1097,7 @@ EXPORT_SYMBOL(amdtp_stream_update); 
 * All PCM and MIDI devices of the stream must be stopped before the stream

 * itself can be stopped.

 */

void amdtp_stream_stop(struct amdtp_stream *s)

static void amdtp_stream_stop(struct amdtp_stream *s)

{

	mutex_lock(&s->mutex);
@@ -1118,7 +1117,6 @@ void amdtp_stream_stop(struct amdtp_stream *s) 


	mutex_unlock(&s->mutex);

}

EXPORT_SYMBOL(amdtp_stream_stop);



/**

 * amdtp_stream_pcm_abort - abort the running PCM device

sound/firewire/amdtp-stream.h

+0 −2
Original line number Diff line number Diff line
@@ -188,9 +188,7 @@ int amdtp_stream_set_parameters(struct amdtp_stream *s, unsigned int rate, 
				unsigned int data_block_quadlets);

unsigned int amdtp_stream_get_max_payload(struct amdtp_stream *s);



int amdtp_stream_start(struct amdtp_stream *s, int channel, int speed);

void amdtp_stream_update(struct amdtp_stream *s);

void amdtp_stream_stop(struct amdtp_stream *s);



int amdtp_stream_add_pcm_hw_constraints(struct amdtp_stream *s,

					struct snd_pcm_runtime *runtime);