Module Name: src
Committed By: jruoho
Date: Sat Jun 5 06:07:12 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi.c acpi_verbose.c acpivar.h
src/sys/dev/acpi/wmi: wmi_acpivar.h
Log Message:
Remove trailing white space.
To generate a diff of this commit:
cvs rdiff -u -r1.197 -r1.198 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/acpi/acpi_verbose.c
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/acpi/acpivar.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/acpi/wmi/wmi_acpivar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.197 src/sys/dev/acpi/acpi.c:1.198
--- src/sys/dev/acpi/acpi.c:1.197 Mon May 31 20:32:29 2010
+++ src/sys/dev/acpi/acpi.c Sat Jun 5 06:07:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.197 2010/05/31 20:32:29 pgoyette Exp $ */
+/* $NetBSD: acpi.c,v 1.198 2010/06/05 06:07:12 jruoho Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.197 2010/05/31 20:32:29 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.198 2010/06/05 06:07:12 jruoho Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
@@ -222,19 +222,19 @@
acpi_verbose_ctl(bool load)
{
static int loaded = 0;
-
- if (load) {
+
+ if (load) {
if (loaded++ == 0)
if (module_load("acpiverbose", MODCTL_LOAD_FORCE,
NULL, MODULE_CLASS_MISC) != 0)
loaded = 0;
return;
}
- if (loaded == 0)
+ if (loaded == 0)
return;
if (--loaded == 0)
module_unload("acpiverbose");
-}
+}
CFATTACH_DECL2_NEW(acpi, sizeof(struct acpi_softc),
Index: src/sys/dev/acpi/acpi_verbose.c
diff -u src/sys/dev/acpi/acpi_verbose.c:1.1 src/sys/dev/acpi/acpi_verbose.c:1.2
--- src/sys/dev/acpi/acpi_verbose.c:1.1 Mon May 31 20:32:29 2010
+++ src/sys/dev/acpi/acpi_verbose.c Sat Jun 5 06:07:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_verbose.c,v 1.1 2010/05/31 20:32:29 pgoyette Exp $ */
+/* $NetBSD: acpi_verbose.c,v 1.2 2010/06/05 06:07:12 jruoho Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_verbose.c,v 1.1 2010/05/31 20:32:29 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_verbose.c,v 1.2 2010/06/05 06:07:12 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -81,10 +81,10 @@
void acpi_print_tree_real(struct acpi_devnode *, uint32_t);
void acpi_print_dev_real(const char *);
-MODULE(MODULE_CLASS_MISC, acpiverbose, NULL);
+MODULE(MODULE_CLASS_MISC, acpiverbose, NULL);
__weak_alias(acpi_wmidump_real, acpi_null);
-
+
static int
acpiverbose_modcmd(modcmd_t cmd, void *arg)
{
Index: src/sys/dev/acpi/acpivar.h
diff -u src/sys/dev/acpi/acpivar.h:1.54 src/sys/dev/acpi/acpivar.h:1.55
--- src/sys/dev/acpi/acpivar.h:1.54 Mon May 31 20:32:29 2010
+++ src/sys/dev/acpi/acpivar.h Sat Jun 5 06:07:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpivar.h,v 1.54 2010/05/31 20:32:29 pgoyette Exp $ */
+/* $NetBSD: acpivar.h,v 1.55 2010/06/05 06:07:12 jruoho Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -321,12 +321,11 @@
/* Misc routines with vectors updated by acpiverbose module */
extern void (*acpi_print_devnodes)(struct acpi_softc *);
-extern void (*acpi_print_tree)(struct acpi_devnode *, uint32_t);
+extern void (*acpi_print_tree)(struct acpi_devnode *, uint32_t);
extern void (*acpi_print_dev)(const char *);
extern void (*acpi_wmidump)(void *);
void acpi_wmidump_real(void *);
-
-void acpi_null(void);
+void acpi_null(void);
#endif /* !_SYS_DEV_ACPI_ACPIVAR_H */
Index: src/sys/dev/acpi/wmi/wmi_acpivar.h
diff -u src/sys/dev/acpi/wmi/wmi_acpivar.h:1.3 src/sys/dev/acpi/wmi/wmi_acpivar.h:1.4
--- src/sys/dev/acpi/wmi/wmi_acpivar.h:1.3 Mon May 31 20:32:29 2010
+++ src/sys/dev/acpi/wmi/wmi_acpivar.h Sat Jun 5 06:07:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wmi_acpivar.h,v 1.3 2010/05/31 20:32:29 pgoyette Exp $ */
+/* $NetBSD: wmi_acpivar.h,v 1.4 2010/06/05 06:07:12 jruoho Exp $ */
/*-
* Copyright (c) 2009, 2010 Jukka Ruohonen <jruoho...@iki.fi>
@@ -31,7 +31,7 @@
#define _SYS_DEV_ACPI_WMI_WMI_ACPIVAR_H
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wmi_acpivar.h,v 1.3 2010/05/31 20:32:29 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wmi_acpivar.h,v 1.4 2010/06/05 06:07:12 jruoho Exp $");
ACPI_STATUS acpi_wmi_event_register(device_t, ACPI_NOTIFY_HANDLER);
ACPI_STATUS acpi_wmi_event_deregister(device_t);
@@ -94,10 +94,10 @@
device_t sc_dev;
device_t sc_child;
ACPI_NOTIFY_HANDLER sc_handler;
- struct acpi_devnode *sc_node;
-
+ struct acpi_devnode *sc_node;
+
SIMPLEQ_HEAD(, wmi_t) wmi_head;
-};
+};
#define UGET16(x) (*(uint16_t *)(x))
#define UGET64(x) (*(uint64_t *)(x))
@@ -105,7 +105,7 @@
#define HEXCHAR(x) (((x) >= '0' && (x) <= '9') || \
((x) >= 'a' && (x) <= 'f') || \
((x) >= 'A' && (x) <= 'F'))
-
+
#define GUIDCMP(a, b) \
((a)->data1 == (b)->data1 && \
(a)->data2 == (b)->data2 && \
