diff options
author | cg <cg@FreeBSD.org> | 2000-09-17 23:46:32 +0000 |
---|---|---|
committer | cg <cg@FreeBSD.org> | 2000-09-17 23:46:32 +0000 |
commit | 2078d1f36cd4d10d7fba4191624fd6b5bac4ccc7 (patch) | |
tree | 1ae789eae5572bd7c6bd65b2593ea63e186ffc7b /sys | |
parent | add9046a9769a8132c3d2bbd321b5edbdb34c957 (diff) | |
download | FreeBSD-src-2078d1f36cd4d10d7fba4191624fd6b5bac4ccc7.zip FreeBSD-src-2078d1f36cd4d10d7fba4191624fd6b5bac4ccc7.tar.gz |
fix warnings
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/sound/pci/ds1.c | 2 | ||||
-rw-r--r-- | sys/dev/sound/pci/neomagic.c | 2 | ||||
-rw-r--r-- | sys/dev/sound/pci/solo.c | 3 | ||||
-rw-r--r-- | sys/dev/sound/pci/t4dwave.c | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/sys/dev/sound/pci/ds1.c b/sys/dev/sound/pci/ds1.c index 89adad2..bf2c79a 100644 --- a/sys/dev/sound/pci/ds1.c +++ b/sys/dev/sound/pci/ds1.c @@ -155,7 +155,6 @@ struct { /* channel interface */ static void *ds1pchan_init(void *devinfo, snd_dbuf *b, pcm_channel *c, int dir); -static int ds1pchan_setdir(void *data, int dir); static int ds1pchan_setformat(void *data, u_int32_t format); static int ds1pchan_setspeed(void *data, u_int32_t speed); static int ds1pchan_setblocksize(void *data, u_int32_t blocksize); @@ -164,7 +163,6 @@ static int ds1pchan_getptr(void *data); static pcmchan_caps *ds1pchan_getcaps(void *data); static void *ds1rchan_init(void *devinfo, snd_dbuf *b, pcm_channel *c, int dir); -static int ds1rchan_setdir(void *data, int dir); static int ds1rchan_setformat(void *data, u_int32_t format); static int ds1rchan_setspeed(void *data, u_int32_t speed); static int ds1rchan_setblocksize(void *data, u_int32_t blocksize); diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c index 7cfe838..6867253 100644 --- a/sys/dev/sound/pci/neomagic.c +++ b/sys/dev/sound/pci/neomagic.c @@ -79,7 +79,6 @@ struct sc_info { /* channel interface */ static void *nmchan_init(void *devinfo, snd_dbuf *b, pcm_channel *c, int dir); static int nmchan_free(void *data); -static int nmchan_setdir(void *data, int dir); static int nmchan_setformat(void *data, u_int32_t format); static int nmchan_setspeed(void *data, u_int32_t speed); static int nmchan_setblocksize(void *data, u_int32_t blocksize); @@ -705,6 +704,7 @@ static device_method_t nm_methods[] = { /* Device interface */ DEVMETHOD(device_probe, nm_pci_probe), DEVMETHOD(device_attach, nm_pci_attach), + DEVMETHOD(device_detach, nm_pci_detach), DEVMETHOD(device_resume, nm_pci_resume), { 0, 0 } }; diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c index 315262d..f36d07e 100644 --- a/sys/dev/sound/pci/solo.c +++ b/sys/dev/sound/pci/solo.c @@ -44,7 +44,6 @@ /* channel interface for ESS */ static void *esschan_init(void *devinfo, snd_dbuf *b, pcm_channel *c, int dir); -static int esschan_setdir(void *data, int dir); static int esschan_setformat(void *data, u_int32_t format); static int esschan_setspeed(void *data, u_int32_t speed); static int esschan_setblocksize(void *data, u_int32_t blocksize); @@ -995,7 +994,7 @@ static int ess_detach(device_t dev) { int r; - struct sc_info *sc; + struct ess_info *sc; r = pcm_unregister(dev); if (r) diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c index f411338..df11fb9 100644 --- a/sys/dev/sound/pci/t4dwave.c +++ b/sys/dev/sound/pci/t4dwave.c @@ -611,7 +611,7 @@ tr_pci_attach(device_t dev) { u_int32_t data; struct tr_info *tr; - struct ac97_info *codec; + struct ac97_info *codec = 0; int i; int mapped; char status[SND_STATUSLEN]; |