Martin Roth merged this change.

View Change

src/arch/x86/acpi: Constify struct device instances

Constify the struct device arguments in below APIs:
> acpi_device_name
> acpi_device_path_fill
> acpi_device_path
> acpi_write_dbg2_pci_uart
> acpi_device_scope
> acpi_device_path_join

The APIs do not seem to modify the argument and are using
device argument as reference to device only.

Change-Id: Ic2ce045f17efa288eb41503795723d0ad5ec78bd
Signed-off-by: Aamir Bohra <aamir.bohra@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34625
Reviewed-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M src/arch/x86/acpi.c
M src/arch/x86/acpi_device.c
M src/arch/x86/include/arch/acpi.h
M src/arch/x86/include/arch/acpi_device.h
4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c
index 8ab993e..e4ccd37 100644
--- a/src/arch/x86/acpi.c
+++ b/src/arch/x86/acpi.c
@@ -946,7 +946,7 @@
 }
 
 unsigned long acpi_write_dbg2_pci_uart(acpi_rsdp_t *rsdp, unsigned long current,
-				       struct device *dev, uint8_t access_size)
+				const struct device *dev, uint8_t access_size)
 {
 	acpi_dbg2_header_t *dbg2 = (acpi_dbg2_header_t *)current;
 	struct resource *res;
diff --git a/src/arch/x86/acpi_device.c b/src/arch/x86/acpi_device.c
index 0fb8f3b..47bcc52 100644
--- a/src/arch/x86/acpi_device.c
+++ b/src/arch/x86/acpi_device.c
@@ -53,9 +53,9 @@
 }
 
 /* Locate and return the ACPI name for this device */
-const char *acpi_device_name(struct device *dev)
+const char *acpi_device_name(const struct device *dev)
 {
-	struct device *pdev = dev;
+	const struct device *pdev = dev;
 	const char *name = NULL;
 
 	if (!dev)
@@ -82,7 +82,7 @@
 }
 
 /* Recursive function to find the root device and print a path from there */
-static ssize_t acpi_device_path_fill(struct device *dev, char *buf,
+static ssize_t acpi_device_path_fill(const struct device *dev, char *buf,
 				     size_t buf_len, size_t cur)
 {
 	const char *name = acpi_device_name(dev);
@@ -117,7 +117,7 @@
  * Warning: just as with dev_path() this uses a static buffer
  * so should not be called mulitple times in one statement
  */
-const char *acpi_device_path(struct device *dev)
+const char *acpi_device_path(const struct device *dev)
 {
 	static char buf[DEVICE_PATH_MAX] = {};
 
@@ -131,7 +131,7 @@
 }
 
 /* Return the path of the parent device as the ACPI Scope for this device */
-const char *acpi_device_scope(struct device *dev)
+const char *acpi_device_scope(const struct device *dev)
 {
 	static char buf[DEVICE_PATH_MAX] = {};
 
@@ -145,7 +145,7 @@
 }
 
 /* Concatentate the device path and provided name suffix */
-const char *acpi_device_path_join(struct device *dev, const char *name)
+const char *acpi_device_path_join(const struct device *dev, const char *name)
 {
 	static char buf[DEVICE_PATH_MAX] = {};
 	ssize_t len;
diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h
index 6251b98..259efcd 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -901,7 +901,7 @@
 		      const char *device_path);
 
 unsigned long acpi_write_dbg2_pci_uart(acpi_rsdp_t *rsdp, unsigned long current,
-				       struct device *dev, uint8_t access_size);
+				const struct device *dev, uint8_t access_size);
 void acpi_create_dmar(acpi_dmar_t *dmar, enum dmar_flags flags,
 		      unsigned long (*acpi_fill_dmar)(unsigned long));
 unsigned long acpi_create_dmar_drhd(unsigned long current, u8 flags,
diff --git a/src/arch/x86/include/arch/acpi_device.h b/src/arch/x86/include/arch/acpi_device.h
index 3569546..d74af9d 100644
--- a/src/arch/x86/include/arch/acpi_device.h
+++ b/src/arch/x86/include/arch/acpi_device.h
@@ -62,10 +62,10 @@
 #define ACPI_DT_NAMESPACE_HID		"PRP0001"
 
 struct device;
-const char *acpi_device_name(struct device *dev);
-const char *acpi_device_path(struct device *dev);
-const char *acpi_device_scope(struct device *dev);
-const char *acpi_device_path_join(struct device *dev, const char *name);
+const char *acpi_device_name(const struct device *dev);
+const char *acpi_device_path(const struct device *dev);
+const char *acpi_device_scope(const struct device *dev);
+const char *acpi_device_path_join(const struct device *dev, const char *name);
 int acpi_device_status(const struct device *dev);
 
 /*

To view, visit change 34625. To unsubscribe, or for help writing mail filters, visit settings.