From 3eb0e0d3ff9e95b28667ceb14aa7cbb430cd150f Mon Sep 17 00:00:00 2001 From: Martin Pieuchot Date: Sat, 24 Apr 2021 10:15:16 +0000 Subject: Remove unused function pointers from `todr_handle'. from miod@ --- sys/dev/i2c/ds1307.c | 18 +----------------- sys/dev/i2c/pcf8523.c | 18 +----------------- sys/dev/i2c/pcf8563.c | 18 +----------------- sys/dev/i2c/rs5c372.c | 20 +------------------- 4 files changed, 4 insertions(+), 70 deletions(-) (limited to 'sys/dev/i2c') diff --git a/sys/dev/i2c/ds1307.c b/sys/dev/i2c/ds1307.c index be831d62a18..d1ebd2d6fa2 100644 --- a/sys/dev/i2c/ds1307.c +++ b/sys/dev/i2c/ds1307.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ds1307.c,v 1.2 2020/04/27 12:41:44 kettenis Exp $ */ +/* $OpenBSD: ds1307.c,v 1.3 2021/04/24 10:15:15 mpi Exp $ */ /* * Copyright (c) 2016 Marcus Glocker @@ -72,8 +72,6 @@ int maxrtc_enable_osc(struct maxrtc_softc *); int maxrtc_set_24h_mode(struct maxrtc_softc *); int maxrtc_gettime(struct todr_chip_handle *, struct timeval *); int maxrtc_settime(struct todr_chip_handle *, struct timeval *); -int maxrtc_getcal(struct todr_chip_handle *, int *); -int maxrtc_setcal(struct todr_chip_handle *, int); /* * Driver glue structures. @@ -114,8 +112,6 @@ maxrtc_attach(struct device *parent, struct device *self, void *arg) sc->sc_todr.cookie = sc; sc->sc_todr.todr_gettime = maxrtc_gettime; sc->sc_todr.todr_settime = maxrtc_settime; - sc->sc_todr.todr_getcal = maxrtc_getcal; - sc->sc_todr.todr_setcal = maxrtc_setcal; sc->sc_todr.todr_setwen = NULL; if (maxrtc_enable_osc(sc) == -1) @@ -276,15 +272,3 @@ maxrtc_settime(struct todr_chip_handle *ch, struct timeval *tv) return (0); } - -int -maxrtc_getcal(struct todr_chip_handle *ch, int *cal) -{ - return (EOPNOTSUPP); -} - -int -maxrtc_setcal(struct todr_chip_handle *ch, int cal) -{ - return (EOPNOTSUPP); -} diff --git a/sys/dev/i2c/pcf8523.c b/sys/dev/i2c/pcf8523.c index 8aca00ae1b7..6c49e05e579 100644 --- a/sys/dev/i2c/pcf8523.c +++ b/sys/dev/i2c/pcf8523.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcf8523.c,v 1.4 2020/04/27 12:36:03 kettenis Exp $ */ +/* $OpenBSD: pcf8523.c,v 1.5 2021/04/24 10:15:15 mpi Exp $ */ /* * Copyright (c) 2005 Kimihiro Nonaka @@ -109,8 +109,6 @@ int pcfrtc_clock_read(struct pcfrtc_softc *, struct clock_ymdhms *); int pcfrtc_clock_write(struct pcfrtc_softc *, struct clock_ymdhms *); int pcfrtc_gettime(struct todr_chip_handle *, struct timeval *); int pcfrtc_settime(struct todr_chip_handle *, struct timeval *); -int pcfrtc_getcal(struct todr_chip_handle *, int *); -int pcfrtc_setcal(struct todr_chip_handle *, int); int pcfrtc_match(struct device *parent, void *v, void *arg) @@ -136,8 +134,6 @@ pcfrtc_attach(struct device *parent, struct device *self, void *arg) sc->sc_todr.cookie = sc; sc->sc_todr.todr_gettime = pcfrtc_gettime; sc->sc_todr.todr_settime = pcfrtc_settime; - sc->sc_todr.todr_getcal = pcfrtc_getcal; - sc->sc_todr.todr_setcal = pcfrtc_setcal; sc->sc_todr.todr_setwen = NULL; #if 0 @@ -203,18 +199,6 @@ pcfrtc_settime(struct todr_chip_handle *ch, struct timeval *tv) return (0); } -int -pcfrtc_setcal(struct todr_chip_handle *ch, int cal) -{ - return (EOPNOTSUPP); -} - -int -pcfrtc_getcal(struct todr_chip_handle *ch, int *cal) -{ - return (EOPNOTSUPP); -} - uint8_t pcfrtc_reg_read(struct pcfrtc_softc *sc, int reg) { diff --git a/sys/dev/i2c/pcf8563.c b/sys/dev/i2c/pcf8563.c index 1b78492f055..95f2dfe0365 100644 --- a/sys/dev/i2c/pcf8563.c +++ b/sys/dev/i2c/pcf8563.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcf8563.c,v 1.3 2021/01/13 11:01:19 kettenis Exp $ */ +/* $OpenBSD: pcf8563.c,v 1.4 2021/04/24 10:15:15 mpi Exp $ */ /* * Copyright (c) 2005 Kimihiro Nonaka @@ -96,8 +96,6 @@ int pcxrtc_clock_read(struct pcxrtc_softc *, struct clock_ymdhms *); int pcxrtc_clock_write(struct pcxrtc_softc *, struct clock_ymdhms *); int pcxrtc_gettime(struct todr_chip_handle *, struct timeval *); int pcxrtc_settime(struct todr_chip_handle *, struct timeval *); -int pcxrtc_getcal(struct todr_chip_handle *, int *); -int pcxrtc_setcal(struct todr_chip_handle *, int); int pcxrtc_match(struct device *parent, void *v, void *arg) @@ -123,8 +121,6 @@ pcxrtc_attach(struct device *parent, struct device *self, void *arg) sc->sc_todr.cookie = sc; sc->sc_todr.todr_gettime = pcxrtc_gettime; sc->sc_todr.todr_settime = pcxrtc_settime; - sc->sc_todr.todr_getcal = pcxrtc_getcal; - sc->sc_todr.todr_setcal = pcxrtc_setcal; sc->sc_todr.todr_setwen = NULL; #if 0 @@ -175,18 +171,6 @@ pcxrtc_settime(struct todr_chip_handle *ch, struct timeval *tv) return (0); } -int -pcxrtc_setcal(struct todr_chip_handle *ch, int cal) -{ - return (EOPNOTSUPP); -} - -int -pcxrtc_getcal(struct todr_chip_handle *ch, int *cal) -{ - return (EOPNOTSUPP); -} - uint8_t pcxrtc_reg_read(struct pcxrtc_softc *sc, int reg) { diff --git a/sys/dev/i2c/rs5c372.c b/sys/dev/i2c/rs5c372.c index 5f5c67d6de2..ad974de6ce3 100644 --- a/sys/dev/i2c/rs5c372.c +++ b/sys/dev/i2c/rs5c372.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rs5c372.c,v 1.5 2009/10/05 18:59:36 deraadt Exp $ */ +/* $OpenBSD: rs5c372.c,v 1.6 2021/04/24 10:15:15 mpi Exp $ */ /* $NetBSD: rs5c372.c,v 1.5 2006/03/29 06:41:24 thorpej Exp $ */ /* @@ -107,8 +107,6 @@ int ricohrtc_clock_read(struct ricohrtc_softc *, struct clock_ymdhms *); int ricohrtc_clock_write(struct ricohrtc_softc *, struct clock_ymdhms *); int ricohrtc_gettime(struct todr_chip_handle *, struct timeval *); int ricohrtc_settime(struct todr_chip_handle *, struct timeval *); -int ricohrtc_getcal(struct todr_chip_handle *, int *); -int ricohrtc_setcal(struct todr_chip_handle *, int); int ricohrtc_match(struct device *parent, void *v, void *arg) @@ -186,8 +184,6 @@ ricohrtc_attach(struct device *parent, struct device *self, void *arg) sc->sc_todr.cookie = sc; sc->sc_todr.todr_gettime = ricohrtc_gettime; sc->sc_todr.todr_settime = ricohrtc_settime; - sc->sc_todr.todr_getcal = ricohrtc_getcal; - sc->sc_todr.todr_setcal = ricohrtc_setcal; sc->sc_todr.todr_setwen = NULL; #if 0 @@ -233,20 +229,6 @@ ricohrtc_settime(struct todr_chip_handle *ch, struct timeval *tv) return (0); } -int -ricohrtc_setcal(struct todr_chip_handle *ch, int cal) -{ - - return (EOPNOTSUPP); -} - -int -ricohrtc_getcal(struct todr_chip_handle *ch, int *cal) -{ - - return (EOPNOTSUPP); -} - void ricohrtc_reg_write(struct ricohrtc_softc *sc, int reg, uint8_t val) { -- cgit v1.2.3