From 53e1df33f471414eef47a4c645f6878fc612cde4 Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Tue, 21 Mar 2023 09:44:35 +0000
Subject: [PATCH] remove uneeded includes

---
 sys/dev/pci/drm/include/linux/device.h     |  1 -
 sys/dev/pci/drm/include/linux/fs.h         |  1 +
 sys/dev/pci/drm/include/linux/ftrace.h     |  1 +
 sys/dev/pci/drm/include/linux/hrtimer.h    |  1 -
 sys/dev/pci/drm/include/linux/i2c.h        | 13 +++++++++++--
 sys/dev/pci/drm/include/linux/interrupt.h  |  3 ++-
 sys/dev/pci/drm/include/linux/io-mapping.h |  2 --
 sys/dev/pci/drm/include/linux/io.h         |  2 +-
 sys/dev/pci/drm/include/linux/kgdb.h       |  1 +
 sys/dev/pci/drm/include/linux/kref.h       |  5 +----
 sys/dev/pci/drm/include/linux/mm.h         |  4 ++--
 sys/dev/pci/drm/include/linux/perf_event.h |  1 +
 sys/dev/pci/drm/include/linux/sched.h      |  3 +--
 sys/dev/pci/drm/include/linux/seq_file.h   |  1 +
 sys/dev/pci/drm/include/linux/swap.h       |  3 +--
 sys/dev/pci/drm/include/linux/vmalloc.h    |  3 +--
 sys/dev/pci/drm/include/linux/workqueue.h  |  3 +--
 sys/dev/pci/drm/include/linux/ww_mutex.h   |  1 -
 18 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/sys/dev/pci/drm/include/linux/device.h b/sys/dev/pci/drm/include/linux/device.h
index ffde1c39ea4..df113736d09 100644
--- a/sys/dev/pci/drm/include/linux/device.h
+++ b/sys/dev/pci/drm/include/linux/device.h
@@ -8,7 +8,6 @@
 #include <sys/device.h>
 #include <sys/param.h>
 #include <sys/proc.h>
-#include <linux/slab.h>
 #include <linux/ioport.h>
 #include <linux/lockdep.h>
 #include <linux/pm.h>
diff --git a/sys/dev/pci/drm/include/linux/fs.h b/sys/dev/pci/drm/include/linux/fs.h
index c966c878c99..7f80d4c4765 100644
--- a/sys/dev/pci/drm/include/linux/fs.h
+++ b/sys/dev/pci/drm/include/linux/fs.h
@@ -14,6 +14,7 @@
 #include <linux/wait_bit.h>
 #include <linux/err.h>
 #include <linux/sched/signal.h>	/* via percpu-rwsem.h -> rcuwait.h */
+#include <linux/slab.h>
 
 struct address_space;
 struct seq_file;
diff --git a/sys/dev/pci/drm/include/linux/ftrace.h b/sys/dev/pci/drm/include/linux/ftrace.h
index 5b3eb2c4bd0..76e4658cc00 100644
--- a/sys/dev/pci/drm/include/linux/ftrace.h
+++ b/sys/dev/pci/drm/include/linux/ftrace.h
@@ -5,5 +5,6 @@
 
 #include <linux/kallsyms.h>
 #include <linux/interrupt.h> /* via trace_recursion.h */
+#include <linux/fs.h>
 
 #endif
diff --git a/sys/dev/pci/drm/include/linux/hrtimer.h b/sys/dev/pci/drm/include/linux/hrtimer.h
index 6ed5db41816..075542fef24 100644
--- a/sys/dev/pci/drm/include/linux/hrtimer.h
+++ b/sys/dev/pci/drm/include/linux/hrtimer.h
@@ -5,7 +5,6 @@
 
 #include <sys/types.h>
 #include <sys/timeout.h>
-#include <linux/ktime.h>
 #include <linux/rbtree.h>
 
 enum hrtimer_restart { HRTIMER_NORESTART, HRTIMER_RESTART };
diff --git a/sys/dev/pci/drm/include/linux/i2c.h b/sys/dev/pci/drm/include/linux/i2c.h
index eb935526d4c..85231c0cf4e 100644
--- a/sys/dev/pci/drm/include/linux/i2c.h
+++ b/sys/dev/pci/drm/include/linux/i2c.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i2c.h,v 1.7 2023/01/01 01:34:58 jsg Exp $	*/
+/*	$OpenBSD: i2c.h,v 1.8 2023/03/21 09:44:35 jsg Exp $	*/
 /*
  * Copyright (c) 2017 Mark Kettenis
  *
@@ -20,7 +20,16 @@
 
 #include <sys/stdint.h>
 #include <sys/rwlock.h>
-#include <linux/workqueue.h>
+/*
+ * normally seq_file.h is indirectly included via
+ *
+ * linux/regulator/consumer.h
+ * linux/suspend.h
+ * linux/swap.h
+ * linux/memcontrol.h
+ * linux/cgroup.h
+ * linux/seq_file.h
+ */
 #include <linux/seq_file.h>
 #include <linux/acpi.h>
 #include <linux/device.h>
diff --git a/sys/dev/pci/drm/include/linux/interrupt.h b/sys/dev/pci/drm/include/linux/interrupt.h
index 7f34b45ffb7..b555183c9b2 100644
--- a/sys/dev/pci/drm/include/linux/interrupt.h
+++ b/sys/dev/pci/drm/include/linux/interrupt.h
@@ -9,9 +9,10 @@
 #include <linux/hardirq.h>
 #include <linux/irqflags.h>
 #include <linux/atomic.h>
-#include <linux/compiler.h>
 #include <linux/irqreturn.h>
 
+struct seq_file;
+
 #define IRQF_SHARED	0
 
 #define request_irq(irq, hdlr, flags, name, dev)	(0)
diff --git a/sys/dev/pci/drm/include/linux/io-mapping.h b/sys/dev/pci/drm/include/linux/io-mapping.h
index c42fe81773e..7a49ffef9da 100644
--- a/sys/dev/pci/drm/include/linux/io-mapping.h
+++ b/sys/dev/pci/drm/include/linux/io-mapping.h
@@ -3,6 +3,4 @@
 #ifndef _LINUX_IO_MAPPING_H
 #define _LINUX_IO_MAPPING_H
 
-#include <linux/bitmap.h>
-
 #endif
diff --git a/sys/dev/pci/drm/include/linux/io.h b/sys/dev/pci/drm/include/linux/io.h
index 51f088f2825..08e20aa0cd2 100644
--- a/sys/dev/pci/drm/include/linux/io.h
+++ b/sys/dev/pci/drm/include/linux/io.h
@@ -10,7 +10,7 @@
 #include <linux/types.h>
 #include <linux/atomic.h>
 #include <linux/compiler.h>
-#include <linux/vmalloc.h>
+#include <linux/vmalloc.h> /* via asm/io.h */
 
 #define memcpy_toio(d, s, n)	memcpy(d, s, n)
 #define memcpy_fromio(d, s, n)	memcpy(d, s, n)
diff --git a/sys/dev/pci/drm/include/linux/kgdb.h b/sys/dev/pci/drm/include/linux/kgdb.h
index 86dee85a2f0..c5bc969b499 100644
--- a/sys/dev/pci/drm/include/linux/kgdb.h
+++ b/sys/dev/pci/drm/include/linux/kgdb.h
@@ -5,6 +5,7 @@
 
 #include <sys/types.h>
 #include <sys/systm.h>
+#include <linux/ftrace.h> /* via linux/kprobes.h */
 
 static inline int
 in_dbg_master(void)
diff --git a/sys/dev/pci/drm/include/linux/kref.h b/sys/dev/pci/drm/include/linux/kref.h
index 11a4027b8d9..93562385b7b 100644
--- a/sys/dev/pci/drm/include/linux/kref.h
+++ b/sys/dev/pci/drm/include/linux/kref.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kref.h,v 1.5 2023/01/01 01:34:58 jsg Exp $	*/
+/*	$OpenBSD: kref.h,v 1.6 2023/03/21 09:44:35 jsg Exp $	*/
 /*
  * Copyright (c) 2015 Mark Kettenis
  *
@@ -20,9 +20,6 @@
 
 #include <sys/types.h>
 #include <sys/rwlock.h>
-#include <sys/atomic.h>
-#include <linux/atomic.h>
-#include <linux/compiler.h>
 #include <linux/refcount.h>
 #include <linux/spinlock.h>
 
diff --git a/sys/dev/pci/drm/include/linux/mm.h b/sys/dev/pci/drm/include/linux/mm.h
index 13e902619bb..6496a210cd6 100644
--- a/sys/dev/pci/drm/include/linux/mm.h
+++ b/sys/dev/pci/drm/include/linux/mm.h
@@ -11,10 +11,10 @@
 #include <machine/cpu.h>
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_glue.h>
-#include <linux/fs.h>
+#include <lib/libkern/libkern.h> /* for flsl */
 #include <linux/shrinker.h>
 #include <linux/overflow.h>
-#include <asm/pgtable.h>
+#include <linux/pgtable.h>
 
 #define PageHighMem(x)	0
 
diff --git a/sys/dev/pci/drm/include/linux/perf_event.h b/sys/dev/pci/drm/include/linux/perf_event.h
index bf2790021f2..3d8c178f660 100644
--- a/sys/dev/pci/drm/include/linux/perf_event.h
+++ b/sys/dev/pci/drm/include/linux/perf_event.h
@@ -5,6 +5,7 @@
 
 #include <linux/ftrace.h>
 #include <linux/file.h> /* via security.h -> kernel_read_file.h */
+#include <linux/seq_file.h> /* via linux/cgroup.h */
 
 struct pmu {
 };
diff --git a/sys/dev/pci/drm/include/linux/sched.h b/sys/dev/pci/drm/include/linux/sched.h
index 8f5406f1690..b0c6adfd3b1 100644
--- a/sys/dev/pci/drm/include/linux/sched.h
+++ b/sys/dev/pci/drm/include/linux/sched.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sched.h,v 1.4 2021/07/07 02:38:36 jsg Exp $	*/
+/*	$OpenBSD: sched.h,v 1.5 2023/03/21 09:44:35 jsg Exp $	*/
 /*
  * Copyright (c) 2013, 2014, 2015 Mark Kettenis
  *
@@ -23,7 +23,6 @@
 #include <sys/kernel.h>
 #include <sys/stdint.h>
 #include <sys/mutex.h>
-#include <linux/wait.h>
 #include <linux/hrtimer.h>
 #include <linux/sem.h>
 
diff --git a/sys/dev/pci/drm/include/linux/seq_file.h b/sys/dev/pci/drm/include/linux/seq_file.h
index 4b5d3b10a34..08f32de0886 100644
--- a/sys/dev/pci/drm/include/linux/seq_file.h
+++ b/sys/dev/pci/drm/include/linux/seq_file.h
@@ -5,6 +5,7 @@
 
 #include <linux/bug.h>
 #include <linux/string.h>
+#include <linux/fs.h>
 
 struct seq_file {
 };
diff --git a/sys/dev/pci/drm/include/linux/swap.h b/sys/dev/pci/drm/include/linux/swap.h
index 599b5b76884..dcfb9c9d17b 100644
--- a/sys/dev/pci/drm/include/linux/swap.h
+++ b/sys/dev/pci/drm/include/linux/swap.h
@@ -6,7 +6,6 @@
 /*
  * normally clock.h would be indirectly included via
  *
- * linux/swap.h
  * linux/memcontrol.h
  * linux/writeback.h
  * linux/blk-cgroup.h
@@ -17,7 +16,7 @@
 
 /*
  * normally module.h would be indirectly included via
- * linux/swap.h
+ *
  * linux/memcontrol.h
  * linux/cgroup.h
  * linux/cgroup-defs.h
diff --git a/sys/dev/pci/drm/include/linux/vmalloc.h b/sys/dev/pci/drm/include/linux/vmalloc.h
index 073aa7c7d63..d60ea4e7d0f 100644
--- a/sys/dev/pci/drm/include/linux/vmalloc.h
+++ b/sys/dev/pci/drm/include/linux/vmalloc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmalloc.h,v 1.4 2021/07/07 02:38:36 jsg Exp $	*/
+/*	$OpenBSD: vmalloc.h,v 1.5 2023/03/21 09:44:35 jsg Exp $	*/
 /*
  * Copyright (c) 2013, 2014, 2015 Mark Kettenis
  *
@@ -21,7 +21,6 @@
 #include <sys/types.h>
 #include <sys/malloc.h>
 #include <uvm/uvm_extern.h>
-#include <linux/types.h>
 #include <linux/overflow.h>
 
 void	*vmap(struct vm_page **, unsigned int, unsigned long, pgprot_t);
diff --git a/sys/dev/pci/drm/include/linux/workqueue.h b/sys/dev/pci/drm/include/linux/workqueue.h
index 38fdbffc5b4..05cccf5265b 100644
--- a/sys/dev/pci/drm/include/linux/workqueue.h
+++ b/sys/dev/pci/drm/include/linux/workqueue.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: workqueue.h,v 1.9 2023/01/01 01:34:58 jsg Exp $	*/
+/*	$OpenBSD: workqueue.h,v 1.10 2023/03/21 09:44:35 jsg Exp $	*/
 /*
  * Copyright (c) 2015 Mark Kettenis
  *
@@ -25,7 +25,6 @@
 #include <linux/bitops.h>
 #include <linux/atomic.h>
 #include <linux/rcupdate.h>
-#include <linux/kernel.h>
 #include <linux/lockdep.h>
 #include <linux/timer.h>
 
diff --git a/sys/dev/pci/drm/include/linux/ww_mutex.h b/sys/dev/pci/drm/include/linux/ww_mutex.h
index 34a7f415510..d2b9b3834e4 100644
--- a/sys/dev/pci/drm/include/linux/ww_mutex.h
+++ b/sys/dev/pci/drm/include/linux/ww_mutex.h
@@ -39,7 +39,6 @@
 #include <sys/param.h>
 #include <sys/mutex.h>
 #include <machine/intr.h>
-#include <linux/compiler.h>
 #include <linux/mutex.h>
 
 struct ww_class {
-- 
2.20.1