git: 44ceda0a53bf - main - acpi_apple: rename source files to match the driver name

The branch main has been updated by seuros:

URL: https://cgit.FreeBSD.org/src/commit/?id=44ceda0a53bfe0c9b343f1e94a4f6ce67f427be6

commit 44ceda0a53bfe0c9b343f1e94a4f6ce67f427be6
Author:     Abdelkader Boudih <seuros@FreeBSD.org>
AuthorDate: 2026-10-17 19:48:49 +0000
Commit:     Abdelkader Boudih <seuros@FreeBSD.org>
CommitDate: 2026-10-17 19:48:49 +0000

    acpi_apple: rename source files to match the driver name
    
    The driver, module, kernel option and manual page are all named
    acpi_apple, but the sources lived in sys/dev/apple_acpi/ with an
    apple_ prefix. Every other vendor ACPI driver in the tree uses the
    acpi_<vendor> form for both the directory and the file names.
    
    No functional change.
    
    Reviewed by:    adrian
    Differential Revision:  https://reviews.freebsd.org/D60792
---
 sys/conf/files                                                 |  6 +++---
 sys/dev/{apple_acpi/apple_acpi.c => acpi_apple/acpi_apple.c}   |  2 +-
 sys/dev/{apple_acpi/apple_acpi.h => acpi_apple/acpi_apple.h}   | 10 +++++-----
 .../apple_backlight.c => acpi_apple/acpi_apple_bl.c}           |  2 +-
 .../apple_platform.c => acpi_apple/acpi_apple_platform.c}      |  4 ++--
 sys/modules/acpi/acpi_apple/Makefile                           |  4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/sys/conf/files b/sys/conf/files
index 6e8c80807124..2e9c6ac4f19c 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -736,6 +736,9 @@ dev/aacraid/aacraid.c		optional aacraid
 dev/aacraid/aacraid_cam.c	optional aacraid scbus
 dev/aacraid/aacraid_debug.c	optional aacraid
 dev/aacraid/aacraid_pci.c	optional aacraid pci
+dev/acpi_apple/acpi_apple.c	optional acpi_apple acpi pci backlight
+dev/acpi_apple/acpi_apple_bl.c	optional acpi_apple acpi pci backlight
+dev/acpi_apple/acpi_apple_platform.c optional acpi_apple acpi pci backlight
 dev/acpi_support/acpi_wmi.c	optional acpi_wmi acpi
 dev/acpi_support/acpi_asus.c	optional acpi_asus acpi
 dev/acpi_support/acpi_asus_wmi.c	optional acpi_asus_wmi acpi
@@ -848,9 +851,6 @@ dev/ale/if_ale.c		optional ale pci
 dev/alpm/alpm.c			optional alpm pci
 dev/amdpm/amdpm.c		optional amdpm pci | nfpm pci
 dev/amdsmb/amdsmb.c		optional amdsmb pci
-dev/apple_acpi/apple_acpi.c	optional acpi_apple acpi pci backlight
-dev/apple_acpi/apple_backlight.c optional acpi_apple acpi pci backlight
-dev/apple_acpi/apple_platform.c	optional acpi_apple acpi pci backlight
 #
 dev/aq/aq_main.c		optional aq
 dev/aq/aq_media.c		optional aq
diff --git a/sys/dev/apple_acpi/apple_acpi.c b/sys/dev/acpi_apple/acpi_apple.c
similarity index 99%
rename from sys/dev/apple_acpi/apple_acpi.c
rename to sys/dev/acpi_apple/acpi_apple.c
index 5e979309d4c2..4425cb27d8f9 100644
--- a/sys/dev/apple_acpi/apple_acpi.c
+++ b/sys/dev/acpi_apple/acpi_apple.c
@@ -27,7 +27,7 @@
 
 #include <sys/cdefs.h>
 #include "opt_acpi.h"
-#include "apple_acpi.h"
+#include "acpi_apple.h"
 
 #include "backlight_if.h"
 
diff --git a/sys/dev/apple_acpi/apple_acpi.h b/sys/dev/acpi_apple/acpi_apple.h
similarity index 97%
rename from sys/dev/apple_acpi/apple_acpi.h
rename to sys/dev/acpi_apple/acpi_apple.h
index de5416de6eb0..cfd7b65f53c9 100644
--- a/sys/dev/apple_acpi/apple_acpi.h
+++ b/sys/dev/acpi_apple/acpi_apple.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#ifndef	_APPLE_ACPI_H_
-#define	_APPLE_ACPI_H_
+#ifndef	_ACPI_APPLE_H_
+#define	_ACPI_APPLE_H_
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -130,11 +130,11 @@ struct acpi_apple_softc {
 	uint32_t		bl_brightness;	/* cached percent 0..100 */
 };
 
-/* apple_platform.c */
+/* acpi_apple_platform.c */
 int	acpi_apple_platform_attach(struct acpi_apple_softc *sc);
 void	acpi_apple_platform_detach(struct acpi_apple_softc *sc);
 
-/* apple_backlight.c */
+/* acpi_apple_bl.c */
 int	acpi_apple_backlight_attach(struct acpi_apple_softc *sc);
 void	acpi_apple_backlight_detach(struct acpi_apple_softc *sc);
 void	acpi_apple_backlight_restore(void);
@@ -146,4 +146,4 @@ int	acpi_apple_bl_get_status(device_t dev,
 int	acpi_apple_bl_get_info(device_t dev,
 	    struct backlight_info *info);
 
-#endif /* _APPLE_ACPI_H_ */
+#endif /* _ACPI_APPLE_H_ */
diff --git a/sys/dev/apple_acpi/apple_backlight.c b/sys/dev/acpi_apple/acpi_apple_bl.c
similarity index 99%
rename from sys/dev/apple_acpi/apple_backlight.c
rename to sys/dev/acpi_apple/acpi_apple_bl.c
index 5b945689f5fe..4ec4a451efff 100644
--- a/sys/dev/apple_acpi/apple_backlight.c
+++ b/sys/dev/acpi_apple/acpi_apple_bl.c
@@ -14,7 +14,7 @@
  */
 
 #include <sys/cdefs.h>
-#include "apple_acpi.h"
+#include "acpi_apple.h"
 
 #include <sys/endian.h>
 #include <sys/systm.h>
diff --git a/sys/dev/apple_acpi/apple_platform.c b/sys/dev/acpi_apple/acpi_apple_platform.c
similarity index 98%
rename from sys/dev/apple_acpi/apple_platform.c
rename to sys/dev/acpi_apple/acpi_apple_platform.c
index ea5ed4eb0646..df690402f8f7 100644
--- a/sys/dev/apple_acpi/apple_platform.c
+++ b/sys/dev/acpi_apple/acpi_apple_platform.c
@@ -14,7 +14,7 @@
  */
 
 #include <sys/cdefs.h>
-#include "apple_acpi.h"
+#include "acpi_apple.h"
 
 /*
  * APP9876 and APP000B attach concurrently as ACPI_APPLE_PLATFORM on T2
@@ -24,7 +24,7 @@
  */
 static struct mtx	acpi_apple_platform_mtx;
 MTX_SYSINIT(acpi_apple_platform_mtx_init, &acpi_apple_platform_mtx,
-    "apple_platform", MTX_DEF);
+    "acpi_apple_platform", MTX_DEF);
 static int		acpi_apple_platform_refs;
 static eventhandler_tag	acpi_apple_shutdown_tag;
 static eventhandler_tag	acpi_apple_lid_tag;
diff --git a/sys/modules/acpi/acpi_apple/Makefile b/sys/modules/acpi/acpi_apple/Makefile
index 5beec8f18d37..c89002e0bc69 100644
--- a/sys/modules/acpi/acpi_apple/Makefile
+++ b/sys/modules/acpi/acpi_apple/Makefile
@@ -1,7 +1,7 @@
-.PATH:	${SRCTOP}/sys/dev/apple_acpi
+.PATH:	${SRCTOP}/sys/dev/acpi_apple
 
 KMOD=	acpi_apple
-SRCS=	apple_acpi.c apple_platform.c apple_backlight.c \
+SRCS=	acpi_apple.c acpi_apple_platform.c acpi_apple_bl.c \
 	opt_acpi.h acpi_if.h bus_if.h device_if.h \
 	pci_if.h backlight_if.h