major.h: remove the remaining unnecessary includes of linux/major.h
Now that very file that needs the definitions in major.h explicitly
includes it, this is just cleaning up.
This is fairly safe because major.h does not include any other files.
The only real risk is if a symbol defined in major.h is constructed by
concatenation in the preprocessor.
The actual change was done using the following command:
sed -i -E '/[<"](uapi\/)?linux\/major\.h/d' \
$(grep -L -w -f xx \
$(git grep -E -l '[<"](uapi/)?linux/major\.h'))
Where the file xx contians all the symbols defined in major.h
(genhd.h was added by inspection.)
The win here is really just the number of lines to be parsed by the
preprocessor. major.h is 180 lines long and was being included by
these files unnecessarily. In particular, there are 3 global include
files here (tty.h, genhd.h and blkdev.h) that are also included by 354,
68 and 554 other files, repectively.
After this, major.h is only included by 4 global include files (which
are in turn included by 297 other files), so its indirect inclusion is
hopefully much reduced.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
diff --git a/drivers/android/binderfs.c b/drivers/android/binderfs.c
index 7cf566a..2b91c91 100644
--- a/drivers/android/binderfs.c
+++ b/drivers/android/binderfs.c
@@ -13,7 +13,6 @@
#include <linux/list.h>
#include <linux/namei.h>
#include <linux/magic.h>
-#include <linux/major.h>
#include <linux/miscdevice.h>
#include <linux/module.h>
#include <linux/mutex.h>
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index 33d0831..e4794f6 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -24,7 +24,6 @@
#include <linux/ratelimit.h>
#include <linux/tcp.h>
#include <linux/mutex.h>
-#include <linux/major.h>
#include <linux/blkdev.h>
#include <linux/backing-dev.h>
#include <linux/genhd.h>
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index 2eee5e3..e0094bc 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -21,7 +21,6 @@
#include <linux/cdev.h>
#include <linux/poll.h>
#include <linux/device.h>
-#include <linux/major.h>
#include <linux/slab.h>
#include <linux/hid.h>
#include <linux/mutex.h>
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
index e9647eb..c863fc9 100644
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
@@ -12,7 +12,6 @@
#include <linux/poll.h>
#include <linux/module.h>
#include <linux/serio.h>
-#include <linux/major.h>
#include <linux/device.h>
#include <linux/miscdevice.h>
#include <linux/wait.h>
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index 85767f5..21b537e 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -13,7 +13,6 @@
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/kernel.h>
-#include <linux/major.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/fcntl.h>
diff --git a/drivers/mmc/host/android-goldfish.c b/drivers/mmc/host/android-goldfish.c
index ceb4924..d67eb29 100644
--- a/drivers/mmc/host/android-goldfish.c
+++ b/drivers/mmc/host/android-goldfish.c
@@ -12,7 +12,6 @@
#include <linux/module.h>
#include <linux/platform_device.h>
-#include <linux/major.h>
#include <linux/types.h>
#include <linux/pci.h>
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c
index 8e7e3ac..7fa5ddc 100644
--- a/drivers/parport/parport_cs.c
+++ b/drivers/parport/parport_cs.c
@@ -42,7 +42,6 @@
#include <linux/string.h>
#include <linux/timer.h>
#include <linux/ioport.h>
-#include <linux/major.h>
#include <linux/interrupt.h>
#include <linux/parport.h>
diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c
index cf109d9..86f24ff 100644
--- a/drivers/pcmcia/cistpl.c
+++ b/drivers/pcmcia/cistpl.c
@@ -13,7 +13,6 @@
#include <linux/moduleparam.h>
#include <linux/kernel.h>
#include <linux/string.h>
-#include <linux/major.h>
#include <linux/errno.h>
#include <linux/timer.h>
#include <linux/slab.h>
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index e211e26..fd59a68 100644
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -14,7 +14,6 @@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/string.h>
-#include <linux/major.h>
#include <linux/errno.h>
#include <linux/slab.h>
#include <linux/mm.h>
diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c
index d1b220a..47eb78b 100644
--- a/drivers/pcmcia/socket_sysfs.c
+++ b/drivers/pcmcia/socket_sysfs.c
@@ -10,7 +10,6 @@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/string.h>
-#include <linux/major.h>
#include <linux/errno.h>
#include <linux/mm.h>
#include <linux/interrupt.h>
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index fad936e..8d08fff 100644
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -10,7 +10,6 @@
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/errno.h>
-#include <linux/major.h>
#include <linux/miscdevice.h>
#include <linux/ioport.h> /* request_region */
#include <linux/slab.h>
diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c
index 808eeb4..b7a7a53 100644
--- a/drivers/watchdog/cpwd.c
+++ b/drivers/watchdog/cpwd.c
@@ -21,7 +21,6 @@
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/errno.h>
-#include <linux/major.h>
#include <linux/miscdevice.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c
index 6e0b1dd..054f13c 100644
--- a/drivers/xen/evtchn.c
+++ b/drivers/xen/evtchn.c
@@ -41,7 +41,6 @@
#include <linux/errno.h>
#include <linux/fs.h>
#include <linux/miscdevice.h>
-#include <linux/major.h>
#include <linux/proc_fs.h>
#include <linux/stat.h>
#include <linux/poll.h>
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 0ae656e..943bdbb 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -11,7 +11,6 @@
#include <linux/fcntl.h>
#include <linux/slab.h>
#include <linux/kmod.h>
-#include <linux/major.h>
#include <linux/device_cgroup.h>
#include <linux/highmem.h>
#include <linux/blkdev.h>
diff --git a/fs/char_dev.c b/fs/char_dev.c
index ba0ded7..cc64579 100644
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -11,7 +11,6 @@
#include <linux/slab.h>
#include <linux/string.h>
-#include <linux/major.h>
#include <linux/errno.h>
#include <linux/module.h>
#include <linux/seq_file.h>
diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
index 240669f..1125bcb 100644
--- a/fs/coda/psdev.c
+++ b/fs/coda/psdev.c
@@ -16,7 +16,6 @@
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/kernel.h>
-#include <linux/major.h>
#include <linux/time.h>
#include <linux/sched/signal.h>
#include <linux/slab.h>
diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
index 9f70d2f..7bb9fb4 100644
--- a/fs/xfs/xfs_linux.h
+++ b/fs/xfs/xfs_linux.h
@@ -38,7 +38,6 @@
#include <linux/errno.h>
#include <linux/sched/signal.h>
#include <linux/bitops.h>
-#include <linux/major.h>
#include <linux/pagemap.h>
#include <linux/vfs.h>
#include <linux/seq_file.h>
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 8fd9009..0edac52 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -7,7 +7,6 @@
#ifdef CONFIG_BLOCK
-#include <linux/major.h>
#include <linux/genhd.h>
#include <linux/list.h>
#include <linux/llist.h>
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 392aad5..cf2fe7f 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -32,7 +32,6 @@
#define DISK_MAX_PARTS 256
#define DISK_NAME_LEN 32
-#include <linux/major.h>
#include <linux/device.h>
#include <linux/smp.h>
#include <linux/string.h>
diff --git a/include/linux/tty.h b/include/linux/tty.h
index a99e9b8..f2de776 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -3,7 +3,6 @@
#define _LINUX_TTY_H
#include <linux/fs.h>
-#include <linux/major.h>
#include <linux/termios.h>
#include <linux/workqueue.h>
#include <linux/tty_driver.h>
diff --git a/init/do_mounts.h b/init/do_mounts.h
index 0bb0806..10f7d73 100644
--- a/init/do_mounts.h
+++ b/init/do_mounts.h
@@ -6,7 +6,6 @@
#include <linux/unistd.h>
#include <linux/slab.h>
#include <linux/mount.h>
-#include <linux/major.h>
#include <linux/root_dev.h>
void change_floppy(char *fmt, ...);
diff --git a/kernel/bpf/inode.c b/kernel/bpf/inode.c
index fb878ba..863af19 100644
--- a/kernel/bpf/inode.c
+++ b/kernel/bpf/inode.c
@@ -10,7 +10,6 @@
#include <linux/init.h>
#include <linux/magic.h>
-#include <linux/major.h>
#include <linux/mount.h>
#include <linux/namei.h>
#include <linux/fs.h>
diff --git a/tools/hv/hv_vss_daemon.c b/tools/hv/hv_vss_daemon.c
index dd11187..6795b07 100644
--- a/tools/hv/hv_vss_daemon.c
+++ b/tools/hv/hv_vss_daemon.c
@@ -21,7 +21,6 @@
#include <ctype.h>
#include <errno.h>
#include <linux/fs.h>
-#include <linux/major.h>
#include <linux/hyperv.h>
#include <syslog.h>
#include <getopt.h>
