UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: firewire-lib: obsolete workqueue for period update 

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

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20210610031733.56297-4-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Sakamoto 2021-06-10 12:17:33 +09:00 committed by Takashi Iwai
parent 7ba5ca32fe
commit b5b519965c
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sound/firewire/amdtp-stream.c
View File

@ -77,8 +77,6 @@
// overrun. Actual device can skip more, then this module stops the packet streaming. // overrun. Actual device can skip more, then this module stops the packet streaming.
#define IR_JUMBO_PAYLOAD_MAX_SKIP_CYCLES 5 #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 * amdtp_stream_init - initialize an AMDTP stream structure
* @s: the AMDTP stream to initialize * @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->flags = flags;
s->context = ERR_PTR(-1); s->context = ERR_PTR(-1);
mutex_init(&s->mutex); mutex_init(&s->mutex);
INIT_WORK(&s->period_work, pcm_period_work);
s->packet_index = 0; s->packet_index = 0;
init_waitqueue_head(&s->ready_wait); 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) void amdtp_stream_pcm_prepare(struct amdtp_stream *s)
{ {
cancel_work_sync(&s->period_work);
s->pcm_buffer_pointer = 0; s->pcm_buffer_pointer = 0;
s->pcm_period_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, static int queue_packet(struct amdtp_stream *s, struct fw_iso_packet *params,
bool sched_irq) bool sched_irq)
{ {
@ -1808,7 +1794,6 @@ static void amdtp_stream_stop(struct amdtp_stream *s)
return; return;
} }
cancel_work_sync(&s->period_work);
fw_iso_context_stop(s->context); fw_iso_context_stop(s->context);
fw_iso_context_destroy(s->context); fw_iso_context_destroy(s->context);
s->context = ERR_PTR(-1); s->context = ERR_PTR(-1);

1
sound/firewire/amdtp-stream.h
View File

@ -186,7 +186,6 @@ struct amdtp_stream {
/* For a PCM substream processing. */ /* For a PCM substream processing. */
struct snd_pcm_substream *pcm; struct snd_pcm_substream *pcm;
struct work_struct period_work;
snd_pcm_uframes_t pcm_buffer_pointer; snd_pcm_uframes_t pcm_buffer_pointer;
unsigned int pcm_period_pointer; unsigned int pcm_period_pointer;