remove CPU_LIDSUSPEND/machdep.lidsuspend

"fire away!" tedu

7 files changed, 13 insertions, 18 deletions

diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c
index 9653de19924..937094504d1 100644
--- a/sys/arch/amd64/amd64/machdep.c
+++ b/sys/arch/amd64/amd64/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.230 2017/06/29 07:19:40 mlarkin Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.231 2017/07/12 06:26:32 natano Exp $	*/
 /*	$NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $	*/
 
 /*-
@@ -476,7 +476,6 @@ cpu_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp,
 #endif
 	case CPU_XCRYPT:
 		return (sysctl_rdint(oldp, oldlenp, newp, amd64_has_xcrypt));
-	case CPU_LIDSUSPEND:
 	case CPU_LIDACTION:
 		val = lid_action;
 		error = sysctl_int(oldp, oldlenp, newp, newlen, &val);
diff --git a/sys/arch/amd64/include/cpu.h b/sys/arch/amd64/include/cpu.h
index 77bfe72b034..a7e26294f96 100644
--- a/sys/arch/amd64/include/cpu.h
+++ b/sys/arch/amd64/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.112 2017/06/20 05:34:41 mlarkin Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.113 2017/07/12 06:26:32 natano Exp $	*/
 /*	$NetBSD: cpu.h,v 1.1 2003/04/26 18:39:39 fvdl Exp $	*/
 
 /*-
@@ -427,7 +427,6 @@ void mp_setperf_init(void);
 #define CPU_KBDRESET		10	/* keyboard reset under pcvt */
 #define CPU_APMHALT		11	/* halt -p hack */
 #define CPU_XCRYPT		12	/* supports VIA xcrypt in userland */
-#define CPU_LIDSUSPEND		13	/* lid close causes a suspend */
 #define CPU_LIDACTION		14	/* action caused by lid close */
 #define CPU_FORCEUKBD		15	/* Force ukbd(4) as console keyboard */
 #define CPU_MAXID		16	/* number of valid machdep ids */
@@ -446,7 +445,7 @@ void mp_setperf_init(void);
 	{ "kbdreset", CTLTYPE_INT }, \
 	{ "apmhalt", CTLTYPE_INT }, \
 	{ "xcrypt", CTLTYPE_INT }, \
-	{ "lidsuspend", CTLTYPE_INT }, \
+	{ 0, 0 }, \
 	{ "lidaction", CTLTYPE_INT }, \
 	{ "forceukbd", CTLTYPE_INT }, \
 }
diff --git a/sys/arch/arm/include/cpu.h b/sys/arch/arm/include/cpu.h
index 312c2f6c9c9..0477b88883f 100644
--- a/sys/arch/arm/include/cpu.h
+++ b/sys/arch/arm/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.46 2017/04/27 22:41:46 kettenis Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.47 2017/07/12 06:26:32 natano Exp $	*/
 /*	$NetBSD: cpu.h,v 1.34 2003/06/23 11:01:08 martin Exp $	*/
 
 /*
@@ -65,7 +65,7 @@
 		/*		9	   formerly int: CPU_ZTSRAWMODE */
 		/*		10	   formerly struct: CPU_ZTSSCALE */
 #define	CPU_MAXSPEED		11	/* int: number of valid machdep ids */
-#define CPU_LIDSUSPEND		12	/* int: closing lid causes suspend */
+		/*		12	   formerly int: CPU_LIDSUSPEND */
 #define CPU_LIDACTION		13	/* action caused by lid close */
 #define	CPU_MAXID		14	/* number of valid machdep ids */
 
@@ -82,7 +82,7 @@
 	{ 0, 0 }, \
 	{ 0, 0 }, \
 	{ "maxspeed", CTLTYPE_INT }, \
-	{ "lidsuspend", CTLTYPE_INT }, \
+	{ 0, 0 }, \
 	{ "lidaction", CTLTYPE_INT }, \
 }
 
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 78abb6f6215..99023b9d86c 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.603 2017/06/29 07:11:24 mlarkin Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.604 2017/07/12 06:26:32 natano Exp $	*/
 /*	$NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $	*/
 
 /*-
@@ -3550,7 +3550,6 @@ cpu_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp,
 		return (sysctl_rdint(oldp, oldlenp, newp, i386_has_sse2));
 	case CPU_XCRYPT:
 		return (sysctl_rdint(oldp, oldlenp, newp, i386_has_xcrypt));
-	case CPU_LIDSUSPEND:
 	case CPU_LIDACTION:
 		val = lid_action;
 		error = sysctl_int(oldp, oldlenp, newp, newlen, &val);
diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h
index bb3f1c8628a..677fcb7f6b6 100644
--- a/sys/arch/i386/include/cpu.h
+++ b/sys/arch/i386/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.155 2017/03/16 10:02:03 mpi Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.156 2017/07/12 06:26:33 natano Exp $	*/
 /*	$NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $	*/
 
 /*-
@@ -523,7 +523,6 @@ int	cpu_paenable(void *);
 #define CPU_SSE			14	/* supports SSE */
 #define CPU_SSE2		15	/* supports SSE2 */
 #define CPU_XCRYPT		16	/* supports VIA xcrypt in userland */
-#define CPU_LIDSUSPEND		17	/* lid close causes a suspend */
 #define CPU_LIDACTION		18	/* action caused by lid close */
 #define CPU_FORCEUKBD		19	/* Force ukbd(4) as console keyboard */
 #define CPU_MAXID		20	/* number of valid machdep ids */
@@ -546,7 +545,7 @@ int	cpu_paenable(void *);
 	{ "sse", CTLTYPE_INT }, \
 	{ "sse2", CTLTYPE_INT }, \
 	{ "xcrypt", CTLTYPE_INT }, \
-	{ "lidsuspend", CTLTYPE_INT }, \
+	{ 0, 0 }, \
 	{ "lidaction", CTLTYPE_INT }, \
 	{ "forceukbd", CTLTYPE_INT }, \
 }
diff --git a/sys/arch/loongson/loongson/machdep.c b/sys/arch/loongson/loongson/machdep.c
index d5f8984fe3d..ceb1d6c2f40 100644
--- a/sys/arch/loongson/loongson/machdep.c
+++ b/sys/arch/loongson/loongson/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.78 2017/05/21 13:00:53 visa Exp $ */
+/*	$OpenBSD: machdep.c,v 1.79 2017/07/12 06:26:33 natano Exp $ */
 
 /*
  * Copyright (c) 2009, 2010, 2014 Miodrag Vallat.
@@ -1028,7 +1028,6 @@ cpu_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp,
 		return ENOTDIR;		/* Overloaded */
 
 	switch (name[0]) {
-	case CPU_LIDSUSPEND:
 	case CPU_LIDACTION:
 		val = lid_action;
 		error = sysctl_int(oldp, oldlenp, newp, newlen, &val);
diff --git a/sys/arch/mips64/include/cpu.h b/sys/arch/mips64/include/cpu.h
index 35548958f16..863616979b4 100644
--- a/sys/arch/mips64/include/cpu.h
+++ b/sys/arch/mips64/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.118 2017/06/11 03:35:30 visa Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.119 2017/07/12 06:26:33 natano Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -364,7 +364,7 @@ void	cp0_calibrate(struct cpu_info *);
  */
 #define	CPU_ALLOWAPERTURE	1	/* allow mmap of /dev/xf86 */
 		/*		2	   formerly: keyboard reset */
-#define	CPU_LIDSUSPEND		3	/* lid close causes a suspend */
+		/*		3	   formerly: CPU_LIDSUSPEND */
 #define CPU_LIDACTION		4	/* action caused by lid close */
 #define	CPU_MAXID		5	/* number of valid machdep ids */
 
@@ -372,7 +372,7 @@ void	cp0_calibrate(struct cpu_info *);
 	{ 0, 0 },				\
 	{ "allowaperture", CTLTYPE_INT },	\
 	{ 0, 0 },				\
-	{ "lidsuspend", CTLTYPE_INT },		\
+	{ 0, 0 },				\
 	{ "lidaction", CTLTYPE_INT },		\
 }