diff options
-rw-r--r-- | sys/dev/iicbus/if_ic.c | 6 | ||||
-rw-r--r-- | sys/dev/iicbus/iicbb.c | 4 | ||||
-rw-r--r-- | sys/dev/iicbus/iicbus.c | 2 | ||||
-rw-r--r-- | sys/dev/iicbus/iicsmb.c | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c index 2457a9f..6d77e2a 100644 --- a/sys/dev/iicbus/if_ic.c +++ b/sys/dev/iicbus/if_ic.c @@ -105,7 +105,7 @@ static int icioctl(struct ifnet *, u_long, caddr_t); static int icoutput(struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *); -static void icintr(device_t, int, char *); +static int icintr(device_t, int, char *); static device_method_t ic_methods[] = { /* device interface */ @@ -272,7 +272,7 @@ icioctl(struct ifnet *ifp, u_long cmd, caddr_t data) /* * icintr() */ -static void +static int icintr(device_t dev, int event, char *ptr) { struct ic_softc *sc = (struct ic_softc *)device_get_softc(dev); @@ -346,7 +346,7 @@ icintr(device_t dev, int event, char *ptr) } mtx_unlock(&sc->ic_lock); - return; + return (0); } /* diff --git a/sys/dev/iicbus/iicbb.c b/sys/dev/iicbus/iicbb.c index f0d4c2f..2bc6321 100644 --- a/sys/dev/iicbus/iicbb.c +++ b/sys/dev/iicbus/iicbb.c @@ -72,7 +72,7 @@ static int iicbb_probe(device_t); static int iicbb_callback(device_t, int, caddr_t); static int iicbb_start(device_t, u_char, int); static int iicbb_stop(device_t); -static int iicbb_write(device_t, char *, int, int *, int); +static int iicbb_write(device_t, const char *, int, int *, int); static int iicbb_read(device_t, char *, int, int *, int, int); static int iicbb_reset(device_t, u_char, u_char, u_char *); @@ -372,7 +372,7 @@ iicbb_stop(device_t dev) } static int -iicbb_write(device_t dev, char * buf, int len, int *sent, int timeout) +iicbb_write(device_t dev, const char *buf, int len, int *sent, int timeout) { int bytes, error = 0; diff --git a/sys/dev/iicbus/iicbus.c b/sys/dev/iicbus/iicbus.c index a0c73a3..64c4e8f 100644 --- a/sys/dev/iicbus/iicbus.c +++ b/sys/dev/iicbus/iicbus.c @@ -173,7 +173,7 @@ iicbus_child_pnpinfo_str(device_t bus, device_t child, char *buf, } static int -iicbus_read_ivar(device_t bus, device_t child, int which, u_char *result) +iicbus_read_ivar(device_t bus, device_t child, int which, uintptr_t *result) { struct iicbus_ivar *devi = IICBUS_IVAR(child); diff --git a/sys/dev/iicbus/iicsmb.c b/sys/dev/iicbus/iicsmb.c index a442a23..10229ac 100644 --- a/sys/dev/iicbus/iicsmb.c +++ b/sys/dev/iicbus/iicsmb.c @@ -84,7 +84,7 @@ static int iicsmb_attach(device_t); static int iicsmb_detach(device_t); static void iicsmb_identify(driver_t *driver, device_t parent); -static void iicsmb_intr(device_t dev, int event, char *buf); +static int iicsmb_intr(device_t dev, int event, char *buf); static int iicsmb_callback(device_t dev, int index, void *data); static int iicsmb_quick(device_t dev, u_char slave, int how); static int iicsmb_sendb(device_t dev, u_char slave, char byte); @@ -186,7 +186,7 @@ iicsmb_detach(device_t dev) * * iicbus interrupt handler */ -static void +static int iicsmb_intr(device_t dev, int event, char *buf) { struct iicsmb_softc *sc = (struct iicsmb_softc *)device_get_softc(dev); @@ -252,7 +252,7 @@ end: } mtx_unlock(&sc->lock); - return; + return (0); } static int |