Page MenuHomeFreeBSD
Files F134683784

D53555.id.diff
No OneTemporary
Actions

D53555.id.diff
View Options

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
@@ -35,7 +35,6 @@
struct feeder_class {
KOBJ_CLASS_FIELDS;
struct pcm_feederdesc desc;
- void *data;
SLIST_ENTRY(feeder_class) link;
};
@@ -64,13 +63,12 @@
void feeder_printchain(struct pcm_feeder *head);
int feeder_chain(struct pcm_channel *);
-#define FEEDER_DECLARE(feeder, type, pdata) \
+#define FEEDER_DECLARE(feeder, type) \
static struct feeder_class feeder ## _class = { \
.name = #feeder, \
.methods = feeder ## _methods, \
.size = sizeof(struct pcm_feeder), \
.desc = { type, 0, 0 }, \
- .data = pdata, \
}; \
SYSINIT(feeder, SI_SUB_DRIVERS, SI_ORDER_ANY, feeder_register, \
&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
@@ -92,7 +92,7 @@
if (f == NULL)
return NULL;
- f->data = fc->data;
+ f->data = NULL;
f->source = NULL;
f->parent = NULL;
f->class = fc;
@@ -405,7 +405,6 @@
.methods = feeder_root_methods,
.size = sizeof(struct pcm_feeder),
.desc = { FEEDER_ROOT, 0, 0 },
- .data = NULL,
};
/*
* Register the root feeder first so that pcm_addchan() and subsequent
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
@@ -427,7 +427,7 @@
KOBJMETHOD_END
};
-FEEDER_DECLARE(feeder_eq, FEEDER_EQ, NULL);
+FEEDER_DECLARE(feeder_eq, FEEDER_EQ);
static int32_t
feed_eq_scan_preamp_arg(const char *s)
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
@@ -180,4 +180,4 @@
KOBJMETHOD_END
};
-FEEDER_DECLARE(feeder_format, FEEDER_FORMAT, NULL);
+FEEDER_DECLARE(feeder_format, FEEDER_FORMAT);
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
@@ -405,7 +405,7 @@
KOBJMETHOD_END
};
-FEEDER_DECLARE(feeder_matrix, FEEDER_MATRIX, NULL);
+FEEDER_DECLARE(feeder_matrix, FEEDER_MATRIX);
/* External */
int
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
@@ -366,4 +366,4 @@
KOBJMETHOD_END
};
-FEEDER_DECLARE(feeder_mixer, FEEDER_MIXER, NULL);
+FEEDER_DECLARE(feeder_mixer, FEEDER_MIXER);
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
@@ -1714,4 +1714,4 @@
KOBJMETHOD_END
};
-FEEDER_DECLARE(feeder_rate, FEEDER_RATE, NULL);
+FEEDER_DECLARE(feeder_rate, FEEDER_RATE);
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
@@ -314,7 +314,7 @@
KOBJMETHOD_END
};
-FEEDER_DECLARE(feeder_volume, FEEDER_VOLUME, NULL);
+FEEDER_DECLARE(feeder_volume, FEEDER_VOLUME);
/* Extern */

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 5, 12:10 AM (3 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
24767024
Default Alt Text
D53555.id.diff (3 KB)

Event Timeline