From 4c69d78e3437c4a680aa43dd0b7ceeddddc6e0ee Mon Sep 17 00:00:00 2001 From: avg Date: Thu, 11 Jun 2009 17:06:58 +0000 Subject: [PATCH] strict kobj signatures: fix assortment of bus_read_ivar impls Reviewed by: imp, current@ Approved by: jhb (mentor) --- sys/dev/eisa/eisaconf.c | 2 +- sys/dev/mca/mca_bus.c | 2 +- sys/dev/spibus/spibus.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c index 2441af5b9db6..689efb6ad15c 100644 --- a/sys/dev/eisa/eisaconf.c +++ b/sys/dev/eisa/eisaconf.c @@ -315,7 +315,7 @@ eisa_find_ioaddr(struct eisa_device *e_dev, int rid) } static int -eisa_read_ivar(device_t dev, device_t child, int which, u_long *result) +eisa_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) { struct eisa_device *e_dev = device_get_ivars(child); struct irq_node *irq; diff --git a/sys/dev/mca/mca_bus.c b/sys/dev/mca/mca_bus.c index bc3c0e52b5ab..d3f93131a234 100644 --- a/sys/dev/mca/mca_bus.c +++ b/sys/dev/mca/mca_bus.c @@ -432,7 +432,7 @@ mca_probe_nomatch (device_t dev, device_t child) } static int -mca_read_ivar (device_t dev, device_t child, int which, u_long * result) +mca_read_ivar (device_t dev, device_t child, int which, uintptr_t * result) { struct mca_device * m_dev = device_get_ivars(child); diff --git a/sys/dev/spibus/spibus.c b/sys/dev/spibus/spibus.c index 33205ea64f1d..a0c0380398d2 100644 --- a/sys/dev/spibus/spibus.c +++ b/sys/dev/spibus/spibus.c @@ -112,7 +112,7 @@ spibus_child_pnpinfo_str(device_t bus, device_t child, char *buf, } static int -spibus_read_ivar(device_t bus, device_t child, int which, u_char *result) +spibus_read_ivar(device_t bus, device_t child, int which, u_int *result) { struct spibus_ivar *devi = SPIBUS_IVAR(child);