diff mbox series

[v13,04/18] cxl: move cxl headers to new include/cxl/ directory

Message ID 20241009124120.1124-5-shiju.jose@huawei.com
State Superseded
Headers show
Series EDAC: Scrub: introduce generic EDAC RAS control feature driver + CXL/ACPI-RAS2 drivers | expand

Commit Message

Shiju Jose Oct. 9, 2024, 12:41 p.m. UTC 
From: Dave Jiang <dave.jiang@intel.com>

Group all cxl related kernel headers into include/cxl/ directory.

Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Reviewed-by: Alison Schofield <alison.schofield@intel.com>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
---
 MAINTAINERS                                | 3 +--
 drivers/acpi/apei/einj-cxl.c               | 2 +-
 drivers/acpi/apei/ghes.c                   | 2 +-
 drivers/cxl/core/port.c                    | 2 +-
 drivers/cxl/cxlmem.h                       | 2 +-
 include/{linux/einj-cxl.h => cxl/einj.h}   | 0
 include/{linux/cxl-event.h => cxl/event.h} | 0
 7 files changed, 5 insertions(+), 6 deletions(-)
 rename include/{linux/einj-cxl.h => cxl/einj.h} (100%)
 rename include/{linux/cxl-event.h => cxl/event.h} (100%)

Comments

Jonathan Cameron Oct. 14, 2024, 2:34 p.m. UTC | #1 
On Wed, 9 Oct 2024 13:41:05 +0100
<shiju.jose@huawei.com> wrote:

> From: Dave Jiang <dave.jiang@intel.com>
> 
> Group all cxl related kernel headers into include/cxl/ directory.
> 
> Signed-off-by: Dave Jiang <dave.jiang@intel.com>
> Reviewed-by: Alison Schofield <alison.schofield@intel.com>
> Reviewed-by: Ira Weiny <ira.weiny@intel.com>

Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

> ---
>  MAINTAINERS                                | 3 +--
>  drivers/acpi/apei/einj-cxl.c               | 2 +-
>  drivers/acpi/apei/ghes.c                   | 2 +-
>  drivers/cxl/core/port.c                    | 2 +-
>  drivers/cxl/cxlmem.h                       | 2 +-
>  include/{linux/einj-cxl.h => cxl/einj.h}   | 0
>  include/{linux/cxl-event.h => cxl/event.h} | 0
>  7 files changed, 5 insertions(+), 6 deletions(-)
>  rename include/{linux/einj-cxl.h => cxl/einj.h} (100%)
>  rename include/{linux/cxl-event.h => cxl/event.h} (100%)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index cc40a9d9b8cd..ae17d28c5f73 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -5620,8 +5620,7 @@ L:	linux-cxl@vger.kernel.org
>  S:	Maintained
>  F:	Documentation/driver-api/cxl
>  F:	drivers/cxl/
> -F:	include/linux/einj-cxl.h
> -F:	include/linux/cxl-event.h
> +F:	include/cxl/
>  F:	include/uapi/linux/cxl_mem.h
>  F:	tools/testing/cxl/
>  
> diff --git a/drivers/acpi/apei/einj-cxl.c b/drivers/acpi/apei/einj-cxl.c
> index 8b8be0c90709..4f81a119ec08 100644
> --- a/drivers/acpi/apei/einj-cxl.c
> +++ b/drivers/acpi/apei/einj-cxl.c
> @@ -7,9 +7,9 @@
>   *
>   * Author: Ben Cheatham <benjamin.cheatham@amd.com>
>   */
> -#include <linux/einj-cxl.h>
>  #include <linux/seq_file.h>
>  #include <linux/pci.h>
> +#include <cxl/einj.h>
>  
>  #include "apei-internal.h"
>  
> diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
> index 623cc0cb4a65..ada93cfde9ba 100644
> --- a/drivers/acpi/apei/ghes.c
> +++ b/drivers/acpi/apei/ghes.c
> @@ -27,7 +27,6 @@
>  #include <linux/timer.h>
>  #include <linux/cper.h>
>  #include <linux/cleanup.h>
> -#include <linux/cxl-event.h>
>  #include <linux/platform_device.h>
>  #include <linux/mutex.h>
>  #include <linux/ratelimit.h>
> @@ -50,6 +49,7 @@
>  #include <acpi/apei.h>
>  #include <asm/fixmap.h>
>  #include <asm/tlbflush.h>
> +#include <cxl/event.h>
>  #include <ras/ras_event.h>
>  
>  #include "apei-internal.h"
> diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c
> index 1d5007e3795a..e0b28a6730c1 100644
> --- a/drivers/cxl/core/port.c
> +++ b/drivers/cxl/core/port.c
> @@ -3,7 +3,6 @@
>  #include <linux/platform_device.h>
>  #include <linux/memregion.h>
>  #include <linux/workqueue.h>
> -#include <linux/einj-cxl.h>
>  #include <linux/debugfs.h>
>  #include <linux/device.h>
>  #include <linux/module.h>
> @@ -11,6 +10,7 @@
>  #include <linux/slab.h>
>  #include <linux/idr.h>
>  #include <linux/node.h>
> +#include <cxl/einj.h>
>  #include <cxlmem.h>
>  #include <cxlpci.h>
>  #include <cxl.h>
> diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h
> index afb53d058d62..a81a8982bf93 100644
> --- a/drivers/cxl/cxlmem.h
> +++ b/drivers/cxl/cxlmem.h
> @@ -6,8 +6,8 @@
>  #include <linux/cdev.h>
>  #include <linux/uuid.h>
>  #include <linux/rcuwait.h>
> -#include <linux/cxl-event.h>
>  #include <linux/node.h>
> +#include <cxl/event.h>
>  #include "cxl.h"
>  
>  /* CXL 2.0 8.2.8.5.1.1 Memory Device Status Register */
> diff --git a/include/linux/einj-cxl.h b/include/cxl/einj.h
> similarity index 100%
> rename from include/linux/einj-cxl.h
> rename to include/cxl/einj.h
> diff --git a/include/linux/cxl-event.h b/include/cxl/event.h
> similarity index 100%
> rename from include/linux/cxl-event.h
> rename to include/cxl/event.h
diff mbox series

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index cc40a9d9b8cd..ae17d28c5f73 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5620,8 +5620,7 @@  L:	linux-cxl@vger.kernel.org
 S:	Maintained
 F:	Documentation/driver-api/cxl
 F:	drivers/cxl/
-F:	include/linux/einj-cxl.h
-F:	include/linux/cxl-event.h
+F:	include/cxl/
 F:	include/uapi/linux/cxl_mem.h
 F:	tools/testing/cxl/
 
diff --git a/drivers/acpi/apei/einj-cxl.c b/drivers/acpi/apei/einj-cxl.c
index 8b8be0c90709..4f81a119ec08 100644
--- a/drivers/acpi/apei/einj-cxl.c
+++ b/drivers/acpi/apei/einj-cxl.c
@@ -7,9 +7,9 @@ 
  *
  * Author: Ben Cheatham <benjamin.cheatham@amd.com>
  */
-#include <linux/einj-cxl.h>
 #include <linux/seq_file.h>
 #include <linux/pci.h>
+#include <cxl/einj.h>
 
 #include "apei-internal.h"
 
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index 623cc0cb4a65..ada93cfde9ba 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -27,7 +27,6 @@ 
 #include <linux/timer.h>
 #include <linux/cper.h>
 #include <linux/cleanup.h>
-#include <linux/cxl-event.h>
 #include <linux/platform_device.h>
 #include <linux/mutex.h>
 #include <linux/ratelimit.h>
@@ -50,6 +49,7 @@ 
 #include <acpi/apei.h>
 #include <asm/fixmap.h>
 #include <asm/tlbflush.h>
+#include <cxl/event.h>
 #include <ras/ras_event.h>
 
 #include "apei-internal.h"
diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c
index 1d5007e3795a..e0b28a6730c1 100644
--- a/drivers/cxl/core/port.c
+++ b/drivers/cxl/core/port.c
@@ -3,7 +3,6 @@ 
 #include <linux/platform_device.h>
 #include <linux/memregion.h>
 #include <linux/workqueue.h>
-#include <linux/einj-cxl.h>
 #include <linux/debugfs.h>
 #include <linux/device.h>
 #include <linux/module.h>
@@ -11,6 +10,7 @@ 
 #include <linux/slab.h>
 #include <linux/idr.h>
 #include <linux/node.h>
+#include <cxl/einj.h>
 #include <cxlmem.h>
 #include <cxlpci.h>
 #include <cxl.h>
diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h
index afb53d058d62..a81a8982bf93 100644
--- a/drivers/cxl/cxlmem.h
+++ b/drivers/cxl/cxlmem.h
@@ -6,8 +6,8 @@ 
 #include <linux/cdev.h>
 #include <linux/uuid.h>
 #include <linux/rcuwait.h>
-#include <linux/cxl-event.h>
 #include <linux/node.h>
+#include <cxl/event.h>
 #include "cxl.h"
 
 /* CXL 2.0 8.2.8.5.1.1 Memory Device Status Register */
diff --git a/include/linux/einj-cxl.h b/include/cxl/einj.h
similarity index 100%
rename from include/linux/einj-cxl.h
rename to include/cxl/einj.h
diff --git a/include/linux/cxl-event.h b/include/cxl/event.h
similarity index 100%
rename from include/linux/cxl-event.h
rename to include/cxl/event.h