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

ALSA: firewire-lib: obsolete workqueue for period update 



The workqueue to notify PCM period elapse is not used anymore.

Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20210610031733.56297-4-o-takashi@sakamocchi.jp


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 7ba5ca32

sound/firewire/amdtp-stream.c

+0 −15
Original line number Diff line number Diff line
@@ -77,8 +77,6 @@ 
// overrun. Actual device can skip more, then this module stops the packet streaming.

#define IR_JUMBO_PAYLOAD_MAX_SKIP_CYCLES	5



static void pcm_period_work(struct work_struct *work);



/**

 * amdtp_stream_init - initialize an AMDTP stream structure

 * @s: the AMDTP stream to initialize
@@ -107,7 +105,6 @@ int amdtp_stream_init(struct amdtp_stream *s, struct fw_unit *unit, 
	s->flags = flags;

	s->context = ERR_PTR(-1);

	mutex_init(&s->mutex);

	INIT_WORK(&s->period_work, pcm_period_work);

	s->packet_index = 0;



	init_waitqueue_head(&s->ready_wait);
@@ -346,7 +343,6 @@ EXPORT_SYMBOL(amdtp_stream_get_max_payload); 
 */

void amdtp_stream_pcm_prepare(struct amdtp_stream *s)

{

	cancel_work_sync(&s->period_work);

	s->pcm_buffer_pointer = 0;

	s->pcm_period_pointer = 0;

}
@@ -626,16 +622,6 @@ static void update_pcm_pointers(struct amdtp_stream *s, 
	}

}



static void pcm_period_work(struct work_struct *work)

{

	struct amdtp_stream *s = container_of(work, struct amdtp_stream,

					      period_work);

	struct snd_pcm_substream *pcm = READ_ONCE(s->pcm);



	if (pcm)

		snd_pcm_period_elapsed(pcm);

}



static int queue_packet(struct amdtp_stream *s, struct fw_iso_packet *params,

			bool sched_irq)

{
@@ -1808,7 +1794,6 @@ static void amdtp_stream_stop(struct amdtp_stream *s) 
		return;

	}



	cancel_work_sync(&s->period_work);

	fw_iso_context_stop(s->context);

	fw_iso_context_destroy(s->context);

	s->context = ERR_PTR(-1);

sound/firewire/amdtp-stream.h

+0 −1
Original line number Diff line number Diff line
@@ -186,7 +186,6 @@ struct amdtp_stream { 


	/* For a PCM substream processing. */

	struct snd_pcm_substream *pcm;

	struct work_struct period_work;

	snd_pcm_uframes_t pcm_buffer_pointer;

	unsigned int pcm_period_pointer;