| Message ID | 20210715194125.898305-2-ben.widawsky@intel.com |
|---|---|
| State | New, archived |
| Headers | show |
| Series | CXL core reorganization | expand |
On Thu, Jul 15, 2021 at 12:41 PM Ben Widawsky <ben.widawsky@intel.com> wrote: > > CXL core is growing, and it's already arguably unmanageable. To support > future growth, move core functionality to a new directory and rename the > file to represent just bus support. Future work will remove non-bus > functionality. > I think this effort wants a drivers/cxl/core/Makefile, more below: > Signed-off-by: Ben Widawsky <ben.widawsky@intel.com> > --- > Documentation/driver-api/cxl/memory-devices.rst | 2 +- > drivers/cxl/Makefile | 2 +- > drivers/cxl/{core.c => core/bus.c} | 4 ++-- > 3 files changed, 4 insertions(+), 4 deletions(-) > rename drivers/cxl/{core.c => core/bus.c} (99%) > > diff --git a/Documentation/driver-api/cxl/memory-devices.rst b/Documentation/driver-api/cxl/memory-devices.rst > index 487ce4f41d77..a86e2c7c551a 100644 > --- a/Documentation/driver-api/cxl/memory-devices.rst > +++ b/Documentation/driver-api/cxl/memory-devices.rst > @@ -36,7 +36,7 @@ CXL Core > .. kernel-doc:: drivers/cxl/cxl.h > :internal: > > -.. kernel-doc:: drivers/cxl/core.c > +.. kernel-doc:: drivers/cxl/core/bus.c > :doc: cxl core > > External Interfaces > diff --git a/drivers/cxl/Makefile b/drivers/cxl/Makefile > index 32954059b37b..ad5a4f8f4511 100644 > --- a/drivers/cxl/Makefile > +++ b/drivers/cxl/Makefile > @@ -5,7 +5,7 @@ obj-$(CONFIG_CXL_ACPI) += cxl_acpi.o > obj-$(CONFIG_CXL_PMEM) += cxl_pmem.o > > ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=CXL Only the core has exports so this is not relevant for the drivers (pci, acpi, pmem...) > -cxl_core-y := core.o > +cxl_core-y := core/bus.o Not typical to include directory names in Makefiles. > cxl_pci-y := pci.o > cxl_acpi-y := acpi.o > cxl_pmem-y := pmem.o > diff --git a/drivers/cxl/core.c b/drivers/cxl/core/bus.c > similarity index 99% > rename from drivers/cxl/core.c > rename to drivers/cxl/core/bus.c > index a2e4d54fc7bc..00b759ff92d3 100644 > --- a/drivers/cxl/core.c > +++ b/drivers/cxl/core/bus.c > @@ -6,8 +6,8 @@ > #include <linux/pci.h> > #include <linux/slab.h> > #include <linux/idr.h> > -#include "cxl.h" > -#include "mem.h" > +#include "../cxl.h" > +#include "../mem.h" I'd prefer <cxl.h> and <mem.h>. Proposed changes to fold: diff --git a/drivers/cxl/Makefile b/drivers/cxl/Makefile index ad5a4f8f4511..d1aaabc940f3 100644 --- a/drivers/cxl/Makefile +++ b/drivers/cxl/Makefile @@ -1,11 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_CXL_BUS) += cxl_core.o +obj-$(CONFIG_CXL_BUS) += core/ obj-$(CONFIG_CXL_MEM) += cxl_pci.o obj-$(CONFIG_CXL_ACPI) += cxl_acpi.o obj-$(CONFIG_CXL_PMEM) += cxl_pmem.o -ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=CXL -cxl_core-y := core/bus.o cxl_pci-y := pci.o cxl_acpi-y := acpi.o cxl_pmem-y := pmem.o diff --git a/drivers/cxl/core/Makefile b/drivers/cxl/core/Makefile new file mode 100644 index 000000000000..c65e9f61abe9 --- /dev/null +++ b/drivers/cxl/core/Makefile @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_CXL_BUS) += cxl_core.o + +ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=CXL -I./drivers/cxl +cxl_core-y := bus.o diff --git a/drivers/cxl/core/bus.c b/drivers/cxl/core/bus.c index 00b759ff92d3..6ce04e3976d2 100644 --- a/drivers/cxl/core/bus.c +++ b/drivers/cxl/core/bus.c @@ -6,8 +6,8 @@ #include <linux/pci.h> #include <linux/slab.h> #include <linux/idr.h> -#include "../cxl.h" -#include "../mem.h" +#include <cxl.h> +#include <mem.h> /** * DOC: cxl core
diff --git a/Documentation/driver-api/cxl/memory-devices.rst b/Documentation/driver-api/cxl/memory-devices.rst index 487ce4f41d77..a86e2c7c551a 100644 --- a/Documentation/driver-api/cxl/memory-devices.rst +++ b/Documentation/driver-api/cxl/memory-devices.rst @@ -36,7 +36,7 @@ CXL Core .. kernel-doc:: drivers/cxl/cxl.h :internal: -.. kernel-doc:: drivers/cxl/core.c +.. kernel-doc:: drivers/cxl/core/bus.c :doc: cxl core External Interfaces diff --git a/drivers/cxl/Makefile b/drivers/cxl/Makefile index 32954059b37b..ad5a4f8f4511 100644 --- a/drivers/cxl/Makefile +++ b/drivers/cxl/Makefile @@ -5,7 +5,7 @@ obj-$(CONFIG_CXL_ACPI) += cxl_acpi.o obj-$(CONFIG_CXL_PMEM) += cxl_pmem.o ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=CXL -cxl_core-y := core.o +cxl_core-y := core/bus.o cxl_pci-y := pci.o cxl_acpi-y := acpi.o cxl_pmem-y := pmem.o diff --git a/drivers/cxl/core.c b/drivers/cxl/core/bus.c similarity index 99% rename from drivers/cxl/core.c rename to drivers/cxl/core/bus.c index a2e4d54fc7bc..00b759ff92d3 100644 --- a/drivers/cxl/core.c +++ b/drivers/cxl/core/bus.c @@ -6,8 +6,8 @@ #include <linux/pci.h> #include <linux/slab.h> #include <linux/idr.h> -#include "cxl.h" -#include "mem.h" +#include "../cxl.h" +#include "../mem.h" /** * DOC: cxl core
CXL core is growing, and it's already arguably unmanageable. To support future growth, move core functionality to a new directory and rename the file to represent just bus support. Future work will remove non-bus functionality. Signed-off-by: Ben Widawsky <ben.widawsky@intel.com> --- Documentation/driver-api/cxl/memory-devices.rst | 2 +- drivers/cxl/Makefile | 2 +- drivers/cxl/{core.c => core/bus.c} | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename drivers/cxl/{core.c => core/bus.c} (99%)