From beb775c7452b0e8fa5d4b5f173a2fe0de3b3a18d Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Sun, 16 May 2021 08:50:59 +0000
Subject: [PATCH] correct prototype of acpi gpio intr_establish functions

ok kettenis@
---
 sys/dev/acpi/amdgpio.c | 4 ++--
 sys/dev/acpi/aplgpio.c | 4 ++--
 sys/dev/acpi/bytgpio.c | 4 ++--
 sys/dev/acpi/chvgpio.c | 4 ++--
 sys/dev/acpi/dwgpio.c  | 4 ++--
 sys/dev/acpi/glkgpio.c | 4 ++--
 sys/dev/acpi/pchgpio.c | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/sys/dev/acpi/amdgpio.c b/sys/dev/acpi/amdgpio.c
index 0fdb0a71bd5..ddbd5daa916 100644
--- a/sys/dev/acpi/amdgpio.c
+++ b/sys/dev/acpi/amdgpio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: amdgpio.c,v 1.4 2020/06/20 18:06:22 krw Exp $	*/
+/*	$OpenBSD: amdgpio.c,v 1.5 2021/05/16 08:50:59 jsg Exp $	*/
 /*
  * Copyright (c) 2016 Mark Kettenis
  * Copyright (c) 2019 James Hastings
@@ -83,7 +83,7 @@ const char *amdgpio_hids[] = {
 
 int	amdgpio_read_pin(void *, int);
 void	amdgpio_write_pin(void *, int, int);
-void	amdgpio_intr_establish(void *, int, int, int (*)(), void *);
+void	amdgpio_intr_establish(void *, int, int, int (*)(void *), void *);
 int	amdgpio_pin_intr(struct amdgpio_softc *, int);
 int	amdgpio_intr(void *);
 
diff --git a/sys/dev/acpi/aplgpio.c b/sys/dev/acpi/aplgpio.c
index 2cbe27b43cd..53cad22d564 100644
--- a/sys/dev/acpi/aplgpio.c
+++ b/sys/dev/acpi/aplgpio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aplgpio.c,v 1.2 2020/05/22 10:16:37 kettenis Exp $	*/
+/*	$OpenBSD: aplgpio.c,v 1.3 2021/05/16 08:50:59 jsg Exp $	*/
 /*
  * Copyright (c) 2016 Mark Kettenis
  * Copyright (c) 2019 James Hastings
@@ -75,7 +75,7 @@ const char *aplgpio_hids[] = {
 
 int	aplgpio_read_pin(void *, int);
 void	aplgpio_write_pin(void *, int, int);
-void	aplgpio_intr_establish(void *, int, int, int (*)(), void *);
+void	aplgpio_intr_establish(void *, int, int, int (*)(void *), void *);
 int	aplgpio_intr(void *);
 
 int
diff --git a/sys/dev/acpi/bytgpio.c b/sys/dev/acpi/bytgpio.c
index ed14457b680..031d7d5af42 100644
--- a/sys/dev/acpi/bytgpio.c
+++ b/sys/dev/acpi/bytgpio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bytgpio.c,v 1.14 2020/05/22 10:16:37 kettenis Exp $	*/
+/*	$OpenBSD: bytgpio.c,v 1.15 2021/05/16 08:50:59 jsg Exp $	*/
 /*
  * Copyright (c) 2016 Mark Kettenis
  *
@@ -101,7 +101,7 @@ const int byt_sus_pins[] = {
 
 int	bytgpio_read_pin(void *, int);
 void	bytgpio_write_pin(void *, int, int);
-void	bytgpio_intr_establish(void *, int, int, int (*)(), void *);
+void	bytgpio_intr_establish(void *, int, int, int (*)(void *), void *);
 int	bytgpio_intr(void *);
 
 int
diff --git a/sys/dev/acpi/chvgpio.c b/sys/dev/acpi/chvgpio.c
index a0e75bcb60b..f2c3c0c9132 100644
--- a/sys/dev/acpi/chvgpio.c
+++ b/sys/dev/acpi/chvgpio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: chvgpio.c,v 1.9 2020/05/22 10:16:37 kettenis Exp $	*/
+/*	$OpenBSD: chvgpio.c,v 1.10 2021/05/16 08:50:59 jsg Exp $	*/
 /*
  * Copyright (c) 2016 Mark Kettenis
  *
@@ -145,7 +145,7 @@ const int chv_southeast_pins[] = {
 int	chvgpio_check_pin(struct chvgpio_softc *, int);
 int	chvgpio_read_pin(void *, int);
 void	chvgpio_write_pin(void *, int, int);
-void	chvgpio_intr_establish(void *, int, int, int (*)(), void *);
+void	chvgpio_intr_establish(void *, int, int, int (*)(void *), void *);
 int	chvgpio_intr(void *);
 int	chvgpio_opreg_handler(void *, int, uint64_t, int, uint64_t *);
 
diff --git a/sys/dev/acpi/dwgpio.c b/sys/dev/acpi/dwgpio.c
index ce45a9645e1..776b92e2854 100644
--- a/sys/dev/acpi/dwgpio.c
+++ b/sys/dev/acpi/dwgpio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dwgpio.c,v 1.2 2020/12/07 17:34:49 gnezdo Exp $	*/
+/*	$OpenBSD: dwgpio.c,v 1.3 2021/05/16 08:50:59 jsg Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis
  *
@@ -90,7 +90,7 @@ const char *dwgpio_hids[] = {
 int	dwgpio_found_hid(struct aml_node *, void *);
 int	dwgpio_read_pin(void *, int);
 void	dwgpio_write_pin(void *, int, int);
-void	dwgpio_intr_establish(void *, int, int, int (*)(), void *);
+void	dwgpio_intr_establish(void *, int, int, int (*)(void *), void *);
 int	dwgpio_pin_intr(struct dwgpio_softc *, int);
 int	dwgpio_intr(void *);
 
diff --git a/sys/dev/acpi/glkgpio.c b/sys/dev/acpi/glkgpio.c
index 2646c3e0777..5351e66c355 100644
--- a/sys/dev/acpi/glkgpio.c
+++ b/sys/dev/acpi/glkgpio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: glkgpio.c,v 1.2 2020/05/22 10:16:37 kettenis Exp $	*/
+/*	$OpenBSD: glkgpio.c,v 1.3 2021/05/16 08:50:59 jsg Exp $	*/
 /*
  * Copyright (c) 2016 Mark Kettenis
  * Copyright (c) 2019 James Hastings
@@ -76,7 +76,7 @@ const char *glkgpio_hids[] = {
 int	glkgpio_parse_resources(int, union acpi_resource *, void *);
 int	glkgpio_read_pin(void *, int);
 void	glkgpio_write_pin(void *, int, int);
-void	glkgpio_intr_establish(void *, int, int, int (*)(), void *);
+void	glkgpio_intr_establish(void *, int, int, int (*)(void *), void *);
 int	glkgpio_intr(void *);
 
 int
diff --git a/sys/dev/acpi/pchgpio.c b/sys/dev/acpi/pchgpio.c
index 62426519cb5..1dff43d1679 100644
--- a/sys/dev/acpi/pchgpio.c
+++ b/sys/dev/acpi/pchgpio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pchgpio.c,v 1.1 2020/11/15 16:47:12 kettenis Exp $	*/
+/*	$OpenBSD: pchgpio.c,v 1.2 2021/05/16 08:50:59 jsg Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis
  * Copyright (c) 2020 James Hastings
@@ -134,7 +134,7 @@ struct pchgpio_match pchgpio_devices[] = {
 
 int	pchgpio_read_pin(void *, int);
 void	pchgpio_write_pin(void *, int, int);
-void	pchgpio_intr_establish(void *, int, int, int (*)(), void *);
+void	pchgpio_intr_establish(void *, int, int, int (*)(void *), void *);
 int	pchgpio_intr(void *);
 
 int
-- 
2.20.1