From: kettenis <kettenis@openbsd.org>
Date: Tue, 28 May 2024 09:40:40 +0000 (+0000)
Subject: Garbage collect sleep_abort(); it doesn't do anything useful anymore.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=9a6a36e21c00109d38c66a0c32c85221f8e0940c;p=openbsd

Garbage collect sleep_abort(); it doesn't do anything useful anymore.

ok deraadt@, mlarkin@
---

diff --git a/sys/arch/arm64/dev/apm.c b/sys/arch/arm64/dev/apm.c
index 903b35535be..49d4e1a6610 100644
--- a/sys/arch/arm64/dev/apm.c
+++ b/sys/arch/arm64/dev/apm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apm.c,v 1.24 2023/07/08 14:44:43 tobhe Exp $	*/
+/*	$OpenBSD: apm.c,v 1.25 2024/05/28 09:40:40 kettenis Exp $	*/
 
 /*-
  * Copyright (c) 2001 Alexander Guy.  All rights reserved.
@@ -444,11 +444,6 @@ gosleep(void *v)
 	return cpu_suspend_primary();
 }
 
-void
-sleep_abort(void *v)
-{
-}
-
 int
 sleep_resume(void *v)
 {
diff --git a/sys/arch/macppc/dev/apm.c b/sys/arch/macppc/dev/apm.c
index d64203d8fad..05a039497e0 100644
--- a/sys/arch/macppc/dev/apm.c
+++ b/sys/arch/macppc/dev/apm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apm.c,v 1.35 2023/07/08 14:44:43 tobhe Exp $	*/
+/*	$OpenBSD: apm.c,v 1.36 2024/05/28 09:40:40 kettenis Exp $	*/
 
 /*-
  * Copyright (c) 2001 Alexander Guy.  All rights reserved.
@@ -374,11 +374,6 @@ sleep_setstate(void *v)
 	return 0;
 }
 
-void
-sleep_abort(void *v)
-{
-}
-
 int
 sleep_resume(void *v)
 {
diff --git a/sys/dev/acpi/acpi_x86.c b/sys/dev/acpi/acpi_x86.c
index 6f4a15dcbe3..e8a8efdc045 100644
--- a/sys/dev/acpi/acpi_x86.c
+++ b/sys/dev/acpi/acpi_x86.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi_x86.c,v 1.19 2024/05/27 09:31:58 kettenis Exp $ */
+/* $OpenBSD: acpi_x86.c,v 1.20 2024/05/28 09:40:40 kettenis Exp $ */
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -100,11 +100,6 @@ gosleep(void *v)
 	return ret;
 }
 
-void
-sleep_abort(void *v)
-{
-}
-
 int
 sleep_resume(void *v)
 {
diff --git a/sys/kern/subr_suspend.c b/sys/kern/subr_suspend.c
index 40f7fa7bfc4..883274dee80 100644
--- a/sys/kern/subr_suspend.c
+++ b/sys/kern/subr_suspend.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_suspend.c,v 1.17 2024/05/26 13:37:32 kettenis Exp $ */
+/* $OpenBSD: subr_suspend.c,v 1.18 2024/05/28 09:40:40 kettenis Exp $ */
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -84,7 +84,6 @@ top:
 		uvmpd_hibernate();
 		if (hibernate_alloc()) {
 			printf("failed to allocate hibernate memory\n");
-			sleep_abort(v);
 			error = ENOMEM;
 			goto fail_hiballoc;
 		}
@@ -93,7 +92,6 @@ top:
 
 	sensor_quiesce();
 	if (config_suspend_all(DVACT_QUIESCE)) {
-		sleep_abort(v);
 		error = EIO;
 		goto fail_quiesce;
 	}
@@ -135,13 +133,11 @@ top:
 	intr_enable_wakeup();
 
 	if (config_suspend_all(DVACT_SUSPEND) != 0) {
-		sleep_abort(v);
 		error = EDEADLK;
 		goto fail_suspend;
 	}
 	suspend_randomness();
 	if (sleep_setstate(v)) {
-		sleep_abort(v);
 		error = ENOTBLK;
 		goto fail_pts;
 	}
diff --git a/sys/sys/device.h b/sys/sys/device.h
index 77fc2b1b2bd..712bcb4e3ae 100644
--- a/sys/sys/device.h
+++ b/sys/sys/device.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: device.h,v 1.66 2023/07/08 14:44:43 tobhe Exp $	*/
+/*	$OpenBSD: device.h,v 1.67 2024/05/28 09:40:40 kettenis Exp $	*/
 /*	$NetBSD: device.h,v 1.15 1996/04/09 20:55:24 cgd Exp $	*/
 
 /*
@@ -208,7 +208,6 @@ void	resume_mp(void);
 int	sleep_showstate(void *v, int sleepmode);
 int	sleep_setstate(void *v);
 int	sleep_resume(void *v);
-void	sleep_abort(void *v);
 int	gosleep(void *v);
 int	suspend_finish(void *v);