diff options
| author | njl <njl@FreeBSD.org> | 2004-03-17 17:50:55 +0000 |
|---|---|---|
| committer | njl <njl@FreeBSD.org> | 2004-03-17 17:50:55 +0000 |
| commit | 05a1f56fc999f634406946e831eea6deaaa75a99 (patch) | |
| tree | a1c3f00139d832c8e80338cfc56c8b1aaffd88ab /sys/dev/mlx | |
| parent | 2283471bb53a546e9d7dfb662c8db5ca06907c85 (diff) | |
| download | FreeBSD-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/mlx')
| -rw-r--r-- | sys/dev/mlx/mlx.c | 3 | ||||
| -rw-r--r-- | sys/dev/mlx/mlx_pci.c | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sys/dev/mlx/mlx.c b/sys/dev/mlx/mlx.c index 4862323..bf7b8cd 100644 --- a/sys/dev/mlx/mlx.c +++ b/sys/dev/mlx/mlx.c @@ -362,7 +362,8 @@ mlx_attach(struct mlx_softc *sc) * Allocate and connect our interrupt. */ rid = 0; - sc->mlx_irq = bus_alloc_resource(sc->mlx_dev, SYS_RES_IRQ, &rid, 0, ~0, 1, RF_SHAREABLE | RF_ACTIVE); + sc->mlx_irq = bus_alloc_resource_any(sc->mlx_dev, SYS_RES_IRQ, &rid, + RF_SHAREABLE | RF_ACTIVE); if (sc->mlx_irq == NULL) { device_printf(sc->mlx_dev, "can't allocate interrupt\n"); mlx_free(sc); diff --git a/sys/dev/mlx/mlx_pci.c b/sys/dev/mlx/mlx_pci.c index 7640b43..0a4548b 100644 --- a/sys/dev/mlx/mlx_pci.c +++ b/sys/dev/mlx/mlx_pci.c @@ -164,18 +164,21 @@ mlx_pci_attach(device_t dev) case MLX_IFTYPE_3: sc->mlx_mem_type = SYS_RES_MEMORY; sc->mlx_mem_rid = MLX_CFG_BASE1; - sc->mlx_mem = bus_alloc_resource(dev, sc->mlx_mem_type, &sc->mlx_mem_rid, 0, ~0, 1, RF_ACTIVE); + sc->mlx_mem = bus_alloc_resource_any(dev, sc->mlx_mem_type, + &sc->mlx_mem_rid, RF_ACTIVE); if (sc->mlx_mem == NULL) { sc->mlx_mem_type = SYS_RES_IOPORT; sc->mlx_mem_rid = MLX_CFG_BASE0; - sc->mlx_mem = bus_alloc_resource(dev, sc->mlx_mem_type, &sc->mlx_mem_rid, 0, ~0, 1, RF_ACTIVE); + sc->mlx_mem = bus_alloc_resource_any(dev, sc->mlx_mem_type, + &sc->mlx_mem_rid, RF_ACTIVE); } break; case MLX_IFTYPE_4: case MLX_IFTYPE_5: sc->mlx_mem_type = SYS_RES_MEMORY; sc->mlx_mem_rid = MLX_CFG_BASE0; - sc->mlx_mem = bus_alloc_resource(dev, sc->mlx_mem_type, &sc->mlx_mem_rid, 0, ~0, 1, RF_ACTIVE); + sc->mlx_mem = bus_alloc_resource_any(dev, sc->mlx_mem_type, + &sc->mlx_mem_rid, RF_ACTIVE); break; } if (sc->mlx_mem == NULL) { |
