strict kobj signatures: number of fixes for arm architecture

no functional changes should result

Reviewed by:	imp, current@
Approved by:	jhb (mentor)

10 files changed, 22 insertions, 19 deletions

diff --git a/sys/arm/at91/at91_mci.c b/sys/arm/at91/at91_mci.c
index 9e18eee..5ca60b9 100644
--- a/sys/arm/at91/at91_mci.c
+++ b/sys/arm/at91/at91_mci.c
@@ -612,7 +612,7 @@ at91_mci_intr(void *arg)
 }
 
 static int
-at91_mci_read_ivar(device_t bus, device_t child, int which, u_char *result)
+at91_mci_read_ivar(device_t bus, device_t child, int which, uintptr_t *result)
 {
 	struct at91_mci_softc *sc = device_get_softc(bus);
 
diff --git a/sys/arm/at91/at91_twi.c b/sys/arm/at91/at91_twi.c
index 12df6c0..33ef8c0 100644
--- a/sys/arm/at91/at91_twi.c
+++ b/sys/arm/at91/at91_twi.c
@@ -289,7 +289,7 @@ at91_twi_rst_card(device_t dev, u_char speed, u_char addr, u_char *oldaddr)
 }
 
 static int
-at91_twi_callback(device_t dev, int index, caddr_t *data)
+at91_twi_callback(device_t dev, int index, caddr_t data)
 {
 	int error = 0;
 
diff --git a/sys/arm/at91/if_ate.c b/sys/arm/at91/if_ate.c
index 36400a9..00d3e3b 100644
--- a/sys/arm/at91/if_ate.c
+++ b/sys/arm/at91/if_ate.c
@@ -1190,7 +1190,7 @@ ate_miibus_readreg(device_t dev, int phy, int reg)
 	return (val);
 }
 
-static void
+static int
 ate_miibus_writereg(device_t dev, int phy, int reg, int data)
 {
 	struct ate_softc *sc;
@@ -1204,7 +1204,7 @@ ate_miibus_writereg(device_t dev, int phy, int reg, int data)
 	WR4(sc, ETH_MAN, ETH_MAN_REG_WR(phy, reg, data));
 	while ((RD4(sc, ETH_SR) & ETH_SR_IDLE) == 0)
 		continue;
-	return;
+	return (0);
 }
 
 static device_method_t ate_methods[] = {
diff --git a/sys/arm/mv/twsi.c b/sys/arm/mv/twsi.c
index 15ec415..8c745b4 100644
--- a/sys/arm/mv/twsi.c
+++ b/sys/arm/mv/twsi.c
@@ -117,7 +117,7 @@ static int mv_twsi_start(device_t dev, u_char slave, int timeout);
 static int mv_twsi_stop(device_t dev);
 static int mv_twsi_read(device_t dev, char *buf, int len, int *read, int last,
     int delay);
-static int mv_twsi_write(device_t dev, char *buf, int len, int *sent,
+static int mv_twsi_write(device_t dev, const char *buf, int len, int *sent,
     int timeout);
 
 static struct resource_spec res_spec[] = {
@@ -488,7 +488,7 @@ out:
 }
 
 static int
-mv_twsi_write(device_t dev, char *buf, int len, int *sent, int timeout)
+mv_twsi_write(device_t dev, const char *buf, int len, int *sent, int timeout)
 {
 	struct mv_twsi_softc *sc;
 	uint32_t status;
diff --git a/sys/arm/xscale/i80321/i80321_pci.c b/sys/arm/xscale/i80321/i80321_pci.c
index 24b21db..45b676d 100644
--- a/sys/arm/xscale/i80321/i80321_pci.c
+++ b/sys/arm/xscale/i80321/i80321_pci.c
@@ -174,8 +174,8 @@ i80321_pci_conf_setup(struct i80321_pci_softc *sc, int bus, int slot, int func,
 }
 
 static u_int32_t
-i80321_pci_read_config(device_t dev, int bus, int slot, int func, int reg,
-    int bytes)
+i80321_pci_read_config(device_t dev, u_int bus, u_int slot, u_int func,
+    u_int reg, int bytes)
 {
 	struct i80321_pci_softc *sc = device_get_softc(dev);
 	uint32_t isr;
@@ -215,8 +215,8 @@ i80321_pci_read_config(device_t dev, int bus, int slot, int func, int reg,
 }
 
 static void
-i80321_pci_write_config(device_t dev, int bus, int slot, int func, int reg,
-    u_int32_t data, int bytes)
+i80321_pci_write_config(device_t dev, u_int bus, u_int slot, u_int func,
+    u_int reg, u_int32_t data, int bytes)
 {
 	struct i80321_pci_softc *sc = device_get_softc(dev);
 	uint32_t addr;
diff --git a/sys/arm/xscale/ixp425/avila_led.c b/sys/arm/xscale/ixp425/avila_led.c
index 31558af..1d1553b 100644
--- a/sys/arm/xscale/ixp425/avila_led.c
+++ b/sys/arm/xscale/ixp425/avila_led.c
@@ -88,13 +88,14 @@ led_avila_attach(device_t dev)
 	return (0);
 }
 
-static void
+static int
 led_avila_detach(device_t dev)
 {
 	struct led_avila_softc *sc = device_get_softc(dev);
 
 	if (sc->sc_led != NULL)
 		led_destroy(sc->sc_led);
+	return (0);
 }
 
 static device_method_t led_avila_methods[] = {
diff --git a/sys/arm/xscale/ixp425/cambria_led.c b/sys/arm/xscale/ixp425/cambria_led.c
index c55e3cb..f99a1aa 100644
--- a/sys/arm/xscale/ixp425/cambria_led.c
+++ b/sys/arm/xscale/ixp425/cambria_led.c
@@ -102,7 +102,7 @@ led_attach(device_t dev)
 	return 0;
 }
 
-static void
+static int
 led_detach(device_t dev)
 {
 	struct led_softc *sc = device_get_softc(dev);
@@ -113,12 +113,13 @@ led_detach(device_t dev)
 		if (led != NULL)
 			led_destroy(led);
 	}
+	return (0);
 }
 
 static device_method_t led_methods[] = {
 	DEVMETHOD(device_probe,		led_probe),
 	DEVMETHOD(device_attach,	led_attach),
-	DEVMETHOD(device_attach,	led_detach),
+	DEVMETHOD(device_detach,	led_detach),
 
 	{0, 0},
 };
diff --git a/sys/arm/xscale/ixp425/if_npe.c b/sys/arm/xscale/ixp425/if_npe.c
index b54526c..7b87ac4 100644
--- a/sys/arm/xscale/ixp425/if_npe.c
+++ b/sys/arm/xscale/ixp425/if_npe.c
@@ -1691,20 +1691,21 @@ npe_miibus_readreg(device_t dev, int phy, int reg)
 	return (v & NPE_MII_READ_FAIL) ? 0xffff : (v & 0xffff);
 }
 
-static void
+static int
 npe_miibus_writereg(device_t dev, int phy, int reg, int data)
 {
 	struct npe_softc *sc = device_get_softc(dev);
 	uint32_t v;
 
 	if (phy != sc->sc_phy)		/* XXX */
-		return;
+		return (0);
 	v = (phy << NPE_MII_ADDR_SHL) | (reg << NPE_MII_REG_SHL)
 	  | data | NPE_MII_WRITE
 	  | NPE_MII_GO;
 	npe_mii_mdio_write(sc, NPE_MAC_MDIO_CMD, v);
 	/* XXX complain about timeout */
 	(void) npe_mii_mdio_wait(sc);
+	return (0);
 }
 
 static void
diff --git a/sys/arm/xscale/ixp425/ixp425.c b/sys/arm/xscale/ixp425/ixp425.c
index 0267d9f..243c9ae 100644
--- a/sys/arm/xscale/ixp425/ixp425.c
+++ b/sys/arm/xscale/ixp425/ixp425.c
@@ -334,7 +334,7 @@ ixp425_add_child(device_t dev, int order, const char *name, int unit)
 }
 
 static int
-ixp425_read_ivar(device_t bus, device_t child, int which, u_char *result)
+ixp425_read_ivar(device_t bus, device_t child, int which, uintptr_t *result)
 {
 	struct ixp425_ivar *ivar = IXP425_IVAR(child);
 
diff --git a/sys/arm/xscale/ixp425/ixp425_iic.c b/sys/arm/xscale/ixp425/ixp425_iic.c
index 080ebf6..bb7d47f 100644
--- a/sys/arm/xscale/ixp425/ixp425_iic.c
+++ b/sys/arm/xscale/ixp425/ixp425_iic.c
@@ -95,7 +95,7 @@ ixpiic_attach(device_t dev)
 }
 
 static int
-ixpiic_callback(device_t dev, int index, caddr_t *data)
+ixpiic_callback(device_t dev, int index, caddr_t data)
 {
 	return (0);
 }
@@ -129,7 +129,7 @@ ixpiic_getsda(device_t dev)
 }
 
 static void 
-ixpiic_setsda(device_t dev, char val)
+ixpiic_setsda(device_t dev, int val)
 {
 	struct ixpiic_softc *sc = ixpiic_sc;
 
@@ -144,7 +144,7 @@ ixpiic_setsda(device_t dev, char val)
 }
 
 static void 
-ixpiic_setscl(device_t dev, char val)
+ixpiic_setscl(device_t dev, int val)
 {
 	struct ixpiic_softc *sc = ixpiic_sc;