Date: Thu, 11 Jun 2009 17:16:04 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r194027 - head/sys/powerpc/powermac Message-ID: <200906111716.n5BHG4NG054733@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Thu Jun 11 17:16:04 2009 New Revision: 194027 URL: http://svn.freebsd.org/changeset/base/194027 Log: strict kobj signatures: fix adb_hb_controller_poll impl in powermac the method return u_int, not void Reviewed by: imp, current@ Approved by: jhb (mentor) Modified: head/sys/powerpc/powermac/cuda.c head/sys/powerpc/powermac/pmu.c Modified: head/sys/powerpc/powermac/cuda.c ============================================================================== --- head/sys/powerpc/powermac/cuda.c Thu Jun 11 17:15:44 2009 (r194026) +++ head/sys/powerpc/powermac/cuda.c Thu Jun 11 17:16:04 2009 (r194027) @@ -68,7 +68,7 @@ static int cuda_detach(device_t); static u_int cuda_adb_send(device_t dev, u_char command_byte, int len, u_char *data, u_char poll); static u_int cuda_adb_autopoll(device_t dev, uint16_t mask); -static void cuda_poll(device_t dev); +static u_int cuda_poll(device_t dev); static void cuda_send_inbound(struct cuda_softc *sc); static void cuda_send_outbound(struct cuda_softc *sc); @@ -471,16 +471,17 @@ cuda_send_inbound(struct cuda_softc *sc) mtx_unlock(&sc->sc_mutex); } -static void +static u_int cuda_poll(device_t dev) { struct cuda_softc *sc = device_get_softc(dev); if (sc->sc_state == CUDA_IDLE && !cuda_intr_state(sc) && !sc->sc_waiting) - return; + return (0); cuda_intr(dev); + return (0); } static void Modified: head/sys/powerpc/powermac/pmu.c ============================================================================== --- head/sys/powerpc/powermac/pmu.c Thu Jun 11 17:15:44 2009 (r194026) +++ head/sys/powerpc/powermac/pmu.c Thu Jun 11 17:16:04 2009 (r194027) @@ -68,7 +68,7 @@ static int pmu_detach(device_t); static u_int pmu_adb_send(device_t dev, u_char command_byte, int len, u_char *data, u_char poll); static u_int pmu_adb_autopoll(device_t dev, uint16_t mask); -static void pmu_poll(device_t dev); +static u_int pmu_poll(device_t dev); static void pmu_set_sleepled(void *xsc, int onoff); static int pmu_server_mode(SYSCTL_HANDLER_ARGS); @@ -575,10 +575,11 @@ done: } -static void +static u_int pmu_poll(device_t dev) { pmu_intr(dev); + return (0); } static void
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906111716.n5BHG4NG054733>