diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h --- 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 @@ .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.c b/sys/dev/sound/pcm/feeder.c --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -97,8 +97,7 @@ { 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 @@ 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_chain.c b/sys/dev/sound/pcm/feeder_chain.c --- a/sys/dev/sound/pcm/feeder_chain.c +++ b/sys/dev/sound/pcm/feeder_chain.c @@ -147,7 +147,6 @@ desc->type = FEEDER_FORMAT; desc->in = 0; desc->out = 0; - desc->flags = 0; fc = feeder_getclass(desc); if (fc == NULL) { @@ -220,7 +219,6 @@ desc->type = FEEDER_RATE; desc->in = 0; desc->out = 0; - desc->flags = 0; fc = feeder_getclass(desc); if (fc == NULL) { @@ -298,7 +296,6 @@ desc->type = FEEDER_MATRIX; desc->in = 0; desc->out = 0; - desc->flags = 0; fc = feeder_getclass(desc); if (fc == NULL) { @@ -355,7 +352,6 @@ desc->type = FEEDER_VOLUME; desc->in = 0; desc->out = 0; - desc->flags = 0; fc = feeder_getclass(desc); if (fc == NULL) { @@ -423,7 +419,6 @@ desc->type = FEEDER_EQ; desc->in = 0; desc->out = 0; - desc->flags = 0; fc = feeder_getclass(desc); if (fc == NULL) { @@ -503,7 +498,6 @@ desc->type = FEEDER_MIXER; desc->in = 0; desc->out = 0; - desc->flags = 0; fc = feeder_getclass(desc); if (fc == NULL) {