kernel/sound: Remove some unused variables.

diff --git a/sys/dev/sound/isa/gusc.c b/sys/dev/sound/isa/gusc.c
index 1ca81fe..f34ea04 100644 (file)
--- a/sys/dev/sound/isa/gusc.c
+++ b/sys/dev/sound/isa/gusc.c
@@ -297,11 +297,9 @@ static int
 gusc_attach(device_t dev)
 {
        sc_p scp;
-       int unit;
        void *ih;
 
        scp = device_get_softc(dev);
-       unit = device_get_unit(dev);
 
        bzero(scp, sizeof(*scp));
 
@@ -564,16 +562,13 @@ alloc_resource(sc_p scp)
 static int
 release_resource(sc_p scp)
 {
-       int i, lid, flags;
+       int i, lid;
        device_t dev;
 
-       flags = 0;
        if (isa_get_vendorid(scp->dev))
                lid = isa_get_logicalid(scp->dev);
-       else {
+       else
                lid = LOGICALID_NOPNP;
-               flags = device_get_flags(scp->dev);
-       }
        switch(lid) {
        case LOGICALID_PCM:
        case LOGICALID_NOPNP:           /* XXX Non-PnP */

diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c
index 0c0376a..8106da0 100644 (file)
--- a/sys/dev/sound/isa/mss.c
+++ b/sys/dev/sound/isa/mss.c
@@ -1272,7 +1272,10 @@ static int
 mss_probe(device_t dev)
 {
        u_char tmp, tmpx;
-       int flags, irq, drq, result = ENXIO, setres = 0;
+       int flags, irq, drq, result = ENXIO;
+#if 0
+       int setres = 0;
+#endif
        struct mss_info *mss;
 
        if (isa_get_logicalid(dev)) return ENXIO; /* not yet */
@@ -1289,7 +1292,9 @@ mss_probe(device_t dev)
                BVDDB(kprintf("mss_probe: no address given, try 0x%x\n", 0x530));
                mss->io_rid = 0;
                /* XXX verify this */
+#if 0
                setres = 1;
+#endif
                bus_set_resource(dev, SYS_RES_IOPORT, mss->io_rid,
                                0x530, 8, -1);
                mss->io_base = bus_alloc_resource(dev, SYS_RES_IOPORT, &mss->io_rid,

diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c
index 1fe150c..d1a50c6 100644 (file)
--- a/sys/dev/sound/pci/cs4281.c
+++ b/sys/dev/sound/pci/cs4281.c
@@ -248,9 +248,6 @@ static u_int32_t
 cs4281_rdcd(kobj_t obj, void *devinfo, int regno)
 {
     struct sc_info *sc = (struct sc_info *)devinfo;
-    int codecno;
-
-    codecno = regno >> 8;
     regno &= 0xff;
 
     /* Remove old state */
@@ -282,9 +279,6 @@ static void
 cs4281_wrcd(kobj_t obj, void *devinfo, int regno, u_int32_t data)
 {
     struct sc_info *sc = (struct sc_info *)devinfo;
-    int codecno;
-
-    codecno = regno >> 8;
     regno &= 0xff;
 
     cs4281_wr(sc, CS4281PCI_ACCAD, regno);

diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c
index 856ec5c..56a1345 100644 (file)
--- a/sys/dev/sound/pci/csapcm.c
+++ b/sys/dev/sound/pci/csapcm.c
@@ -772,13 +772,11 @@ pcmcsa_attach(device_t dev)
 {
        struct csa_info *csa;
        csa_res *resp;
-       int unit;
        char status[SND_STATUSLEN];
        struct ac97_info *codec;
        struct sndcard_func *func;
 
        csa = kmalloc(sizeof(*csa), M_DEVBUF, M_WAITOK | M_ZERO);
-       unit = device_get_unit(dev);
        func = device_get_ivars(dev);
        csa->binfo = func->varinfo;
        /*

diff --git a/sys/dev/sound/pci/ds1.c b/sys/dev/sound/pci/ds1.c
index 1092ca1..a390be4 100644 (file)
--- a/sys/dev/sound/pci/ds1.c
+++ b/sys/dev/sound/pci/ds1.c
@@ -334,9 +334,8 @@ AC97_DECLARE(ds_ac97);
 static void
 ds_enadsp(struct sc_info *sc, int on)
 {
-       u_int32_t v, i;
+       u_int32_t i;
 
-       v = on? 1 : 0;
        if (on) {
                ds_wr(sc, YDSXGR_CONFIG, 0x00000001, 4);
        } else {

diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c
index 52c44bd..1f0471b 100644 (file)
--- a/sys/dev/sound/pci/emu10k1.c
+++ b/sys/dev/sound/pci/emu10k1.c
@@ -775,14 +775,13 @@ emupchan_setblocksize(kobj_t obj, void *data, u_int32_t blocksize)
 {
        struct sc_pchinfo *ch = data;
        struct sc_info *sc = ch->parent;
-       int irqrate, blksz;
+       int irqrate;
 
        ch->blksz = blocksize;
        snd_mtxlock(sc->lock);
        emu_settimer(sc);
        irqrate = 48000 / sc->timerinterval;
        snd_mtxunlock(sc->lock);
-       blksz = (ch->spd * sndbuf_getbps(ch->buffer)) / irqrate;
        return blocksize;
 }
 
@@ -936,14 +935,13 @@ emurchan_setblocksize(kobj_t obj, void *data, u_int32_t blocksize)
 {
        struct sc_rchinfo *ch = data;
        struct sc_info *sc = ch->parent;
-       int irqrate, blksz;
+       int irqrate;
 
        ch->blksz = blocksize;
        snd_mtxlock(sc->lock);
        emu_settimer(sc);
        irqrate = 48000 / sc->timerinterval;
        snd_mtxunlock(sc->lock);
-       blksz = (ch->spd * sndbuf_getbps(ch->buffer)) / irqrate;
        return blocksize;
 }
 

diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c
index 5ff3a6b..9f71188 100644 (file)
--- a/sys/dev/sound/pci/es137x.c
+++ b/sys/dev/sound/pci/es137x.c
@@ -1356,12 +1356,10 @@ static void
 es_init_sysctls(device_t dev)
 {
 #ifdef SND_DYNSYSCTL
-       struct es_info *es;
        int r, devid, revid;
 
        devid = pci_get_devid(dev);
        revid = pci_get_revid(dev);
-       es = pcm_getdevinfo(dev);
        if ((devid == ES1371_PCI_ID && revid == ES1371REV_ES1373_8) ||
                    (devid == ES1371_PCI_ID && revid == ES1371REV_CT5880_A) ||
                    (devid == CT5880_PCI_ID && revid == CT5880REV_CT5880_C) ||

diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c
index 88fa5e6..8e91e96 100644 (file)
--- a/sys/dev/sound/pci/hda/hdac.c
+++ b/sys/dev/sound/pci/hda/hdac.c
@@ -1182,7 +1182,6 @@ hdac_intr_handler(void *context)
        struct hdac_softc *sc;
        uint32_t intsts;
        uint8_t rirbsts;
-       struct hdac_rirb *rirb_base;
        uint32_t trigger;
 
        sc = (struct hdac_softc *)context;
@@ -1204,7 +1203,6 @@ hdac_intr_handler(void *context)
 
        /* Was this a controller interrupt? */
        if (HDA_FLAG_MATCH(intsts, HDAC_INTSTS_CIS)) {
-               rirb_base = (struct hdac_rirb *)sc->rirb_dma.dma_vaddr;
                rirbsts = HDAC_READ_1(&sc->mem, HDAC_RIRBSTS);
                /* Get as many responses that we can */
                while (HDA_FLAG_MATCH(rirbsts, HDAC_RIRBSTS_RINTFL)) {
@@ -2902,7 +2900,6 @@ hdac_command_send_internal(struct hdac_softc *sc,
        uint32_t *corb;
        int timeout;
        int retry = 10;
-       struct hdac_rirb *rirb_base;
 
        if (sc == NULL || sc->codecs[cad] == NULL || commands == NULL ||
            commands->num_commands < 1)
@@ -2913,7 +2910,6 @@ hdac_command_send_internal(struct hdac_softc *sc,
        codec->responses_received = 0;
        codec->verbs_sent = 0;
        corb = (uint32_t *)sc->corb_dma.dma_vaddr;
-       rirb_base = (struct hdac_rirb *)sc->rirb_dma.dma_vaddr;
 
        do {
                if (codec->verbs_sent != commands->num_commands) {

diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c
index ece1256..f3681bf 100644 (file)
--- a/sys/dev/sound/pci/via82c686.c
+++ b/sys/dev/sound/pci/via82c686.c
@@ -341,13 +341,11 @@ viachan_trigger(kobj_t obj, void *data, int go)
 {
        struct via_chinfo *ch = data;
        struct via_info *via = ch->parent;
-       struct via_dma_op *ado;
        bus_addr_t sgd_addr = ch->sgd_addr;
 
        if (go == PCMTRIG_EMLDMAWR || go == PCMTRIG_EMLDMARD)
                return 0;
 
-       ado = ch->sgd_table;
        DEB(kprintf("ado located at va=%p pa=%x\n", ado, sgd_addr));
 
        snd_mtxlock(via->lock);
@@ -368,11 +366,9 @@ viachan_getptr(kobj_t obj, void *data)
 {
        struct via_chinfo *ch = data;
        struct via_info *via = ch->parent;
-       struct via_dma_op *ado;
        bus_addr_t sgd_addr = ch->sgd_addr;
        int ptr, base, base1, len, seg;
 
-       ado = ch->sgd_table;
        snd_mtxlock(via->lock);
        base1 = via_rd(via, ch->base, 4);
        len = via_rd(via, ch->count, 4);

diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c
index 4af3bae..5316782 100644 (file)
--- a/sys/dev/sound/pcm/ac97.c
+++ b/sys/dev/sound/pcm/ac97.c
@@ -597,7 +597,7 @@ ac97_initmixer(struct ac97_info *codec)
        ac97_patch codec_patch;
        const char *cname, *vname;
        char desc[80];
-       u_int8_t model, step;
+       u_int8_t step;
        unsigned i, j, k, bit, old;
        u_int32_t id;
        int reg;
@@ -643,14 +643,13 @@ ac97_initmixer(struct ac97_info *codec)
        codec_patch = NULL;
 
        cname = NULL;
-       model = step = 0;
+       step = 0;
        for (i = 0; ac97codecid[i].id; i++) {
                u_int32_t modelmask = 0xffffffff ^ ac97codecid[i].stepmask;
                if ((ac97codecid[i].id & modelmask) == (id & modelmask)) {
                        codec->noext = ac97codecid[i].noext;
                        codec_patch = ac97codecid[i].patch;
                        cname = ac97codecid[i].name;
-                       model = (id & modelmask) & 0xff;
                        step = (id & ~modelmask) & 0xff;
                        break;
                }