Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-29 09:12:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ALSA: firewire-lib: obsolete return value from context payload processing layer

Browse Source 
This commit obsoletes return value from the context payload processing layer
since the multiplier between the data block count and PCM frame count was
moved to the packet streaming processing layer.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20230110134933.322794-3-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Sakamoto 2023-01-10 22:49:32 +09:00 committed by Takashi Iwai
parent a36183f69c
commit 7fc693e474
7 changed files with 25 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sound/firewire/amdtp-am824.c
View File

@ -344,10 +344,8 @@ static void read_midi_messages(struct amdtp_stream *s, __be32 *buffer,
} }
} }
static unsigned int process_it_ctx_payloads(struct amdtp_stream *s, static void process_it_ctx_payloads(struct amdtp_stream *s, const struct pkt_desc *desc,
const struct pkt_desc *desc, unsigned int count, struct snd_pcm_substream *pcm)
unsigned int count,
struct snd_pcm_substream *pcm)
{ {
struct amdtp_am824 *p = s->protocol; struct amdtp_am824 *p = s->protocol;
unsigned int pcm_frames = 0; unsigned int pcm_frames = 0;
@ -371,14 +369,10 @@ static unsigned int process_it_ctx_payloads(struct amdtp_stream *s,
desc = amdtp_stream_next_packet_desc(s, desc); desc = amdtp_stream_next_packet_desc(s, desc);
} }
return pcm_frames;
} }
static unsigned int process_ir_ctx_payloads(struct amdtp_stream *s, static void process_ir_ctx_payloads(struct amdtp_stream *s, const struct pkt_desc *desc,
const struct pkt_desc *desc, unsigned int count, struct snd_pcm_substream *pcm)
unsigned int count,
struct snd_pcm_substream *pcm)
{ {
struct amdtp_am824 *p = s->protocol; struct amdtp_am824 *p = s->protocol;
unsigned int pcm_frames = 0; unsigned int pcm_frames = 0;
@ -400,8 +394,6 @@ static unsigned int process_ir_ctx_payloads(struct amdtp_stream *s,
desc = amdtp_stream_next_packet_desc(s, desc); desc = amdtp_stream_next_packet_desc(s, desc);
} }
return pcm_frames;
} }
/** /**

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

@ -1043,7 +1043,7 @@ static void process_ctx_payloads(struct amdtp_stream *s,
int i; int i;
pcm = READ_ONCE(s->pcm); pcm = READ_ONCE(s->pcm);
(void)s->process_ctx_payloads(s, desc, count, pcm); s->process_ctx_payloads(s, desc, count, pcm);
if (pcm) { if (pcm) {
unsigned int data_block_count = 0; unsigned int data_block_count = 0;

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

@ -107,11 +107,10 @@ struct pkt_desc {
}; };
struct amdtp_stream; struct amdtp_stream;
typedef unsigned int (*amdtp_stream_process_ctx_payloads_t)( typedef void (*amdtp_stream_process_ctx_payloads_t)(struct amdtp_stream *s,
struct amdtp_stream *s, const struct pkt_desc *desc,
const struct pkt_desc *desc, unsigned int count,
unsigned int count, struct snd_pcm_substream *pcm);
struct snd_pcm_substream *pcm);
struct amdtp_domain; struct amdtp_domain;
struct amdtp_stream { struct amdtp_stream {

16
sound/firewire/digi00x/amdtp-dot.c
View File

@ -341,10 +341,8 @@ void amdtp_dot_midi_trigger(struct amdtp_stream *s, unsigned int port,
WRITE_ONCE(p->midi[port], midi); WRITE_ONCE(p->midi[port], midi);
} }
static unsigned int process_ir_ctx_payloads(struct amdtp_stream *s, static void process_ir_ctx_payloads(struct amdtp_stream *s, const struct pkt_desc *desc,
const struct pkt_desc *desc, unsigned int count, struct snd_pcm_substream *pcm)
unsigned int count,
struct snd_pcm_substream *pcm)
{ {
unsigned int pcm_frames = 0; unsigned int pcm_frames = 0;
int i; int i;
@ -362,14 +360,10 @@ static unsigned int process_ir_ctx_payloads(struct amdtp_stream *s,
desc = amdtp_stream_next_packet_desc(s, desc); desc = amdtp_stream_next_packet_desc(s, desc);
} }
return pcm_frames;
} }
static unsigned int process_it_ctx_payloads(struct amdtp_stream *s, static void process_it_ctx_payloads(struct amdtp_stream *s, const struct pkt_desc *desc,
const struct pkt_desc *desc, unsigned int count, struct snd_pcm_substream *pcm)
unsigned int count,
struct snd_pcm_substream *pcm)
{ {
unsigned int pcm_frames = 0; unsigned int pcm_frames = 0;
int i; int i;
@ -390,8 +384,6 @@ static unsigned int process_it_ctx_payloads(struct amdtp_stream *s,
desc = amdtp_stream_next_packet_desc(s, desc); desc = amdtp_stream_next_packet_desc(s, desc);
} }
return pcm_frames;
} }
int amdtp_dot_init(struct amdtp_stream *s, struct fw_unit *unit, int amdtp_dot_init(struct amdtp_stream *s, struct fw_unit *unit,

16
sound/firewire/fireface/amdtp-ff.c
View File

@ -112,10 +112,8 @@ int amdtp_ff_add_pcm_hw_constraints(struct amdtp_stream *s,
return amdtp_stream_add_pcm_hw_constraints(s, runtime); return amdtp_stream_add_pcm_hw_constraints(s, runtime);
} }
static unsigned int process_it_ctx_payloads(struct amdtp_stream *s, static void process_it_ctx_payloads(struct amdtp_stream *s, const struct pkt_desc *desc,
const struct pkt_desc *desc, unsigned int count, struct snd_pcm_substream *pcm)
unsigned int count,
struct snd_pcm_substream *pcm)
{ {
unsigned int pcm_frames = 0; unsigned int pcm_frames = 0;
int i; int i;
@ -133,14 +131,10 @@ static unsigned int process_it_ctx_payloads(struct amdtp_stream *s,
desc = amdtp_stream_next_packet_desc(s, desc); desc = amdtp_stream_next_packet_desc(s, desc);
} }
return pcm_frames;
} }
static unsigned int process_ir_ctx_payloads(struct amdtp_stream *s, static void process_ir_ctx_payloads(struct amdtp_stream *s, const struct pkt_desc *desc,
const struct pkt_desc *desc, unsigned int count, struct snd_pcm_substream *pcm)
unsigned int count,
struct snd_pcm_substream *pcm)
{ {
unsigned int pcm_frames = 0; unsigned int pcm_frames = 0;
int i; int i;
@ -156,8 +150,6 @@ static unsigned int process_ir_ctx_payloads(struct amdtp_stream *s,
desc = amdtp_stream_next_packet_desc(s, desc); desc = amdtp_stream_next_packet_desc(s, desc);
} }
return pcm_frames;
} }
int amdtp_ff_init(struct amdtp_stream *s, struct fw_unit *unit, int amdtp_ff_init(struct amdtp_stream *s, struct fw_unit *unit,

16
sound/firewire/motu/amdtp-motu.c
View File

@ -328,10 +328,8 @@ static void cache_event_offsets(struct amdtp_motu_cache *cache, const __be32 *bu
cache->tx_cycle_count = (cache->tx_cycle_count + 1) % CYCLES_PER_SECOND; cache->tx_cycle_count = (cache->tx_cycle_count + 1) % CYCLES_PER_SECOND;
} }
static unsigned int process_ir_ctx_payloads(struct amdtp_stream *s, static void process_ir_ctx_payloads(struct amdtp_stream *s, const struct pkt_desc *desc,
const struct pkt_desc *desc, unsigned int count, struct snd_pcm_substream *pcm)
unsigned int count,
struct snd_pcm_substream *pcm)
{ {
struct snd_motu *motu = container_of(s, struct snd_motu, tx_stream); struct snd_motu *motu = container_of(s, struct snd_motu, tx_stream);
struct amdtp_motu *p = s->protocol; struct amdtp_motu *p = s->protocol;
@ -370,8 +368,6 @@ static unsigned int process_ir_ctx_payloads(struct amdtp_stream *s,
if (trace_data_block_sph_enabled() || if (trace_data_block_sph_enabled() ||
trace_data_block_message_enabled()) trace_data_block_message_enabled())
probe_tracepoints_events(s, desc, count); probe_tracepoints_events(s, desc, count);
return pcm_frames;
} }
static void write_sph(struct amdtp_motu_cache *cache, __be32 *buffer, unsigned int data_blocks, static void write_sph(struct amdtp_motu_cache *cache, __be32 *buffer, unsigned int data_blocks,
@ -396,10 +392,8 @@ static void write_sph(struct amdtp_motu_cache *cache, __be32 *buffer, unsigned i
cache->rx_cycle_count = (cache->rx_cycle_count + 1) % CYCLES_PER_SECOND; cache->rx_cycle_count = (cache->rx_cycle_count + 1) % CYCLES_PER_SECOND;
} }
static unsigned int process_it_ctx_payloads(struct amdtp_stream *s, static void process_it_ctx_payloads(struct amdtp_stream *s, const struct pkt_desc *desc,
const struct pkt_desc *desc, unsigned int count, struct snd_pcm_substream *pcm)
unsigned int count,
struct snd_pcm_substream *pcm)
{ {
struct amdtp_motu *p = s->protocol; struct amdtp_motu *p = s->protocol;
const struct pkt_desc *cursor = desc; const struct pkt_desc *cursor = desc;
@ -435,8 +429,6 @@ static unsigned int process_it_ctx_payloads(struct amdtp_stream *s,
if (trace_data_block_sph_enabled() || if (trace_data_block_sph_enabled() ||
trace_data_block_message_enabled()) trace_data_block_message_enabled())
probe_tracepoints_events(s, desc, count); probe_tracepoints_events(s, desc, count);
return pcm_frames;
} }
int amdtp_motu_init(struct amdtp_stream *s, struct fw_unit *unit, int amdtp_motu_init(struct amdtp_stream *s, struct fw_unit *unit,

16
sound/firewire/tascam/amdtp-tascam.c
View File

@ -176,10 +176,8 @@ static void read_status_messages(struct amdtp_stream *s,
} }
} }
static unsigned int process_ir_ctx_payloads(struct amdtp_stream *s, static void process_ir_ctx_payloads(struct amdtp_stream *s, const struct pkt_desc *desc,
const struct pkt_desc *desc, unsigned int count, struct snd_pcm_substream *pcm)
unsigned int count,
struct snd_pcm_substream *pcm)
{ {
unsigned int pcm_frames = 0; unsigned int pcm_frames = 0;
int i; int i;
@ -197,14 +195,10 @@ static unsigned int process_ir_ctx_payloads(struct amdtp_stream *s,
desc = amdtp_stream_next_packet_desc(s, desc); desc = amdtp_stream_next_packet_desc(s, desc);
} }
return pcm_frames;
} }
static unsigned int process_it_ctx_payloads(struct amdtp_stream *s, static void process_it_ctx_payloads(struct amdtp_stream *s, const struct pkt_desc *desc,
const struct pkt_desc *desc, unsigned int count, struct snd_pcm_substream *pcm)
unsigned int count,
struct snd_pcm_substream *pcm)
{ {
unsigned int pcm_frames = 0; unsigned int pcm_frames = 0;
int i; int i;
@ -222,8 +216,6 @@ static unsigned int process_it_ctx_payloads(struct amdtp_stream *s,
desc = amdtp_stream_next_packet_desc(s, desc); desc = amdtp_stream_next_packet_desc(s, desc);
} }
return pcm_frames;
} }
int amdtp_tscm_init(struct amdtp_stream *s, struct fw_unit *unit, int amdtp_tscm_init(struct amdtp_stream *s, struct fw_unit *unit,