Add lock type arguments to callers of snd_mtxcreate().
This commit is contained in:
parent
4b97a93ad9
commit
489c22ebb8
@ -587,7 +587,7 @@ ad1816_attach(device_t dev)
|
||||
ad1816 = (struct ad1816_info *)malloc(sizeof *ad1816, M_DEVBUF, M_NOWAIT | M_ZERO);
|
||||
if (!ad1816) return ENXIO;
|
||||
|
||||
ad1816->lock = snd_mtxcreate(device_get_nameunit(dev));
|
||||
ad1816->lock = snd_mtxcreate(device_get_nameunit(dev), "sound softc");
|
||||
ad1816->io_rid = 2;
|
||||
ad1816->irq_rid = 0;
|
||||
ad1816->drq1_rid = 0;
|
||||
|
@ -1665,7 +1665,7 @@ mss_doattach(device_t dev, struct mss_info *mss)
|
||||
int pdma, rdma, flags = device_get_flags(dev);
|
||||
char status[SND_STATUSLEN], status2[SND_STATUSLEN];
|
||||
|
||||
mss->lock = snd_mtxcreate(device_get_nameunit(dev));
|
||||
mss->lock = snd_mtxcreate(device_get_nameunit(dev), "sound softc");
|
||||
mss->bufsize = pcm_getbuffersize(dev, 4096, MSS_DEFAULT_BUFSZ, 65536);
|
||||
if (!mss_alloc_resources(mss, dev)) goto no;
|
||||
mss_init(mss, dev);
|
||||
|
@ -114,7 +114,7 @@ static void sb_setmixer(struct resource *io, u_int port, u_int value);
|
||||
static void
|
||||
sbc_lockinit(struct sbc_softc *scp)
|
||||
{
|
||||
scp->lock = snd_mtxcreate(device_get_nameunit(scp->dev));
|
||||
scp->lock = snd_mtxcreate(device_get_nameunit(scp->dev), "sound softc");
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -842,7 +842,7 @@ cmi_attach(device_t dev)
|
||||
return ENXIO;
|
||||
}
|
||||
|
||||
sc->lock = snd_mtxcreate(device_get_nameunit(dev));
|
||||
sc->lock = snd_mtxcreate(device_get_nameunit(dev), "sound softc");
|
||||
data = pci_read_config(dev, PCIR_COMMAND, 2);
|
||||
data |= (PCIM_CMD_PORTEN|PCIM_CMD_BUSMASTEREN);
|
||||
pci_write_config(dev, PCIR_COMMAND, data, 2);
|
||||
|
@ -939,7 +939,7 @@ ds_pci_attach(device_t dev)
|
||||
return ENXIO;
|
||||
}
|
||||
|
||||
sc->lock = snd_mtxcreate(device_get_nameunit(dev));
|
||||
sc->lock = snd_mtxcreate(device_get_nameunit(dev), "sound softc");
|
||||
sc->dev = dev;
|
||||
subdev = (pci_get_subdevice(dev) << 16) | pci_get_subvendor(dev);
|
||||
sc->type = ds_finddev(pci_get_devid(dev), subdev);
|
||||
|
@ -1460,7 +1460,7 @@ emu_pci_attach(device_t dev)
|
||||
return ENXIO;
|
||||
}
|
||||
|
||||
sc->lock = snd_mtxcreate(device_get_nameunit(dev));
|
||||
sc->lock = snd_mtxcreate(device_get_nameunit(dev), "sound softc");
|
||||
sc->dev = dev;
|
||||
sc->type = pci_get_devid(dev);
|
||||
sc->rev = pci_get_revid(dev);
|
||||
|
@ -765,7 +765,7 @@ tr_pci_attach(device_t dev)
|
||||
}
|
||||
|
||||
tr->type = pci_get_devid(dev);
|
||||
tr->lock = snd_mtxcreate(device_get_nameunit(dev));
|
||||
tr->lock = snd_mtxcreate(device_get_nameunit(dev), "sound softc");
|
||||
|
||||
data = pci_read_config(dev, PCIR_COMMAND, 2);
|
||||
data |= (PCIM_CMD_PORTEN|PCIM_CMD_MEMEN|PCIM_CMD_BUSMASTEREN);
|
||||
|
@ -498,7 +498,7 @@ ac97_create(device_t dev, void *devinfo, kobj_class_t cls)
|
||||
return NULL;
|
||||
|
||||
snprintf(codec->name, AC97_NAMELEN, "%s:ac97", device_get_nameunit(dev));
|
||||
codec->lock = snd_mtxcreate(codec->name);
|
||||
codec->lock = snd_mtxcreate(codec->name, "ac97 codec");
|
||||
codec->methods = kobj_create(cls, M_AC97, M_WAITOK);
|
||||
if (codec->methods == NULL) {
|
||||
snd_mtxlock(codec->lock);
|
||||
|
@ -70,7 +70,7 @@ static int chn_buildfeeder(struct pcm_channel *c);
|
||||
static void
|
||||
chn_lockinit(struct pcm_channel *c)
|
||||
{
|
||||
c->lock = snd_mtxcreate(c->name);
|
||||
c->lock = snd_mtxcreate(c->name, "pcm channel");
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -202,7 +202,7 @@ mixer_init(device_t dev, kobj_class_t cls, void *devinfo)
|
||||
|
||||
m = (struct snd_mixer *)kobj_create(cls, M_MIXER, M_WAITOK | M_ZERO);
|
||||
snprintf(m->name, MIXER_NAMELEN, "%s:mixer", device_get_nameunit(dev));
|
||||
m->lock = snd_mtxcreate(m->name);
|
||||
m->lock = snd_mtxcreate(m->name, "pcm mixer");
|
||||
m->type = cls->name;
|
||||
m->devinfo = devinfo;
|
||||
m->busy = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user