Remove unused function pointers from `todr_handle'.

from miod@

diff --git a/sys/arch/sparc64/dev/rtc.c b/sys/arch/sparc64/dev/rtc.c
index a4d677e..cdc8489 100644 (file)
--- a/sys/arch/sparc64/dev/rtc.c
+++ b/sys/arch/sparc64/dev/rtc.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rtc.c,v 1.10 2014/07/11 08:18:31 guenther Exp $       */
+/*     $OpenBSD: rtc.c,v 1.11 2021/04/24 10:15:14 mpi Exp $    */
 
 /*
  * Copyright (c) 1992, 1993
@@ -119,8 +119,6 @@ int rtc_gettime(todr_chip_handle_t, struct timeval *);
 int rtc_settime(todr_chip_handle_t, struct timeval *);
 int rtc_bq4802_gettime(todr_chip_handle_t, struct timeval *);
 int rtc_bq4802_settime(todr_chip_handle_t, struct timeval *);
-int rtc_getcal(todr_chip_handle_t, int *);
-int rtc_setcal(todr_chip_handle_t, int);
 
 int
 rtc_match(struct device *parent, void *cf, void *aux)
@@ -166,8 +164,6 @@ rtc_attach(struct device *parent, struct device *self, void *aux)
        handle->cookie = sc;
        handle->todr_gettime = rtc_gettime;
        handle->todr_settime = rtc_settime;
-       handle->todr_getcal = rtc_getcal;
-       handle->todr_setcal = rtc_setcal;
 
        handle->bus_cookie = NULL;
        handle->todr_setwen = NULL;
@@ -404,15 +400,3 @@ rtc_bq4802_settime(todr_chip_handle_t handle, struct timeval *tv)
        bus_space_write_1(iot, ioh, BQ4802_CTRL, csr);
        return (0);
 }
-
-int
-rtc_getcal(todr_chip_handle_t handle, int *vp)
-{
-       return (EOPNOTSUPP);
-}
-
-int
-rtc_setcal(todr_chip_handle_t handle, int v)
-{
-       return (EOPNOTSUPP);
-}

diff --git a/sys/dev/clock_subr.h b/sys/dev/clock_subr.h
index 3d4c454..8a0c9f3 100644 (file)
--- a/sys/dev/clock_subr.h
+++ b/sys/dev/clock_subr.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: clock_subr.h,v 1.6 2020/05/17 13:21:20 visa Exp $     */
+/*     $OpenBSD: clock_subr.h,v 1.7 2021/04/24 10:15:15 mpi Exp $      */
 /*     $NetBSD: clock_subr.h,v 1.2 1997/03/15 18:11:17 is Exp $        */
 
 /*-
@@ -35,8 +35,6 @@
  *
  * todr_gettime: convert time-of-day clock into a `struct timeval'
  * todr_settime: set time-of-day clock from a `struct timeval'
- * todr_getcal: get current TOD clock calibration value in ppm
- * todr_setcal: set calibration value in ppm in TOD clock
  *
  * (this is probably not so useful:)
  * todr_setwen: provide a machine-dependent TOD clock write-enable callback
@@ -49,16 +47,12 @@ struct todr_chip_handle {
 
        int     (*todr_gettime)(struct todr_chip_handle *, struct timeval *);
        int     (*todr_settime)(struct todr_chip_handle *, struct timeval *);
-       int     (*todr_getcal)(struct todr_chip_handle *, int *);
-       int     (*todr_setcal)(struct todr_chip_handle *, int);
        int     (*todr_setwen)(struct todr_chip_handle *, int);
 };
 typedef struct todr_chip_handle *todr_chip_handle_t;
 
 #define todr_gettime(ct, t)    ((*(ct)->todr_gettime)(ct, t))
 #define todr_settime(ct, t)    ((*(ct)->todr_settime)(ct, t))
-#define todr_getcal(ct, vp)    ((*(ct)->todr_gettime)(ct, vp))
-#define todr_setcal(ct, v)     ((*(ct)->todr_settime)(ct, v))
 #define todr_wenable(ct, v)    if ((ct)->todr_setwen) \
                                        ((*(ct)->todr_setwen)(ct, v))
 

diff --git a/sys/dev/fdt/sxirtc.c b/sys/dev/fdt/sxirtc.c
index 02010e3..b9d397d 100644 (file)
--- a/sys/dev/fdt/sxirtc.c
+++ b/sys/dev/fdt/sxirtc.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: sxirtc.c,v 1.4 2019/08/11 14:46:18 kettenis Exp $     */
+/*     $OpenBSD: sxirtc.c,v 1.5 2021/04/24 10:15:15 mpi Exp $  */
 /*
  * Copyright (c) 2008 Mark Kettenis
  * Copyright (c) 2013 Artturi Alm
@@ -146,8 +146,6 @@ sxirtc_attach(struct device *parent, struct device *self, void *aux)
        handle->cookie = self;
        handle->todr_gettime = sxirtc_gettime;
        handle->todr_settime = sxirtc_settime;
-       handle->todr_getcal = NULL;
-       handle->todr_setcal = NULL;
        handle->bus_cookie = NULL;
        handle->todr_setwen = NULL;
        todr_handle = handle;

diff --git a/sys/dev/i2c/ds1307.c b/sys/dev/i2c/ds1307.c
index be831d6..d1ebd2d 100644 (file)
--- 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 <mglocker@openbsd.org>
@@ -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 8aca00a..6c49e05 100644 (file)
--- 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 1b78492..95f2dfe 100644 (file)
--- 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 5f5c67d..ad974de 100644 (file)
--- 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)
 {

diff --git a/sys/dev/ic/mk48txx.c b/sys/dev/ic/mk48txx.c
index f5a648c..185e7b1 100644 (file)
--- a/sys/dev/ic/mk48txx.c
+++ b/sys/dev/ic/mk48txx.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mk48txx.c,v 1.7 2011/04/05 19:54:35 jasper Exp $      */
+/*     $OpenBSD: mk48txx.c,v 1.8 2021/04/24 10:15:15 mpi Exp $ */
 /*     $NetBSD: mk48txx.c,v 1.7 2001/04/08 17:05:10 tsutsui Exp $ */
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -54,8 +54,6 @@ struct mk48txx {
 
 int mk48txx_gettime(todr_chip_handle_t, struct timeval *);
 int mk48txx_settime(todr_chip_handle_t, struct timeval *);
-int mk48txx_getcal(todr_chip_handle_t, int *);
-int mk48txx_setcal(todr_chip_handle_t, int);
 
 int mk48txx_auto_century_adjust = 1;
 
@@ -111,8 +109,6 @@ mk48txx_attach(bt, bh, model, year0)
        handle->cookie = mk;
        handle->todr_gettime = mk48txx_gettime;
        handle->todr_settime = mk48txx_settime;
-       handle->todr_getcal = mk48txx_getcal;
-       handle->todr_setcal = mk48txx_setcal;
        handle->todr_setwen = NULL;
        mk->mk_bt = bt;
        mk->mk_bh = bh;
@@ -224,22 +220,6 @@ mk48txx_settime(handle, tv)
        return (0);
 }
 
-int
-mk48txx_getcal(handle, vp)
-       todr_chip_handle_t handle;
-       int *vp;
-{
-       return (EOPNOTSUPP);
-}
-
-int
-mk48txx_setcal(handle, v)
-       todr_chip_handle_t handle;
-       int v;
-{
-       return (EOPNOTSUPP);
-}
-
 int
 mk48txx_get_nvram_size(handle, vp)
        todr_chip_handle_t handle;