PCI/MSI: Move code into a separate directory

msi.c is getting larger and really could do with a splitup. Move it into
its own directory to prepare for that.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/r/20211206210224.655043033@linutronix.de

diff --git a/Documentation/driver-api/pci/pci.rst b/Documentation/driver-api/pci/pci.rst
index ca85e5e78b2c439b3279fbe797b67eeaea84b141..4843cfad4f60bb43a189fbe0da135b9241c4bff3 100644 (file)
--- a/Documentation/driver-api/pci/pci.rst
+++ b/Documentation/driver-api/pci/pci.rst
@@ -13,7 +13,7 @@ PCI Support Library
 .. kernel-doc:: drivers/pci/search.c
    :export:
 
-.. kernel-doc:: drivers/pci/msi.c
+.. kernel-doc:: drivers/pci/msi/msi.c
    :export:
 
 .. kernel-doc:: drivers/pci/bus.c

diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index d62c4ac4ae1b3553eec9c582030ebb0b2fcae788..37be95adf169020b70100b43b65775d09cd0b16d 100644 (file)
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -5,8 +5,9 @@
 obj-$(CONFIG_PCI)              += access.o bus.o probe.o host-bridge.o \
                                   remove.o pci.o pci-driver.o search.o \
                                   pci-sysfs.o rom.o setup-res.o irq.o vpd.o \
-                                  setup-bus.o vc.o mmap.o setup-irq.o msi.o
+                                  setup-bus.o vc.o mmap.o setup-irq.o
 
+obj-$(CONFIG_PCI)              += msi/
 obj-$(CONFIG_PCI)              += pcie/
 
 ifdef CONFIG_PCI

diff --git a/drivers/pci/msi/Makefile b/drivers/pci/msi/Makefile
new file mode 100644 (file)
index 0000000..79a6013
--- /dev/null
+++ b/drivers/pci/msi/Makefile
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for the PCI/MSI
+obj-$(CONFIG_PCI)              += msi.o

diff --git a/drivers/pci/msi.c b/drivers/pci/msi/msi.c
similarity index 99%
rename from drivers/pci/msi.c
rename to drivers/pci/msi/msi.c
index 15730910b3cb853e0a689723d8ce9886d3597d85..00233b0b3e9202b8cbbc64537f72615998c1300b 100644 (file)
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi/msi.c
@@ -16,7 +16,7 @@
 #include <linux/of_irq.h>
 #include <linux/pci.h>
 
-#include "pci.h"
+#include "../pci.h"
 
 #ifdef CONFIG_PCI_MSI