diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2010-04-30 15:18:30 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2010-04-30 15:18:30 +0000 |
| commit | 8b114d886ea016b76c7e9ecddecd7506884a7c06 (patch) | |
| tree | 98114e3035fafb40358d93b1c02beba8d43fe645 /sys/dev | |
| parent | fdc59587d4b2a19b8d37c49fec507b2dc77f167a (diff) | |
Remove volatile from function return values since gcc4 complains about them
and they don't make any sense (the old deprecated GCC way of marking noreturn
functions is surely not what was meant here).
ok jsg@, guenther@, marco@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/pcf8584.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/ic/pcf8584.c b/sys/dev/ic/pcf8584.c index 8710cc07723..949e5eb03d9 100644 --- a/sys/dev/ic/pcf8584.c +++ b/sys/dev/ic/pcf8584.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcf8584.c,v 1.9 2007/10/20 18:46:21 kettenis Exp $ */ +/* $OpenBSD: pcf8584.c,v 1.10 2010/04/30 15:18:29 kettenis Exp $ */ /* * Copyright (c) 2006 David Gwynne <dlg@openbsd.org> @@ -75,8 +75,8 @@ int pcfiic_xmit(struct pcfiic_softc *, u_int8_t, const u_int8_t *, int pcfiic_recv(struct pcfiic_softc *, u_int8_t, u_int8_t *, size_t); -volatile u_int8_t pcfiic_read(struct pcfiic_softc *, bus_size_t); -volatile void pcfiic_write(struct pcfiic_softc *, bus_size_t, u_int8_t); +u_int8_t pcfiic_read(struct pcfiic_softc *, bus_size_t); +void pcfiic_write(struct pcfiic_softc *, bus_size_t, u_int8_t); void pcfiic_choose_bus(struct pcfiic_softc *, u_int8_t); int pcfiic_wait_nBB(struct pcfiic_softc *); int pcfiic_wait_pin(struct pcfiic_softc *, volatile u_int8_t *); @@ -263,7 +263,7 @@ pcfiic_recv(struct pcfiic_softc *sc, u_int8_t addr, u_int8_t *buf, size_t len) return (err); } -volatile u_int8_t +u_int8_t pcfiic_read(struct pcfiic_softc *sc, bus_size_t r) { bus_space_barrier(sc->sc_iot, sc->sc_ioh, sc->sc_regmap[r], 1, @@ -271,7 +271,7 @@ pcfiic_read(struct pcfiic_softc *sc, bus_size_t r) return (bus_space_read_1(sc->sc_iot, sc->sc_ioh, sc->sc_regmap[r])); } -volatile void +void pcfiic_write(struct pcfiic_softc *sc, bus_size_t r, u_int8_t v) { bus_space_write_1(sc->sc_iot, sc->sc_ioh, sc->sc_regmap[r], v); |