From owner-svn-src-all@FreeBSD.ORG Thu Jun 11 17:05:14 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9534B106566C; Thu, 11 Jun 2009 17:05:14 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 82BF98FC23; Thu, 11 Jun 2009 17:05:14 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5BH5Ekl053904; Thu, 11 Jun 2009 17:05:14 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5BH5EX5053894; Thu, 11 Jun 2009 17:05:14 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <200906111705.n5BH5EX5053894@svn.freebsd.org> From: Andriy Gapon Date: Thu, 11 Jun 2009 17:05:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r194015 - in head/sys/arm: at91 mv xscale/i80321 xscale/ixp425 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jun 2009 17:05:15 -0000 Author: avg Date: Thu Jun 11 17:05:13 2009 New Revision: 194015 URL: http://svn.freebsd.org/changeset/base/194015 Log: strict kobj signatures: number of fixes for arm architecture no functional changes should result Reviewed by: imp, current@ Approved by: jhb (mentor) Modified: head/sys/arm/at91/at91_mci.c head/sys/arm/at91/at91_twi.c head/sys/arm/at91/if_ate.c head/sys/arm/mv/twsi.c head/sys/arm/xscale/i80321/i80321_pci.c head/sys/arm/xscale/ixp425/avila_led.c head/sys/arm/xscale/ixp425/cambria_led.c head/sys/arm/xscale/ixp425/if_npe.c head/sys/arm/xscale/ixp425/ixp425.c head/sys/arm/xscale/ixp425/ixp425_iic.c Modified: head/sys/arm/at91/at91_mci.c ============================================================================== --- head/sys/arm/at91/at91_mci.c Thu Jun 11 17:03:28 2009 (r194014) +++ head/sys/arm/at91/at91_mci.c Thu Jun 11 17:05:13 2009 (r194015) @@ -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); Modified: head/sys/arm/at91/at91_twi.c ============================================================================== --- head/sys/arm/at91/at91_twi.c Thu Jun 11 17:03:28 2009 (r194014) +++ head/sys/arm/at91/at91_twi.c Thu Jun 11 17:05:13 2009 (r194015) @@ -289,7 +289,7 @@ at91_twi_rst_card(device_t dev, u_char s } 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; Modified: head/sys/arm/at91/if_ate.c ============================================================================== --- head/sys/arm/at91/if_ate.c Thu Jun 11 17:03:28 2009 (r194014) +++ head/sys/arm/at91/if_ate.c Thu Jun 11 17:05:13 2009 (r194015) @@ -1190,7 +1190,7 @@ ate_miibus_readreg(device_t dev, int phy 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 ph 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[] = { Modified: head/sys/arm/mv/twsi.c ============================================================================== --- head/sys/arm/mv/twsi.c Thu Jun 11 17:03:28 2009 (r194014) +++ head/sys/arm/mv/twsi.c Thu Jun 11 17:05:13 2009 (r194015) @@ -117,7 +117,7 @@ static int mv_twsi_start(device_t dev, u 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; Modified: head/sys/arm/xscale/i80321/i80321_pci.c ============================================================================== --- head/sys/arm/xscale/i80321/i80321_pci.c Thu Jun 11 17:03:28 2009 (r194014) +++ head/sys/arm/xscale/i80321/i80321_pci.c Thu Jun 11 17:05:13 2009 (r194015) @@ -174,8 +174,8 @@ i80321_pci_conf_setup(struct i80321_pci_ } 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 } 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; Modified: head/sys/arm/xscale/ixp425/avila_led.c ============================================================================== --- head/sys/arm/xscale/ixp425/avila_led.c Thu Jun 11 17:03:28 2009 (r194014) +++ head/sys/arm/xscale/ixp425/avila_led.c Thu Jun 11 17:05:13 2009 (r194015) @@ -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[] = { Modified: head/sys/arm/xscale/ixp425/cambria_led.c ============================================================================== --- head/sys/arm/xscale/ixp425/cambria_led.c Thu Jun 11 17:03:28 2009 (r194014) +++ head/sys/arm/xscale/ixp425/cambria_led.c Thu Jun 11 17:05:13 2009 (r194015) @@ -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}, }; Modified: head/sys/arm/xscale/ixp425/if_npe.c ============================================================================== --- head/sys/arm/xscale/ixp425/if_npe.c Thu Jun 11 17:03:28 2009 (r194014) +++ head/sys/arm/xscale/ixp425/if_npe.c Thu Jun 11 17:05:13 2009 (r194015) @@ -1691,20 +1691,21 @@ npe_miibus_readreg(device_t dev, int phy 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 Modified: head/sys/arm/xscale/ixp425/ixp425.c ============================================================================== --- head/sys/arm/xscale/ixp425/ixp425.c Thu Jun 11 17:03:28 2009 (r194014) +++ head/sys/arm/xscale/ixp425/ixp425.c Thu Jun 11 17:05:13 2009 (r194015) @@ -334,7 +334,7 @@ ixp425_add_child(device_t dev, int order } 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); Modified: head/sys/arm/xscale/ixp425/ixp425_iic.c ============================================================================== --- head/sys/arm/xscale/ixp425/ixp425_iic.c Thu Jun 11 17:03:28 2009 (r194014) +++ head/sys/arm/xscale/ixp425/ixp425_iic.c Thu Jun 11 17:05:13 2009 (r194015) @@ -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;