svn commit: r212413 - in head/sys: amd64/amd64 arm/arm
arm/xscale/ixp425 dev/acpica dev/atkbdc dev/firewire
dev/iicbus dev/ofw dev/ppbus dev/siba dev/spibus i386/i386
ia64/ia64 isa kern mips/adm512...
Andriy Gapon
avg at FreeBSD.org
Fri Sep 10 11:19:04 UTC 2010
Author: avg
Date: Fri Sep 10 11:19:03 2010
New Revision: 212413
URL: http://svn.freebsd.org/changeset/base/212413
Log:
bus_add_child: change type of order parameter to u_int
This reflects actual type used to store and compare child device orders.
Change is mostly done via a Coccinelle (soon to be devel/coccinelle)
semantic patch.
Verified by LINT+modules kernel builds.
Followup to: r212213
MFC after: 10 days
Modified:
head/sys/amd64/amd64/legacy.c
head/sys/amd64/amd64/nexus.c
head/sys/arm/arm/nexus.c
head/sys/arm/xscale/ixp425/ixp425.c
head/sys/dev/acpica/acpi.c
head/sys/dev/acpica/acpi_cpu.c
head/sys/dev/atkbdc/atkbdc_isa.c
head/sys/dev/firewire/firewire.c
head/sys/dev/firewire/fwohci_pci.c
head/sys/dev/iicbus/iicbus.c
head/sys/dev/ofw/ofw_iicbus.c
head/sys/dev/ppbus/ppbconf.c
head/sys/dev/siba/siba.c
head/sys/dev/spibus/spibus.c
head/sys/i386/i386/legacy.c
head/sys/i386/i386/nexus.c
head/sys/ia64/ia64/nexus.c
head/sys/isa/isa_common.c
head/sys/kern/bus_if.m
head/sys/kern/subr_bus.c
head/sys/mips/adm5120/obio.c
head/sys/mips/alchemy/obio.c
head/sys/mips/atheros/apb.c
head/sys/mips/idt/obio.c
head/sys/mips/mips/mainbus.c
head/sys/mips/mips/nexus.c
head/sys/mips/sibyte/sb_zbbus.c
head/sys/pc98/pc98/canbus.c
head/sys/powerpc/aim/nexus.c
head/sys/sparc64/sparc64/nexus.c
head/sys/sun4v/sun4v/nexus.c
head/sys/sun4v/sun4v/vnex.c
head/sys/sys/bus.h
Modified: head/sys/amd64/amd64/legacy.c
==============================================================================
--- head/sys/amd64/amd64/legacy.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/amd64/amd64/legacy.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -60,7 +60,7 @@ struct legacy_device {
static int legacy_probe(device_t);
static int legacy_attach(device_t);
static int legacy_print_child(device_t, device_t);
-static device_t legacy_add_child(device_t bus, int order, const char *name,
+static device_t legacy_add_child(device_t bus, u_int order, const char *name,
int unit);
static int legacy_read_ivar(device_t, device_t, int, uintptr_t *);
static int legacy_write_ivar(device_t, device_t, int, uintptr_t);
@@ -149,7 +149,7 @@ legacy_print_child(device_t bus, device_
}
static device_t
-legacy_add_child(device_t bus, int order, const char *name, int unit)
+legacy_add_child(device_t bus, u_int order, const char *name, int unit)
{
device_t child;
struct legacy_device *atdev;
@@ -213,7 +213,7 @@ legacy_write_ivar(device_t dev, device_t
static void cpu_identify(driver_t *driver, device_t parent);
static int cpu_read_ivar(device_t dev, device_t child, int index,
uintptr_t *result);
-static device_t cpu_add_child(device_t bus, int order, const char *name,
+static device_t cpu_add_child(device_t bus, u_int order, const char *name,
int unit);
static struct resource_list *cpu_get_rlist(device_t dev, device_t child);
@@ -277,7 +277,7 @@ cpu_identify(driver_t *driver, device_t
}
static device_t
-cpu_add_child(device_t bus, int order, const char *name, int unit)
+cpu_add_child(device_t bus, u_int order, const char *name, int unit)
{
struct cpu_device *cd;
device_t child;
Modified: head/sys/amd64/amd64/nexus.c
==============================================================================
--- head/sys/amd64/amd64/nexus.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/amd64/amd64/nexus.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -83,7 +83,7 @@ static int nexus_probe(device_t);
static int nexus_attach(device_t);
static int nexus_print_all_resources(device_t dev);
static int nexus_print_child(device_t, device_t);
-static device_t nexus_add_child(device_t bus, int order, const char *name,
+static device_t nexus_add_child(device_t bus, u_int order, const char *name,
int unit);
static struct resource *nexus_alloc_resource(device_t, device_t, int, int *,
u_long, u_long, u_long, u_int);
@@ -293,7 +293,7 @@ nexus_print_child(device_t bus, device_t
}
static device_t
-nexus_add_child(device_t bus, int order, const char *name, int unit)
+nexus_add_child(device_t bus, u_int order, const char *name, int unit)
{
device_t child;
struct nexus_device *ndev;
Modified: head/sys/arm/arm/nexus.c
==============================================================================
--- head/sys/arm/arm/nexus.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/arm/arm/nexus.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -74,7 +74,7 @@ static struct rman mem_rman;
static int nexus_probe(device_t);
static int nexus_attach(device_t);
static int nexus_print_child(device_t, device_t);
-static device_t nexus_add_child(device_t, int, const char *, int);
+static device_t nexus_add_child(device_t, u_int, const char *, int);
static struct resource *nexus_alloc_resource(device_t, device_t, int, int *,
u_long, u_long, u_long, u_int);
static int nexus_activate_resource(device_t, device_t, int, int,
@@ -166,7 +166,7 @@ nexus_print_child(device_t bus, device_t
}
static device_t
-nexus_add_child(device_t bus, int order, const char *name, int unit)
+nexus_add_child(device_t bus, u_int order, const char *name, int unit)
{
device_t child;
struct nexus_device *ndev;
Modified: head/sys/arm/xscale/ixp425/ixp425.c
==============================================================================
--- head/sys/arm/xscale/ixp425/ixp425.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/arm/xscale/ixp425/ixp425.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -369,7 +369,7 @@ ixp425_hinted_child(device_t bus, const
}
static device_t
-ixp425_add_child(device_t dev, int order, const char *name, int unit)
+ixp425_add_child(device_t dev, u_int order, const char *name, int unit)
{
device_t child;
struct ixp425_ivar *ivar;
Modified: head/sys/dev/acpica/acpi.c
==============================================================================
--- head/sys/dev/acpica/acpi.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/dev/acpica/acpi.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -105,7 +105,7 @@ static int acpi_attach(device_t dev);
static int acpi_suspend(device_t dev);
static int acpi_resume(device_t dev);
static int acpi_shutdown(device_t dev);
-static device_t acpi_add_child(device_t bus, int order, const char *name,
+static device_t acpi_add_child(device_t bus, u_int order, const char *name,
int unit);
static int acpi_print_child(device_t bus, device_t child);
static void acpi_probe_nomatch(device_t bus, device_t child);
@@ -781,7 +781,7 @@ acpi_shutdown(device_t dev)
* Handle a new device being added
*/
static device_t
-acpi_add_child(device_t bus, int order, const char *name, int unit)
+acpi_add_child(device_t bus, u_int order, const char *name, int unit)
{
struct acpi_device *ad;
device_t child;
Modified: head/sys/dev/acpica/acpi_cpu.c
==============================================================================
--- head/sys/dev/acpica/acpi_cpu.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/dev/acpica/acpi_cpu.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -148,7 +148,7 @@ static int acpi_cpu_resume(device_t dev)
static int acpi_pcpu_get_id(uint32_t idx, uint32_t *acpi_id,
uint32_t *cpu_id);
static struct resource_list *acpi_cpu_get_rlist(device_t dev, device_t child);
-static device_t acpi_cpu_add_child(device_t dev, int order, const char *name,
+static device_t acpi_cpu_add_child(device_t dev, u_int order, const char *name,
int unit);
static int acpi_cpu_read_ivar(device_t dev, device_t child, int index,
uintptr_t *result);
@@ -479,7 +479,7 @@ acpi_cpu_get_rlist(device_t dev, device_
}
static device_t
-acpi_cpu_add_child(device_t dev, int order, const char *name, int unit)
+acpi_cpu_add_child(device_t dev, u_int order, const char *name, int unit)
{
struct acpi_cpu_device *ad;
device_t child;
Modified: head/sys/dev/atkbdc/atkbdc_isa.c
==============================================================================
--- head/sys/dev/atkbdc/atkbdc_isa.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/dev/atkbdc/atkbdc_isa.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
static int atkbdc_isa_probe(device_t dev);
static int atkbdc_isa_attach(device_t dev);
-static device_t atkbdc_isa_add_child(device_t bus, int order, const char *name,
+static device_t atkbdc_isa_add_child(device_t bus, u_int order, const char *name,
int unit);
static device_method_t atkbdc_isa_methods[] = {
@@ -230,7 +230,7 @@ atkbdc_isa_attach(device_t dev)
}
static device_t
-atkbdc_isa_add_child(device_t bus, int order, const char *name, int unit)
+atkbdc_isa_add_child(device_t bus, u_int order, const char *name, int unit)
{
atkbdc_device_t *ivar;
device_t child;
Modified: head/sys/dev/firewire/firewire.c
==============================================================================
--- head/sys/dev/firewire/firewire.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/dev/firewire/firewire.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -102,7 +102,7 @@ static void firewire_xfer_timeout(void *
#if 0
static int firewire_shutdown (device_t);
#endif
-static device_t firewire_add_child (device_t, int, const char *, int);
+static device_t firewire_add_child(device_t, u_int, const char *, int);
static void fw_try_bmr (void *);
static void fw_try_bmr_callback (struct fw_xfer *);
static void fw_asystart (struct fw_xfer *);
@@ -488,7 +488,7 @@ firewire_attach(device_t dev)
* Attach it as child.
*/
static device_t
-firewire_add_child(device_t dev, int order, const char *name, int unit)
+firewire_add_child(device_t dev, u_int order, const char *name, int unit)
{
device_t child;
struct firewire_softc *sc;
Modified: head/sys/dev/firewire/fwohci_pci.c
==============================================================================
--- head/sys/dev/firewire/fwohci_pci.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/dev/firewire/fwohci_pci.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -487,7 +487,7 @@ fwohci_pci_shutdown(device_t dev)
}
static device_t
-fwohci_pci_add_child(device_t dev, int order, const char *name, int unit)
+fwohci_pci_add_child(device_t dev, u_int order, const char *name, int unit)
{
struct fwohci_softc *sc;
device_t child;
Modified: head/sys/dev/iicbus/iicbus.c
==============================================================================
--- head/sys/dev/iicbus/iicbus.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/dev/iicbus/iicbus.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -188,7 +188,7 @@ iicbus_read_ivar(device_t bus, device_t
}
static device_t
-iicbus_add_child(device_t dev, int order, const char *name, int unit)
+iicbus_add_child(device_t dev, u_int order, const char *name, int unit)
{
device_t child;
struct iicbus_ivar *devi;
Modified: head/sys/dev/ofw/ofw_iicbus.c
==============================================================================
--- head/sys/dev/ofw/ofw_iicbus.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/dev/ofw/ofw_iicbus.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -46,8 +46,8 @@ __FBSDID("$FreeBSD$");
/* Methods */
static device_probe_t ofw_iicbus_probe;
static device_attach_t ofw_iicbus_attach;
-static device_t ofw_iicbus_add_child(device_t dev, int order, const char *name,
- int unit);
+static device_t ofw_iicbus_add_child(device_t dev, u_int order,
+ const char *name, int unit);
static const struct ofw_bus_devinfo *ofw_iicbus_get_devinfo(device_t bus,
device_t dev);
@@ -147,7 +147,7 @@ ofw_iicbus_attach(device_t dev)
}
static device_t
-ofw_iicbus_add_child(device_t dev, int order, const char *name, int unit)
+ofw_iicbus_add_child(device_t dev, u_int order, const char *name, int unit)
{
device_t child;
struct ofw_iicbus_devinfo *devi;
Modified: head/sys/dev/ppbus/ppbconf.c
==============================================================================
--- head/sys/dev/ppbus/ppbconf.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/dev/ppbus/ppbconf.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -90,7 +90,7 @@ ppbus_probe(device_t dev)
* Add a ppbus device, allocate/initialize the ivars
*/
static device_t
-ppbus_add_child(device_t dev, int order, const char *name, int unit)
+ppbus_add_child(device_t dev, u_int order, const char *name, int unit)
{
struct ppb_device *ppbdev;
device_t child;
Modified: head/sys/dev/siba/siba.c
==============================================================================
--- head/sys/dev/siba/siba.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/dev/siba/siba.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -90,7 +90,7 @@ static struct siba_devid siba_devids[] =
static int siba_activate_resource(device_t, device_t, int, int,
struct resource *);
-static device_t siba_add_child(device_t, int, const char *, int);
+static device_t siba_add_child(device_t, u_int, const char *, int);
static struct resource *
siba_alloc_resource(device_t, device_t, int, int *, u_long,
u_long, u_long, u_int);
@@ -505,7 +505,7 @@ siba_destroy_devinfo(struct siba_devinfo
/* XXX is this needed? */
static device_t
-siba_add_child(device_t dev, int order, const char *name, int unit)
+siba_add_child(device_t dev, u_int order, const char *name, int unit)
{
#if 1
Modified: head/sys/dev/spibus/spibus.c
==============================================================================
--- head/sys/dev/spibus/spibus.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/dev/spibus/spibus.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -127,7 +127,7 @@ spibus_read_ivar(device_t bus, device_t
}
static device_t
-spibus_add_child(device_t dev, int order, const char *name, int unit)
+spibus_add_child(device_t dev, u_int order, const char *name, int unit)
{
device_t child;
struct spibus_ivar *devi;
Modified: head/sys/i386/i386/legacy.c
==============================================================================
--- head/sys/i386/i386/legacy.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/i386/i386/legacy.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -65,7 +65,7 @@ struct legacy_device {
static int legacy_probe(device_t);
static int legacy_attach(device_t);
static int legacy_print_child(device_t, device_t);
-static device_t legacy_add_child(device_t bus, int order, const char *name,
+static device_t legacy_add_child(device_t bus, u_int order, const char *name,
int unit);
static int legacy_read_ivar(device_t, device_t, int, uintptr_t *);
static int legacy_write_ivar(device_t, device_t, int, uintptr_t);
@@ -170,7 +170,7 @@ legacy_print_child(device_t bus, device_
}
static device_t
-legacy_add_child(device_t bus, int order, const char *name, int unit)
+legacy_add_child(device_t bus, u_int order, const char *name, int unit)
{
device_t child;
struct legacy_device *atdev;
@@ -234,7 +234,7 @@ legacy_write_ivar(device_t dev, device_t
static void cpu_identify(driver_t *driver, device_t parent);
static int cpu_read_ivar(device_t dev, device_t child, int index,
uintptr_t *result);
-static device_t cpu_add_child(device_t bus, int order, const char *name,
+static device_t cpu_add_child(device_t bus, u_int order, const char *name,
int unit);
static struct resource_list *cpu_get_rlist(device_t dev, device_t child);
@@ -298,7 +298,7 @@ cpu_identify(driver_t *driver, device_t
}
static device_t
-cpu_add_child(device_t bus, int order, const char *name, int unit)
+cpu_add_child(device_t bus, u_int order, const char *name, int unit)
{
struct cpu_device *cd;
device_t child;
Modified: head/sys/i386/i386/nexus.c
==============================================================================
--- head/sys/i386/i386/nexus.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/i386/i386/nexus.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -87,7 +87,7 @@ static int nexus_probe(device_t);
static int nexus_attach(device_t);
static int nexus_print_all_resources(device_t dev);
static int nexus_print_child(device_t, device_t);
-static device_t nexus_add_child(device_t bus, int order, const char *name,
+static device_t nexus_add_child(device_t bus, u_int order, const char *name,
int unit);
static struct resource *nexus_alloc_resource(device_t, device_t, int, int *,
u_long, u_long, u_long, u_int);
@@ -305,7 +305,7 @@ nexus_print_child(device_t bus, device_t
}
static device_t
-nexus_add_child(device_t bus, int order, const char *name, int unit)
+nexus_add_child(device_t bus, u_int order, const char *name, int unit)
{
device_t child;
struct nexus_device *ndev;
Modified: head/sys/ia64/ia64/nexus.c
==============================================================================
--- head/sys/ia64/ia64/nexus.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/ia64/ia64/nexus.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -82,7 +82,7 @@ static struct rman irq_rman, port_rman,
static int nexus_probe(device_t);
static int nexus_attach(device_t);
static int nexus_print_child(device_t, device_t);
-static device_t nexus_add_child(device_t bus, int order, const char *name,
+static device_t nexus_add_child(device_t bus, u_int order, const char *name,
int unit);
static struct resource *nexus_alloc_resource(device_t, device_t, int, int *,
u_long, u_long, u_long, u_int);
@@ -220,7 +220,7 @@ nexus_print_child(device_t bus, device_t
}
static device_t
-nexus_add_child(device_t bus, int order, const char *name, int unit)
+nexus_add_child(device_t bus, u_int order, const char *name, int unit)
{
device_t child;
struct nexus_device *ndev;
Modified: head/sys/isa/isa_common.c
==============================================================================
--- head/sys/isa/isa_common.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/isa/isa_common.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -597,7 +597,7 @@ isa_probe_children(device_t dev)
* Add a new child with default ivars.
*/
static device_t
-isa_add_child(device_t dev, int order, const char *name, int unit)
+isa_add_child(device_t dev, u_int order, const char *name, int unit)
{
device_t child;
struct isa_device *idev;
Modified: head/sys/kern/bus_if.m
==============================================================================
--- head/sys/kern/bus_if.m Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/kern/bus_if.m Fri Sep 10 11:19:03 2010 (r212413)
@@ -200,7 +200,7 @@ METHOD void driver_added {
*/
METHOD device_t add_child {
device_t _dev;
- int _order;
+ u_int _order;
const char *_name;
int _unit;
};
Modified: head/sys/kern/subr_bus.c
==============================================================================
--- head/sys/kern/subr_bus.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/kern/subr_bus.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -3284,7 +3284,7 @@ resource_list_purge(struct resource_list
}
device_t
-bus_generic_add_child(device_t dev, int order, const char *name, int unit)
+bus_generic_add_child(device_t dev, u_int order, const char *name, int unit)
{
return (device_add_child_ordered(dev, order, name, unit));
Modified: head/sys/mips/adm5120/obio.c
==============================================================================
--- head/sys/mips/adm5120/obio.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/mips/adm5120/obio.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -101,7 +101,7 @@ int irq_priorities[NIRQS] = {
static int obio_activate_resource(device_t, device_t, int, int,
struct resource *);
-static device_t obio_add_child(device_t, int, const char *, int);
+static device_t obio_add_child(device_t, u_int, const char *, int);
static struct resource *
obio_alloc_resource(device_t, device_t, int, int *, u_long,
u_long, u_long, u_int);
@@ -480,7 +480,7 @@ obio_hinted_child(device_t bus, const ch
}
static device_t
-obio_add_child(device_t bus, int order, const char *name, int unit)
+obio_add_child(device_t bus, u_int order, const char *name, int unit)
{
device_t child;
struct obio_ivar *ivar;
Modified: head/sys/mips/alchemy/obio.c
==============================================================================
--- head/sys/mips/alchemy/obio.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/mips/alchemy/obio.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -101,7 +101,7 @@ int irq_priorities[NIRQS] = {
static int obio_activate_resource(device_t, device_t, int, int,
struct resource *);
-static device_t obio_add_child(device_t, int, const char *, int);
+static device_t obio_add_child(device_t, u_int, const char *, int);
static struct resource *
obio_alloc_resource(device_t, device_t, int, int *, u_long,
u_long, u_long, u_int);
@@ -472,7 +472,7 @@ obio_hinted_child(device_t bus, const ch
}
static device_t
-obio_add_child(device_t bus, int order, const char *name, int unit)
+obio_add_child(device_t bus, u_int order, const char *name, int unit)
{
device_t child;
struct obio_ivar *ivar;
Modified: head/sys/mips/atheros/apb.c
==============================================================================
--- head/sys/mips/atheros/apb.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/mips/atheros/apb.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$");
static int apb_activate_resource(device_t, device_t, int, int,
struct resource *);
-static device_t apb_add_child(device_t, int, const char *, int);
+static device_t apb_add_child(device_t, u_int, const char *, int);
static struct resource *
apb_alloc_resource(device_t, device_t, int, int *, u_long,
u_long, u_long, u_int);
@@ -397,7 +397,7 @@ apb_hinted_child(device_t bus, const cha
}
static device_t
-apb_add_child(device_t bus, int order, const char *name, int unit)
+apb_add_child(device_t bus, u_int order, const char *name, int unit)
{
device_t child;
struct apb_ivar *ivar;
Modified: head/sys/mips/idt/obio.c
==============================================================================
--- head/sys/mips/idt/obio.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/mips/idt/obio.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$");
static int obio_activate_resource(device_t, device_t, int, int,
struct resource *);
-static device_t obio_add_child(device_t, int, const char *, int);
+static device_t obio_add_child(device_t, u_int, const char *, int);
static struct resource *
obio_alloc_resource(device_t, device_t, int, int *, u_long,
u_long, u_long, u_int);
@@ -422,7 +422,7 @@ obio_hinted_child(device_t bus, const ch
}
static device_t
-obio_add_child(device_t bus, int order, const char *name, int unit)
+obio_add_child(device_t bus, u_int order, const char *name, int unit)
{
device_t child;
struct obio_ivar *ivar;
Modified: head/sys/mips/mips/mainbus.c
==============================================================================
--- head/sys/mips/mips/mainbus.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/mips/mips/mainbus.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -67,7 +67,7 @@ static struct rman irq_rman, port_rman,
static int mainbus_probe(device_t);
static int mainbus_attach(device_t);
static int mainbus_print_child(device_t, device_t);
-static device_t mainbus_add_child(device_t bus, int order, const char *name,
+static device_t mainbus_add_child(device_t bus, u_int order, const char *name,
int unit);
static struct resource *mainbus_alloc_resource(device_t, device_t, int, int *,
u_long, u_long, u_long, u_int);
@@ -178,7 +178,7 @@ mainbus_print_child(device_t bus, device
}
static device_t
-mainbus_add_child(device_t bus, int order, const char *name, int unit)
+mainbus_add_child(device_t bus, u_int order, const char *name, int unit)
{
return device_add_child_ordered(bus, order, name, unit);
}
Modified: head/sys/mips/mips/nexus.c
==============================================================================
--- head/sys/mips/mips/nexus.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/mips/mips/nexus.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -82,7 +82,7 @@ static struct resource *
u_long, u_long, u_int);
static int nexus_activate_resource(device_t, device_t, int, int,
struct resource *);
-static device_t nexus_add_child(device_t, int, const char *, int);
+static device_t nexus_add_child(device_t, u_int, const char *, int);
static int nexus_attach(device_t);
static int nexus_deactivate_resource(device_t, device_t, int, int,
struct resource *);
@@ -282,7 +282,7 @@ nexus_hinted_child(device_t bus, const c
}
static device_t
-nexus_add_child(device_t bus, int order, const char *name, int unit)
+nexus_add_child(device_t bus, u_int order, const char *name, int unit)
{
device_t child;
struct nexus_device *ndev;
Modified: head/sys/mips/sibyte/sb_zbbus.c
==============================================================================
--- head/sys/mips/sibyte/sb_zbbus.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/mips/sibyte/sb_zbbus.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -402,7 +402,7 @@ zbbus_setup_intr(device_t dev, device_t
}
static device_t
-zbbus_add_child(device_t bus, int order, const char *name, int unit)
+zbbus_add_child(device_t bus, u_int order, const char *name, int unit)
{
device_t child;
struct zbbus_devinfo *dinfo;
Modified: head/sys/pc98/pc98/canbus.c
==============================================================================
--- head/sys/pc98/pc98/canbus.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/pc98/pc98/canbus.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -82,7 +82,7 @@ static int canbus_detach(device_t);
/* Bus interface methods */
static int canbus_print_child(device_t, device_t);
-static device_t canbus_add_child(device_t, int, const char *, int);
+static device_t canbus_add_child(device_t, u_int, const char *, int);
static struct resource * canbus_alloc_resource(
device_t, device_t, int, int *, u_long, u_long, u_long, u_int);
static int canbus_activate_resource(
@@ -235,7 +235,7 @@ canbus_print_child(device_t dev, device_
}
static device_t
-canbus_add_child(device_t bus, int order, const char *name, int unit)
+canbus_add_child(device_t bus, u_int order, const char *name, int unit)
{
device_t child;
struct canbus_device *cbdev;
Modified: head/sys/powerpc/aim/nexus.c
==============================================================================
--- head/sys/powerpc/aim/nexus.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/powerpc/aim/nexus.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -115,7 +115,7 @@ static int nexus_attach(device_t);
/*
* Bus interface
*/
-static device_t nexus_add_child(device_t, int, const char *, int);
+static device_t nexus_add_child(device_t, u_int, const char *, int);
static void nexus_probe_nomatch(device_t, device_t);
static int nexus_read_ivar(device_t, device_t, int, uintptr_t *);
static int nexus_write_ivar(device_t, device_t, int, uintptr_t);
@@ -262,7 +262,7 @@ nexus_probe_nomatch(device_t dev, device
}
static device_t
-nexus_add_child(device_t dev, int order, const char *name, int unit)
+nexus_add_child(device_t dev, u_int order, const char *name, int unit)
{
device_t child;
struct nexus_devinfo *dinfo;
Modified: head/sys/sparc64/sparc64/nexus.c
==============================================================================
--- head/sys/sparc64/sparc64/nexus.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/sparc64/sparc64/nexus.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -258,7 +258,7 @@ nexus_attach(device_t dev)
}
static device_t
-nexus_add_child(device_t dev, int order, const char *name, int unit)
+nexus_add_child(device_t dev, u_int order, const char *name, int unit)
{
device_t cdev;
struct nexus_devinfo *ndi;
Modified: head/sys/sun4v/sun4v/nexus.c
==============================================================================
--- head/sys/sun4v/sun4v/nexus.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/sun4v/sun4v/nexus.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -234,7 +234,7 @@ nexus_attach(device_t dev)
}
static device_t
-nexus_add_child(device_t dev, int order, const char *name, int unit)
+nexus_add_child(device_t dev, u_int order, const char *name, int unit)
{
device_t cdev;
struct nexus_devinfo *ndi;
Modified: head/sys/sun4v/sun4v/vnex.c
==============================================================================
--- head/sys/sun4v/sun4v/vnex.c Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/sun4v/sun4v/vnex.c Fri Sep 10 11:19:03 2010 (r212413)
@@ -204,7 +204,7 @@ vnex_attach(device_t dev)
}
static device_t
-vnex_add_child(device_t dev, int order, const char *name, int unit)
+vnex_add_child(device_t dev, u_int order, const char *name, int unit)
{
device_t cdev;
struct vnex_devinfo *vndi;
Modified: head/sys/sys/bus.h
==============================================================================
--- head/sys/sys/bus.h Fri Sep 10 11:01:11 2010 (r212412)
+++ head/sys/sys/bus.h Fri Sep 10 11:19:03 2010 (r212413)
@@ -298,7 +298,7 @@ void root_bus_configure(void);
int bus_generic_activate_resource(device_t dev, device_t child, int type,
int rid, struct resource *r);
device_t
- bus_generic_add_child(device_t dev, int order, const char *name,
+ bus_generic_add_child(device_t dev, u_int order, const char *name,
int unit);
struct resource *
bus_generic_alloc_resource(device_t bus, device_t child, int type,
More information about the svn-src-all
mailing list