From owner-svn-src-head@FreeBSD.ORG Thu Jun 11 17:16:04 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A28661065705; Thu, 11 Jun 2009 17:16:04 +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 76DCF8FC25; Thu, 11 Jun 2009 17:16:04 +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 n5BHG454054735; Thu, 11 Jun 2009 17:16:04 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5BHG4NG054733; Thu, 11 Jun 2009 17:16:04 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <200906111716.n5BHG4NG054733@svn.freebsd.org> From: Andriy Gapon Date: Thu, 11 Jun 2009 17:16:04 +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: r194027 - head/sys/powerpc/powermac X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jun 2009 17:16:05 -0000 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