From: Dan Williams <dan.j.williams@intel.com>
Date: Fri, 14 May 2021 05:22:00 +0000 (-0700)
Subject: cxl/core: Rename bus.c to core.c
X-Git-Tag: howlett/maple/20220722_2~2829^2~32
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5f653f7590ab7db7379f668b2975744585206b0d;p=users%2Fjedix%2Flinux-maple.git

cxl/core: Rename bus.c to core.c

In preparation for more generic shared functionality across endpoint
consumers of core cxl resources, and platform-firmware producers of
those resources, rename bus.c to core.c. In addition to the central
rendezvous for interleave coordination, the core will also define common
routines like CXL register block mapping.

Acked-by: Ben Widawsky <ben.widawsky@intel.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/162096972018.1865304.11079951161445408423.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---

diff --git a/Documentation/driver-api/cxl/memory-devices.rst b/Documentation/driver-api/cxl/memory-devices.rst
index 1bad466f91679..71495ed770692 100644
--- a/Documentation/driver-api/cxl/memory-devices.rst
+++ b/Documentation/driver-api/cxl/memory-devices.rst
@@ -28,10 +28,10 @@ CXL Memory Device
 .. kernel-doc:: drivers/cxl/mem.c
    :internal:
 
-CXL Bus
+CXL Core
 -------
-.. kernel-doc:: drivers/cxl/bus.c
-   :doc: cxl bus
+.. kernel-doc:: drivers/cxl/core.c
+   :doc: cxl core
 
 External Interfaces
 ===================
diff --git a/drivers/cxl/Makefile b/drivers/cxl/Makefile
index a314a1891f4d3..3808e39dd31f4 100644
--- a/drivers/cxl/Makefile
+++ b/drivers/cxl/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_CXL_BUS) += cxl_bus.o
+obj-$(CONFIG_CXL_BUS) += cxl_core.o
 obj-$(CONFIG_CXL_MEM) += cxl_mem.o
 
 ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=CXL
-cxl_bus-y := bus.o
+cxl_core-y := core.o
 cxl_mem-y := mem.o
diff --git a/drivers/cxl/bus.c b/drivers/cxl/core.c
similarity index 55%
rename from drivers/cxl/bus.c
rename to drivers/cxl/core.c
index 58f74796d525b..7f8d2034038a4 100644
--- a/drivers/cxl/bus.c
+++ b/drivers/cxl/core.c
@@ -4,26 +4,27 @@
 #include <linux/module.h>
 
 /**
- * DOC: cxl bus
+ * DOC: cxl core
  *
- * The CXL bus provides namespace for control devices and a rendezvous
- * point for cross-device interleave coordination.
+ * The CXL core provides a sysfs hierarchy for control devices and a rendezvous
+ * point for cross-device interleave coordination through cxl ports.
  */
+
 struct bus_type cxl_bus_type = {
 	.name = "cxl",
 };
 EXPORT_SYMBOL_GPL(cxl_bus_type);
 
-static __init int cxl_bus_init(void)
+static __init int cxl_core_init(void)
 {
 	return bus_register(&cxl_bus_type);
 }
 
-static void cxl_bus_exit(void)
+static void cxl_core_exit(void)
 {
 	bus_unregister(&cxl_bus_type);
 }
 
-module_init(cxl_bus_init);
-module_exit(cxl_bus_exit);
+module_init(cxl_core_init);
+module_exit(cxl_core_exit);
 MODULE_LICENSE("GPL v2");