From f7fa69f96ebf4d2217141dbf73a4a839ca8024f1 Mon Sep 17 00:00:00 2001
From: jcs <jcs@openbsd.org>
Date: Fri, 19 Jan 2018 18:20:38 +0000
Subject: [PATCH] dwiic: cleanup function prototypes after ACPI/PCI split

---
 sys/dev/acpi/dwiic_acpi.c | 18 +-----------------
 sys/dev/ic/dwiic.c        | 36 +-----------------------------------
 sys/dev/ic/dwiicvar.h     |  3 +--
 3 files changed, 3 insertions(+), 54 deletions(-)

diff --git a/sys/dev/acpi/dwiic_acpi.c b/sys/dev/acpi/dwiic_acpi.c
index c4e43a1026b..cb086bcbf73 100644
--- a/sys/dev/acpi/dwiic_acpi.c
+++ b/sys/dev/acpi/dwiic_acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dwiic_acpi.c,v 1.2 2017/12/03 19:42:20 kettenis Exp $ */
+/* $OpenBSD: dwiic_acpi.c,v 1.3 2018/01/19 18:20:38 jcs Exp $ */
 /*
  * Synopsys DesignWare I2C controller
  *
@@ -46,14 +46,6 @@ struct dwiic_crs {
 int		dwiic_acpi_match(struct device *, void *, void *);
 void		dwiic_acpi_attach(struct device *, struct device *, void *);
 
-int		dwiic_init(struct dwiic_softc *);
-void		dwiic_enable(struct dwiic_softc *, int);
-int		dwiic_intr(void *);
-
-void *		dwiic_i2c_intr_establish(void *, void *, int,
-		    int (*)(void *), void *, const char *);
-const char *	dwiic_i2c_intr_string(void *, void *);
-
 int		dwiic_acpi_parse_crs(int, union acpi_resource *, void *);
 int		dwiic_acpi_found_ihidev(struct dwiic_softc *,
 		    struct aml_node *, char *, struct dwiic_crs);
@@ -65,14 +57,6 @@ void		dwiic_acpi_power(struct dwiic_softc *, int);
 void		dwiic_acpi_bus_scan(struct device *,
 		    struct i2cbus_attach_args *, void *);
 
-int		dwiic_i2c_acquire_bus(void *, int);
-void		dwiic_i2c_release_bus(void *, int);
-uint32_t	dwiic_read(struct dwiic_softc *, int);
-void		dwiic_write(struct dwiic_softc *, int, uint32_t);
-int		dwiic_i2c_exec(void *, i2c_op_t, i2c_addr_t, const void *,
-		    size_t, void *, size_t, int);
-void		dwiic_xfer_msg(struct dwiic_softc *);
-
 struct cfattach dwiic_acpi_ca = {
 	sizeof(struct dwiic_softc),
 	dwiic_acpi_match,
diff --git a/sys/dev/ic/dwiic.c b/sys/dev/ic/dwiic.c
index 38431b1f7ed..82ffc38ef0e 100644
--- a/sys/dev/ic/dwiic.c
+++ b/sys/dev/ic/dwiic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dwiic.c,v 1.2 2017/12/01 16:06:25 kettenis Exp $ */
+/* $OpenBSD: dwiic.c,v 1.3 2018/01/19 18:20:38 jcs Exp $ */
 /*
  * Synopsys DesignWare I2C controller
  *
@@ -32,44 +32,10 @@
 
 #include <dev/ic/dwiicvar.h>
 
-int		dwiic_match(struct device *, void *, void *);
-void		dwiic_attach(struct device *, struct device *, void *);
-int		dwiic_detach(struct device *, int);
-int		dwiic_activate(struct device *, int);
-
-int		dwiic_init(struct dwiic_softc *);
-void		dwiic_enable(struct dwiic_softc *, int);
-int		dwiic_intr(void *);
-
-void *		dwiic_i2c_intr_establish(void *, void *, int,
-		    int (*)(void *), void *, const char *);
-const char *	dwiic_i2c_intr_string(void *, void *);
-
-int		dwiic_i2c_acquire_bus(void *, int);
-void		dwiic_i2c_release_bus(void *, int);
-uint32_t	dwiic_read(struct dwiic_softc *, int);
-void		dwiic_write(struct dwiic_softc *, int, uint32_t);
-int		dwiic_i2c_exec(void *, i2c_op_t, i2c_addr_t, const void *,
-		    size_t, void *, size_t, int);
-void		dwiic_xfer_msg(struct dwiic_softc *);
-
 struct cfdriver dwiic_cd = {
 	NULL, "dwiic", DV_DULL
 };
 
-int
-dwiic_detach(struct device *self, int flags)
-{
-	struct dwiic_softc *sc = (struct dwiic_softc *)self;
-
-	if (sc->sc_ih != NULL) {
-		intr_disestablish(sc->sc_ih);
-		sc->sc_ih = NULL;
-	}
-
-	return 0;
-}
-
 int
 dwiic_activate(struct device *self, int act)
 {
diff --git a/sys/dev/ic/dwiicvar.h b/sys/dev/ic/dwiicvar.h
index afbbd24bea3..92126f66b8b 100644
--- a/sys/dev/ic/dwiicvar.h
+++ b/sys/dev/ic/dwiicvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dwiicvar.h,v 1.1 2017/11/16 18:12:27 jcs Exp $ */
+/* $OpenBSD: dwiicvar.h,v 1.2 2018/01/19 18:20:38 jcs Exp $ */
 /*
  * Synopsys DesignWare I2C controller
  *
@@ -98,6 +98,5 @@ uint32_t	dwiic_read(struct dwiic_softc *, int);
 void		dwiic_write(struct dwiic_softc *, int, uint32_t);
 int		dwiic_i2c_exec(void *, i2c_op_t, i2c_addr_t, const void *,
 		    size_t, void *, size_t, int);
-void		dwiic_xfer_msg(struct dwiic_softc *);
 
 int		dwiic_acpi_found_hid(struct aml_node *node, void *arg);
-- 
2.20.1