diff options
| author | Cameron Grant <cg@FreeBSD.org> | 2000-09-17 23:46:32 +0000 |
|---|---|---|
| committer | Cameron Grant <cg@FreeBSD.org> | 2000-09-17 23:46:32 +0000 |
| commit | 7dfc9325486a557e30be763685a5ccd3b90f1dfe (patch) | |
| tree | eefacdba3bd5e88cb80a3bcd7a6f9a92b21da1af | |
| parent | 7d854d93afb88d6bbfd25d6e0b3ddbbc4dc98392 (diff) | |
| download | src-7dfc9325486a557e30be763685a5ccd3b90f1dfe.tar.gz src-7dfc9325486a557e30be763685a5ccd3b90f1dfe.zip | |
fix warnings
Notes
Notes:
svn path=/head/; revision=66012
| -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 89adad2a9cef..bf2c79af0b5c 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 7cfe838f86cd..686725321896 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 315262d2ac31..f36d07e017c1 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 f41133890ada..df11fb9de437 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]; |