summaryrefslogtreecommitdiffstats
path: root/sys/powerpc/powermac
diff options
context:
space:
mode:
authoravg <avg@FreeBSD.org>2009-06-11 17:16:04 +0000
committeravg <avg@FreeBSD.org>2009-06-11 17:16:04 +0000
commit2ae00ba3ff5c1f6c8c06cc7a8be1226f775ad50d (patch)
tree408f3fcaebec1d4bc9cad812a557834acfda0f1c /sys/powerpc/powermac
parent968aa187848be028540801684a78f06bc40fb342 (diff)
downloadFreeBSD-src-2ae00ba3ff5c1f6c8c06cc7a8be1226f775ad50d.zip
FreeBSD-src-2ae00ba3ff5c1f6c8c06cc7a8be1226f775ad50d.tar.gz
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)
Diffstat (limited to 'sys/powerpc/powermac')
-rw-r--r--sys/powerpc/powermac/cuda.c7
-rw-r--r--sys/powerpc/powermac/pmu.c5
2 files changed, 7 insertions, 5 deletions
diff --git a/sys/powerpc/powermac/cuda.c b/sys/powerpc/powermac/cuda.c
index e6c010c..203889c 100644
--- a/sys/powerpc/powermac/cuda.c
+++ b/sys/powerpc/powermac/cuda.c
@@ -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
diff --git a/sys/powerpc/powermac/pmu.c b/sys/powerpc/powermac/pmu.c
index 5aef180..9ddba9e 100644
--- a/sys/powerpc/powermac/pmu.c
+++ b/sys/powerpc/powermac/pmu.c
@@ -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
OpenPOWER on IntegriCloud