Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/acpi Remove <dev/acpi/acpica.h> from all files. It i...
details: https://anonhg.NetBSD.org/src/rev/544743dcfdd7
branches: trunk
changeset: 752737:544743dcfdd7
user: jruoho <jruoho%NetBSD.org@localhost>
date: Fri Mar 05 14:00:16 2010 +0000
description:
Remove <dev/acpi/acpica.h> from all files. It is included from
<dev/acpi/acpivar.h>. Ditto for <dev/sysmon/sysmonvar.h>, <sys/bus.h>,
<dev/pci/pcivar.h>, and <dev/isa/isavar.h>.
Also nuke a lot of unused and invalid headers. Some of these are audibly
provided by standard headers (namely <sys/param.h> and <sys/device.h>), some
have nothing to do with ACPI devices (e.g. <sys/syslog.h>), and some are
nonexistent local includes (e.g. "mpu_ym.h"). Moreoever, try to group the
includes into their respective blocks.
Tested with GENERIC and ALL (i386). No functional change.
diffstat:
sys/dev/acpi/acpi.c | 13 ++++++-------
sys/dev/acpi/acpi_acad.c | 9 +++------
sys/dev/acpi/acpi_apm.c | 14 ++++----------
sys/dev/acpi/acpi_bat.c | 14 ++++++--------
sys/dev/acpi/acpi_button.c | 8 +++-----
sys/dev/acpi/acpi_ec.c | 9 ++++-----
sys/dev/acpi/acpi_lid.c | 9 +++------
sys/dev/acpi/acpi_madt.c | 10 ++--------
sys/dev/acpi/acpi_pci.c | 14 +++++---------
sys/dev/acpi/acpi_pci_link.c | 12 ++++++------
sys/dev/acpi/acpi_powerres.c | 9 ++-------
sys/dev/acpi/acpi_quirks.c | 9 ++-------
sys/dev/acpi/acpi_resource.c | 7 +++----
sys/dev/acpi/acpi_slit.c | 6 +++---
sys/dev/acpi/acpi_srat.c | 8 +++-----
sys/dev/acpi/acpi_timer.c | 8 +++++---
sys/dev/acpi/acpi_tz.c | 14 ++++----------
sys/dev/acpi/acpi_wakedev.c | 11 +++++------
sys/dev/acpi/aiboost.c | 9 +++------
sys/dev/acpi/asus_acpi.c | 12 ++++--------
sys/dev/acpi/atk0110.c | 9 +++------
sys/dev/acpi/atppc_acpi.c | 19 +++++--------------
sys/dev/acpi/attimer_acpi.c | 13 +++----------
sys/dev/acpi/com_acpi.c | 19 +++++--------------
sys/dev/acpi/dalb_acpi.c | 14 ++++----------
sys/dev/acpi/fdc_acpi.c | 23 ++++++-----------------
sys/dev/acpi/hpet_acpi.c | 16 +++++-----------
sys/dev/acpi/hpqlb_acpi.c | 17 +++++++----------
sys/dev/acpi/joy_acpi.c | 13 +++----------
sys/dev/acpi/lpt_acpi.c | 21 ++++++---------------
sys/dev/acpi/mpu_acpi.c | 19 +++++--------------
sys/dev/acpi/pckbc_acpi.c | 17 ++++++-----------
sys/dev/acpi/pcppi_acpi.c | 12 ++----------
sys/dev/acpi/smbus_acpi.c | 13 ++++---------
sys/dev/acpi/sony_acpi.c | 15 ++++-----------
sys/dev/acpi/spic_acpi.c | 17 ++++++-----------
sys/dev/acpi/thinkpad_acpi.c | 15 ++++-----------
sys/dev/acpi/ug_acpi.c | 17 +++--------------
sys/dev/acpi/wb_acpi.c | 22 +++++++---------------
sys/dev/acpi/wmi_acpi.c | 5 +++--
sys/dev/acpi/wss_acpi.c | 20 +++++---------------
sys/dev/acpi/ym_acpi.c | 12 +++++-------
42 files changed, 177 insertions(+), 376 deletions(-)
diffs (truncated from 1423 to 300 lines):
diff -r 6aae66619141 -r 544743dcfdd7 sys/dev/acpi/acpi.c
--- a/sys/dev/acpi/acpi.c Fri Mar 05 12:44:16 2010 +0000
+++ b/sys/dev/acpi/acpi.c Fri Mar 05 14:00:16 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.154 2010/03/04 23:25:07 jruoho Exp $ */
+/* $NetBSD: acpi.c,v 1.155 2010/03/05 14:00:16 jruoho Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -70,27 +70,26 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.154 2010/03/04 23:25:07 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.155 2010/03/05 14:00:16 jruoho Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/device.h>
+#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/sysctl.h>
+#include <sys/systm.h>
-#include <dev/acpi/acpica.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#include <dev/acpi/acpi_osd.h>
+#include <dev/acpi/acpi_pci.h>
#include <dev/acpi/acpi_timer.h>
#include <dev/acpi/acpi_wakedev.h>
-#include <dev/acpi/acpi_pci.h>
+
#ifdef ACPIVERBOSE
#include <dev/acpi/acpidevs_data.h>
#endif
diff -r 6aae66619141 -r 544743dcfdd7 sys/dev/acpi/acpi_acad.c
--- a/sys/dev/acpi/acpi_acad.c Fri Mar 05 12:44:16 2010 +0000
+++ b/sys/dev/acpi/acpi_acad.c Fri Mar 05 14:00:16 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_acad.c,v 1.41 2010/02/28 17:22:41 jruoho Exp $ */
+/* $NetBSD: acpi_acad.c,v 1.42 2010/03/05 14:00:16 jruoho Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,20 +40,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.41 2010/02/28 17:22:41 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.42 2010/03/05 14:00:16 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/device.h>
#include <sys/module.h>
#include <sys/mutex.h>
+#include <sys/systm.h>
-#include <dev/acpi/acpica.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
-#include <dev/sysmon/sysmonvar.h>
-
#define _COMPONENT ACPI_ACAD_COMPONENT
ACPI_MODULE_NAME ("acpi_acad")
diff -r 6aae66619141 -r 544743dcfdd7 sys/dev/acpi/acpi_apm.c
--- a/sys/dev/acpi/acpi_apm.c Fri Mar 05 12:44:16 2010 +0000
+++ b/sys/dev/acpi/acpi_apm.c Fri Mar 05 14:00:16 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_apm.c,v 1.14 2008/04/28 20:23:47 martin Exp $ */
+/* $NetBSD: acpi_apm.c,v 1.15 2010/03/05 14:00:16 jruoho Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -35,20 +35,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_apm.c,v 1.14 2008/04/28 20:23:47 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_apm.c,v 1.15 2010/03/05 14:00:16 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/sysctl.h>
-#include <sys/select.h>
-#include <sys/envsys.h>
-#include <dev/sysmon/sysmonvar.h>
+#include <sys/systm.h>
-#include <dev/acpi/acpica.h>
+#include <dev/acpi/acpivar.h>
#include <dev/apm/apmvar.h>
static void acpiapm_disconnect(void *);
diff -r 6aae66619141 -r 544743dcfdd7 sys/dev/acpi/acpi_bat.c
--- a/sys/dev/acpi/acpi_bat.c Fri Mar 05 12:44:16 2010 +0000
+++ b/sys/dev/acpi/acpi_bat.c Fri Mar 05 14:00:16 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_bat.c,v 1.83 2010/02/28 17:22:41 jruoho Exp $ */
+/* $NetBSD: acpi_bat.c,v 1.84 2010/03/05 14:00:16 jruoho Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -75,19 +75,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.83 2010/02/28 17:22:41 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.84 2010/03/05 14:00:16 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h> /* for hz */
+#include <sys/condvar.h>
+#include <sys/device.h>
+#include <sys/kernel.h>
#include <sys/kmem.h>
-#include <sys/device.h>
#include <sys/module.h>
#include <sys/mutex.h>
+#include <sys/systm.h>
-#include <dev/sysmon/sysmonvar.h>
-
-#include <dev/acpi/acpica.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
diff -r 6aae66619141 -r 544743dcfdd7 sys/dev/acpi/acpi_button.c
--- a/sys/dev/acpi/acpi_button.c Fri Mar 05 12:44:16 2010 +0000
+++ b/sys/dev/acpi/acpi_button.c Fri Mar 05 14:00:16 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_button.c,v 1.33 2010/03/04 23:06:36 jruoho Exp $ */
+/* $NetBSD: acpi_button.c,v 1.34 2010/03/05 14:00:16 jruoho Exp $ */
/*
* Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,18 +40,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_button.c,v 1.33 2010/03/04 23:06:36 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_button.c,v 1.34 2010/03/05 14:00:16 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/device.h>
#include <sys/module.h>
+#include <sys/systm.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
-#include <dev/sysmon/sysmonvar.h>
-
#define _COMPONENT ACPI_BUTTON_COMPONENT
ACPI_MODULE_NAME ("acpi_button")
diff -r 6aae66619141 -r 544743dcfdd7 sys/dev/acpi/acpi_ec.c
--- a/sys/dev/acpi/acpi_ec.c Fri Mar 05 12:44:16 2010 +0000
+++ b/sys/dev/acpi/acpi_ec.c Fri Mar 05 14:00:16 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_ec.c,v 1.61 2010/03/02 18:44:46 jruoho Exp $ */
+/* $NetBSD: acpi_ec.c,v 1.62 2010/03/05 14:00:16 jruoho Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger <joerg%NetBSD.org@localhost>.
@@ -59,17 +59,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.61 2010/03/02 18:44:46 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.62 2010/03/05 14:00:16 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/callout.h>
#include <sys/condvar.h>
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/kthread.h>
#include <sys/mutex.h>
-
-#include <sys/bus.h>
+#include <sys/systm.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
diff -r 6aae66619141 -r 544743dcfdd7 sys/dev/acpi/acpi_lid.c
--- a/sys/dev/acpi/acpi_lid.c Fri Mar 05 12:44:16 2010 +0000
+++ b/sys/dev/acpi/acpi_lid.c Fri Mar 05 14:00:16 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_lid.c,v 1.35 2010/02/28 17:22:41 jruoho Exp $ */
+/* $NetBSD: acpi_lid.c,v 1.36 2010/03/05 14:00:16 jruoho Exp $ */
/*
* Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,19 +40,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.35 2010/02/28 17:22:41 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.36 2010/03/05 14:00:16 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/device.h>
#include <sys/module.h>
+#include <sys/systm.h>
-#include <dev/acpi/acpica.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
-#include <dev/sysmon/sysmonvar.h>
-
#define _COMPONENT ACPI_LID_COMPONENT
ACPI_MODULE_NAME ("acpi_lid")
diff -r 6aae66619141 -r 544743dcfdd7 sys/dev/acpi/acpi_madt.c
--- a/sys/dev/acpi/acpi_madt.c Fri Mar 05 12:44:16 2010 +0000
+++ b/sys/dev/acpi/acpi_madt.c Fri Mar 05 14:00:16 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_madt.c,v 1.20 2010/03/02 18:44:47 jruoho Exp $ */
+/* $NetBSD: acpi_madt.c,v 1.21 2010/03/05 14:00:17 jruoho Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,17 +36,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_madt.c,v 1.20 2010/03/02 18:44:47 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_madt.c,v 1.21 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/param.h>
-#include <sys/ioctl.h>
#include <sys/systm.h>
-#include <sys/conf.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
-#include <dev/acpi/acpica.h>
-#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#include <dev/acpi/acpi_madt.h>
diff -r 6aae66619141 -r 544743dcfdd7 sys/dev/acpi/acpi_pci.c
--- a/sys/dev/acpi/acpi_pci.c Fri Mar 05 12:44:16 2010 +0000
+++ b/sys/dev/acpi/acpi_pci.c Fri Mar 05 14:00:16 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_pci.c,v 1.2 2009/12/04 10:42:39 njoly Exp $ */
+/* $NetBSD: acpi_pci.c,v 1.3 2010/03/05 14:00:17 jruoho Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -33,18 +33,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_pci.c,v 1.2 2009/12/04 10:42:39 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pci.c,v 1.3 2010/03/05 14:00:17 jruoho Exp $");
-#include <sys/types.h>
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/device.h>
+#include <sys/kmem.h>
+#include <sys/queue.h>
+#include <sys/systm.h>
-#include <sys/bus.h>
-#include <sys/kmem.h>
-#include <dev/pci/pcivar.h>
-
-#include <dev/acpi/acpica.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#include <dev/acpi/acpi_pci.h>
diff -r 6aae66619141 -r 544743dcfdd7 sys/dev/acpi/acpi_pci_link.c
--- a/sys/dev/acpi/acpi_pci_link.c Fri Mar 05 12:44:16 2010 +0000
+++ b/sys/dev/acpi/acpi_pci_link.c Fri Mar 05 14:00:16 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_pci_link.c,v 1.15 2009/09/16 10:47:54 mlelstv Exp $ */
+/* $NetBSD: acpi_pci_link.c,v 1.16 2010/03/05 14:00:17 jruoho Exp $ */
/*-
Home |
Main Index |
Thread Index |
Old Index