summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAamir Bohra <aamir.bohra@intel.com>2019-07-30 10:11:41 +0530
committerMartin Roth <martinroth@google.com>2019-08-02 15:47:24 +0000
commite825d3f4d69c1e3700ac3ce2896168fd9f092f19 (patch)
treeb12c4216ceec4b8d60bcab319ef607fb3b3bc891
parentb7ec252d378deee1d07175c8fdc8d2302f7fbcef (diff)
downloadcoreboot-e825d3f4d69c1e3700ac3ce2896168fd9f092f19.tar.xz
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>
-rw-r--r--src/arch/x86/acpi.c2
-rw-r--r--src/arch/x86/acpi_device.c12
-rw-r--r--src/arch/x86/include/arch/acpi.h2
-rw-r--r--src/arch/x86/include/arch/acpi_device.h8
4 files changed, 12 insertions, 12 deletions
diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c
index 8ab993ec48..e4ccd37abe 100644
--- a/src/arch/x86/acpi.c
+++ b/src/arch/x86/acpi.c
@@ -946,7 +946,7 @@ void acpi_create_dbg2(acpi_dbg2_header_t *dbg2,
}
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 0fb8f3b000..47bcc52c1e 100644
--- a/src/arch/x86/acpi_device.c
+++ b/src/arch/x86/acpi_device.c
@@ -53,9 +53,9 @@ static void acpi_device_fill_len(void *ptr)
}
/* 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 @@ const char *acpi_device_name(struct device *dev)
}
/* 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 @@ static ssize_t acpi_device_path_fill(struct device *dev, char *buf,
* 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 @@ const char *acpi_device_path(struct device *dev)
}
/* 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 @@ const char *acpi_device_scope(struct device *dev)
}
/* 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 6251b98142..259efcd2d5 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -901,7 +901,7 @@ void acpi_create_dbg2(acpi_dbg2_header_t *dbg2_header,
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 35695467cb..d74af9da74 100644
--- a/src/arch/x86/include/arch/acpi_device.h
+++ b/src/arch/x86/include/arch/acpi_device.h
@@ -62,10 +62,10 @@ struct acpi_dp {
#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);
/*