diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2021-05-24 12:13:44 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-05-25 08:54:05 +0200 |
| commit | b7c7699b4f42cc93340db3ac5c1797af7b7f70f4 (patch) | |
| tree | 0a5f0c26502d44d4e371b58e1139dd9508f14b96 /sound/firewire | |
| parent | fb25dcc885fa377d07586dd1f8f0bec32b4b547c (diff) | |
ALSA: firewire-lib: obsolete callbacked member
The member of callbacked in AMDTP stream structure is not used anymore.
Instead, ready_processing member is used to wake up yielding task of user
process.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20210524031346.50539-3-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
| -rw-r--r-- | sound/firewire/amdtp-stream.c | 9 | ||||
| -rw-r--r-- | sound/firewire/amdtp-stream.h | 3 |
2 files changed, 3 insertions, 9 deletions
diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c index 84608b856322..68ffbc33f692 100644 --- a/sound/firewire/amdtp-stream.c +++ b/sound/firewire/amdtp-stream.c @@ -110,7 +110,6 @@ int amdtp_stream_init(struct amdtp_stream *s, struct fw_unit *unit, s->packet_index = 0; init_waitqueue_head(&s->ready_wait); - s->callbacked = false; s->fmt = fmt; s->process_ctx_payloads = process_ctx_payloads; @@ -1365,7 +1364,8 @@ static void irq_target_callback_skip(struct fw_iso_context *context, u32 tstamp, d->processing_cycle.rx_start = cycle; } -// this is executed one time. +// This is executed one time. For in-stream, first packet has come. For out-stream, prepared to +// transmit first packet. static void amdtp_stream_first_callback(struct fw_iso_context *context, u32 tstamp, size_t header_length, void *header, void *private_data) @@ -1373,10 +1373,6 @@ static void amdtp_stream_first_callback(struct fw_iso_context *context, struct amdtp_stream *s = private_data; struct amdtp_domain *d = s->domain; - // For in-stream, first packet has come. - // For out-stream, prepared to transmit first packet - s->callbacked = true; - if (s->direction == AMDTP_IN_STREAM) { context->callback.sc = drop_tx_packets_initially; } else { @@ -1536,7 +1532,6 @@ static int amdtp_stream_start(struct amdtp_stream *s, int channel, int speed, if ((s->flags & CIP_EMPTY_WITH_TAG0) || (s->flags & CIP_NO_HEADER)) tag |= FW_ISO_CONTEXT_MATCH_TAG0; - s->callbacked = false; s->ready_processing = false; err = fw_iso_context_start(s->context, -1, 0, tag); if (err < 0) diff --git a/sound/firewire/amdtp-stream.h b/sound/firewire/amdtp-stream.h index d3ba2e1c1522..34294776f9e8 100644 --- a/sound/firewire/amdtp-stream.h +++ b/sound/firewire/amdtp-stream.h @@ -183,8 +183,7 @@ struct amdtp_stream { // To start processing content of packets at the same cycle in several contexts for // each direction. - bool callbacked:1; - bool ready_processing:1; + bool ready_processing; wait_queue_head_t ready_wait; unsigned int next_cycle; |