The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0e9e222518dc543e34f891c00d2a6a1dd93c3fc2
commit 0e9e222518dc543e34f891c00d2a6a1dd93c3fc2 Author: Christos Margiolis <[email protected]> AuthorDate: 2025-11-11 12:06:05 +0000 Commit: Christos Margiolis <[email protected]> CommitDate: 2025-11-11 12:06:05 +0000 sound: Retire unused pcm_feederdesc->flags Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53552 --- sys/dev/sound/pcm/feeder.c | 4 +--- sys/dev/sound/pcm/feeder.h | 3 +-- sys/dev/sound/pcm/feeder_chain.c | 6 ------ 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 0dddfa84543d..6b7c7f43903c 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -97,8 +97,7 @@ cmpdesc(struct pcm_feederdesc *n, struct pcm_feederdesc *m) { return ((n->type == m->type) && ((n->in == 0) || (n->in == m->in)) && - ((n->out == 0) || (n->out == m->out)) && - (n->flags == m->flags)); + ((n->out == 0) || (n->out == m->out))); } static void @@ -130,7 +129,6 @@ feeder_create(struct feeder_class *fc, struct pcm_feederdesc *desc) f->desc->type = FEEDER_ROOT; f->desc->in = 0; f->desc->out = 0; - f->desc->flags = 0; } err = FEEDER_INIT(f); diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index d8760f1c87ab..86cabb3e9925 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -30,7 +30,6 @@ struct pcm_feederdesc { u_int32_t type; u_int32_t in, out; - u_int32_t flags; }; struct feeder_class { @@ -69,7 +68,7 @@ static struct feeder_class feeder ## _class = { \ .name = #feeder, \ .methods = feeder ## _methods, \ .size = sizeof(struct pcm_feeder), \ - .desc = { type, 0, 0, 0 }, \ + .desc = { type, 0, 0 }, \ .data = pdata, \ }; \ SYSINIT(feeder, SI_SUB_DRIVERS, SI_ORDER_ANY, feeder_register, \ diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feeder_chain.c index 8b5d50760b32..f5075bf76a49 100644 --- a/sys/dev/sound/pcm/feeder_chain.c +++ b/sys/dev/sound/pcm/feeder_chain.c @@ -147,7 +147,6 @@ feeder_build_format(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->type = FEEDER_FORMAT; desc->in = 0; desc->out = 0; - desc->flags = 0; fc = feeder_getclass(desc); if (fc == NULL) { @@ -220,7 +219,6 @@ feeder_build_rate(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->type = FEEDER_RATE; desc->in = 0; desc->out = 0; - desc->flags = 0; fc = feeder_getclass(desc); if (fc == NULL) { @@ -298,7 +296,6 @@ feeder_build_matrix(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->type = FEEDER_MATRIX; desc->in = 0; desc->out = 0; - desc->flags = 0; fc = feeder_getclass(desc); if (fc == NULL) { @@ -355,7 +352,6 @@ feeder_build_volume(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->type = FEEDER_VOLUME; desc->in = 0; desc->out = 0; - desc->flags = 0; fc = feeder_getclass(desc); if (fc == NULL) { @@ -423,7 +419,6 @@ feeder_build_eq(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->type = FEEDER_EQ; desc->in = 0; desc->out = 0; - desc->flags = 0; fc = feeder_getclass(desc); if (fc == NULL) { @@ -503,7 +498,6 @@ feeder_build_mixer(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->type = FEEDER_MIXER; desc->in = 0; desc->out = 0; - desc->flags = 0; fc = feeder_getclass(desc); if (fc == NULL) {
