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 @@ -31,7 +31,6 @@ u_int32_t type; u_int32_t in, out; u_int32_t flags; - int idx; }; struct feeder_class { 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 @@ -48,8 +48,6 @@ SLIST_ENTRY(feedertab_entry) link; struct feeder_class *feederclass; struct pcm_feederdesc *desc; - - int idx; }; static SLIST_HEAD(, feedertab_entry) feedertab; static int feedercnt = 0; @@ -69,7 +67,6 @@ fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); fte->feederclass = fc; fte->desc = NULL; - fte->idx = feedercnt; SLIST_INSERT_HEAD(&feedertab, fte, link); feedercnt++; } @@ -92,8 +89,6 @@ fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); fte->feederclass = fc; fte->desc = &fc->desc[i]; - fte->idx = feedercnt; - fte->desc->idx = feedercnt; SLIST_INSERT_HEAD(&feedertab, fte, link); i++; } @@ -156,7 +151,6 @@ f->desc->in = 0; f->desc->out = 0; f->desc->flags = 0; - f->desc->idx = 0; } err = FEEDER_INIT(f); @@ -394,7 +388,7 @@ printf("feeder chain (head @%p)\n", head); f = head; while (f != NULL) { - printf("%s/%d @ %p\n", f->class->name, f->desc->idx, f); + printf("%s @ %p\n", f->class->name, f); f = f->source; } printf("[end]\n\n"); diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -420,8 +420,8 @@ } static struct pcm_feederdesc feeder_eq_desc[] = { - { FEEDER_EQ, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0 } + { FEEDER_EQ, 0, 0, 0 }, + { 0, 0, 0, 0 } }; static kobj_method_t feeder_eq_methods[] = { diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c --- a/sys/dev/sound/pcm/feeder_format.c +++ b/sys/dev/sound/pcm/feeder_format.c @@ -173,8 +173,8 @@ } static struct pcm_feederdesc feeder_format_desc[] = { - { FEEDER_FORMAT, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0 } + { FEEDER_FORMAT, 0, 0, 0 }, + { 0, 0, 0, 0 } }; static kobj_method_t feeder_format_methods[] = { diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c --- a/sys/dev/sound/pcm/feeder_matrix.c +++ b/sys/dev/sound/pcm/feeder_matrix.c @@ -399,8 +399,8 @@ } static struct pcm_feederdesc feeder_matrix_desc[] = { - { FEEDER_MATRIX, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0 } + { FEEDER_MATRIX, 0, 0, 0 }, + { 0, 0, 0, 0 } }; static kobj_method_t feeder_matrix_methods[] = { diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c --- a/sys/dev/sound/pcm/feeder_mixer.c +++ b/sys/dev/sound/pcm/feeder_mixer.c @@ -359,8 +359,8 @@ } static struct pcm_feederdesc feeder_mixer_desc[] = { - { FEEDER_MIXER, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0 } + { FEEDER_MIXER, 0, 0, 0 }, + { 0, 0, 0, 0 } }; static kobj_method_t feeder_mixer_methods[] = { diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c --- a/sys/dev/sound/pcm/feeder_rate.c +++ b/sys/dev/sound/pcm/feeder_rate.c @@ -1706,8 +1706,8 @@ } static struct pcm_feederdesc feeder_rate_desc[] = { - { FEEDER_RATE, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0 }, + { FEEDER_RATE, 0, 0, 0 }, + { 0, 0, 0, 0 }, }; static kobj_method_t feeder_rate_methods[] = { diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -307,8 +307,8 @@ } static struct pcm_feederdesc feeder_volume_desc[] = { - { FEEDER_VOLUME, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0 } + { FEEDER_VOLUME, 0, 0, 0 }, + { 0, 0, 0, 0 } }; static kobj_method_t feeder_volume_methods[] = {