summaryrefslogtreecommitdiffstats
path: root/sys/dev/sound/pci/neomagic.c
diff options
context:
space:
mode:
authornjl <njl@FreeBSD.org>2004-03-17 17:50:55 +0000
committernjl <njl@FreeBSD.org>2004-03-17 17:50:55 +0000
commit05a1f56fc999f634406946e831eea6deaaa75a99 (patch)
treea1c3f00139d832c8e80338cfc56c8b1aaffd88ab /sys/dev/sound/pci/neomagic.c
parent2283471bb53a546e9d7dfb662c8db5ca06907c85 (diff)
downloadFreeBSD-src-05a1f56fc999f634406946e831eea6deaaa75a99.zip
FreeBSD-src-05a1f56fc999f634406946e831eea6deaaa75a99.tar.gz
Convert callers to the new bus_alloc_resource_any(9) API.
Submitted by: Mark Santcroos <marks@ripe.net> Reviewed by: imp, dfr, bde
Diffstat (limited to 'sys/dev/sound/pci/neomagic.c')
-rw-r--r--sys/dev/sound/pci/neomagic.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c
index 47fffdd..be428e0 100644
--- a/sys/dev/sound/pci/neomagic.c
+++ b/sys/dev/sound/pci/neomagic.c
@@ -609,9 +609,9 @@ nm_pci_probe(device_t dev)
PCIM_CMD_BUSMASTEREN, 2);
sc->regid = PCIR_BAR(1);
- sc->reg = bus_alloc_resource(dev, SYS_RES_MEMORY,
- &sc->regid, 0, ~0, 1,
- RF_ACTIVE);
+ sc->reg = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+ &sc->regid,
+ RF_ACTIVE);
if (!sc->reg) {
device_printf(dev, "unable to map register space\n");
@@ -676,11 +676,11 @@ nm_pci_attach(device_t dev)
data = pci_read_config(dev, PCIR_COMMAND, 2);
sc->bufid = PCIR_BAR(0);
- sc->buf = bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->bufid,
- 0, ~0, 1, RF_ACTIVE);
+ sc->buf = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->bufid,
+ RF_ACTIVE);
sc->regid = PCIR_BAR(1);
- sc->reg = bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->regid,
- 0, ~0, 1, RF_ACTIVE);
+ sc->reg = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->regid,
+ RF_ACTIVE);
if (!sc->buf || !sc->reg) {
device_printf(dev, "unable to map register space\n");
@@ -697,8 +697,8 @@ nm_pci_attach(device_t dev)
if (mixer_init(dev, ac97_getmixerclass(), codec) == -1) goto bad;
sc->irqid = 0;
- sc->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->irqid,
- 0, ~0, 1, RF_ACTIVE | RF_SHAREABLE);
+ sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->irqid,
+ RF_ACTIVE | RF_SHAREABLE);
if (!sc->irq || snd_setup_intr(dev, sc->irq, 0, nm_intr, sc, &sc->ih)) {
device_printf(dev, "unable to map interrupt\n");
goto bad;
OpenPOWER on IntegriCloud