From a4cc21c9c60d3582bf5d90465f353eaea035ccd3 Mon Sep 17 00:00:00 2001
From: Martin Pieuchot <mpi@cvs.openbsd.org>
Date: Wed, 26 Mar 2014 14:41:42 +0000
Subject: No need to include <sys/lock.h> when only <sys/rwlock.h> is needed,
 so remove the former and include the latter instead of pulling it in
 <dev/pci/agpvar.h>.  This header already requires various other types anyway.
  While here remove unneeded headers.

---
 sys/arch/amd64/pci/agp_machdep.c  | 4 ++--
 sys/arch/amd64/pci/pchb.c         | 3 ++-
 sys/arch/i386/pci/agp_machdep.c   | 4 ++--
 sys/arch/i386/pci/pchb.c          | 3 ++-
 sys/arch/macppc/pci/agp_machdep.c | 8 ++------
 sys/arch/macppc/pci/pchb.c        | 3 ++-
 6 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'sys/arch')

diff --git a/sys/arch/amd64/pci/agp_machdep.c b/sys/arch/amd64/pci/agp_machdep.c
index 6d3abfa49e6..0183fb89bf6 100644
--- a/sys/arch/amd64/pci/agp_machdep.c
+++ b/sys/arch/amd64/pci/agp_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agp_machdep.c,v 1.9 2013/12/09 19:52:11 kettenis Exp $	*/
+/*	$OpenBSD: agp_machdep.c,v 1.10 2014/03/26 14:41:41 mpi Exp $	*/
 
 /*
  * Copyright (c) 2008 - 2009 Owain G. Ainsworth <oga@openbsd.org>
@@ -43,8 +43,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/device.h>
 #include <sys/malloc.h>
+#include <sys/rwlock.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git a/sys/arch/amd64/pci/pchb.c b/sys/arch/amd64/pci/pchb.c
index e1967a4e681..4549c6b085f 100644
--- a/sys/arch/amd64/pci/pchb.c
+++ b/sys/arch/amd64/pci/pchb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pchb.c,v 1.40 2013/12/06 21:03:05 deraadt Exp $	*/
+/*	$OpenBSD: pchb.c,v 1.41 2014/03/26 14:41:41 mpi Exp $	*/
 /*	$NetBSD: pchb.c,v 1.1 2003/04/26 18:39:50 fvdl Exp $	*/
 /*
  * Copyright (c) 2000 Michael Shalayeff
@@ -58,6 +58,7 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/timeout.h>
+#include <sys/rwlock.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/i386/pci/agp_machdep.c b/sys/arch/i386/pci/agp_machdep.c
index 259d652627c..4ad2510e4a7 100644
--- a/sys/arch/i386/pci/agp_machdep.c
+++ b/sys/arch/i386/pci/agp_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agp_machdep.c,v 1.15 2013/12/09 19:52:11 kettenis Exp $	*/
+/*	$OpenBSD: agp_machdep.c,v 1.16 2014/03/26 14:41:41 mpi Exp $	*/
 
 /*
  * Copyright (c) 2008 - 2009 Owain G. Ainsworth <oga@openbsd.org>
@@ -43,8 +43,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/device.h>
 #include <sys/malloc.h>
+#include <sys/rwlock.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git a/sys/arch/i386/pci/pchb.c b/sys/arch/i386/pci/pchb.c
index 525a6e3ca58..6d2b1e54d8a 100644
--- a/sys/arch/i386/pci/pchb.c
+++ b/sys/arch/i386/pci/pchb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pchb.c,v 1.88 2013/12/06 21:03:05 deraadt Exp $ */
+/*	$OpenBSD: pchb.c,v 1.89 2014/03/26 14:41:41 mpi Exp $ */
 /*	$NetBSD: pchb.c,v 1.65 2007/08/15 02:26:13 markd Exp $	*/
 
 /*
@@ -59,6 +59,7 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/timeout.h>
+#include <sys/rwlock.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/macppc/pci/agp_machdep.c b/sys/arch/macppc/pci/agp_machdep.c
index 718d42da4e4..17b60e12b99 100644
--- a/sys/arch/macppc/pci/agp_machdep.c
+++ b/sys/arch/macppc/pci/agp_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agp_machdep.c,v 1.1 2012/12/04 10:42:05 mpi Exp $	*/
+/*	$OpenBSD: agp_machdep.c,v 1.2 2014/03/26 14:41:41 mpi Exp $	*/
 
 /*
  * Copyright (c) 2012 Martin Pieuchot <mpi@openbsd.org>
@@ -18,13 +18,9 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/rwlock.h>
 
 #include <dev/pci/pcivar.h>
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcidevs.h>
-
 #include <dev/pci/agpvar.h>
 
 void
diff --git a/sys/arch/macppc/pci/pchb.c b/sys/arch/macppc/pci/pchb.c
index 94e601a743f..5a8e9632656 100644
--- a/sys/arch/macppc/pci/pchb.c
+++ b/sys/arch/macppc/pci/pchb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pchb.c,v 1.13 2012/12/22 19:07:50 mpi Exp $	*/
+/*	$OpenBSD: pchb.c,v 1.14 2014/03/26 14:41:41 mpi Exp $	*/
 /*	$NetBSD: pchb.c,v 1.4 2000/01/25 07:19:11 tsubai Exp $	*/
 
 /*-
@@ -34,6 +34,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
+#include <sys/rwlock.h>
 
 #include <machine/bus.h>
 
-- 
cgit v1.2.3