From aa090cb6ea696d9b6a2869e16c53bd8b14a0e7d1 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Wed, 13 Sep 2017 16:01:52 -0600 Subject: device: acpi_name() should take a const struct device There's no reason to mutate the struct device when determining the ACPI name for a device. Adjust the function pointer signature and the respective implementations to use const struct device. Change-Id: If5e1f4de36a53646616581b01f47c4e86822c42e Signed-off-by: Aaron Durbin Reviewed-on: https://review.coreboot.org/21527 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh Reviewed-by: Subrata Banik Reviewed-by: Paul Menzel --- src/northbridge/amd/agesa/family14/northbridge.c | 2 +- src/northbridge/amd/amdfam10/northbridge.c | 4 ++-- src/northbridge/amd/pi/00730F01/northbridge.c | 2 +- src/northbridge/intel/sandybridge/gma.c | 2 +- src/northbridge/intel/sandybridge/northbridge.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/northbridge') diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c index 34e7ce6934..d0abcfd97b 100644 --- a/src/northbridge/amd/agesa/family14/northbridge.c +++ b/src/northbridge/amd/agesa/family14/northbridge.c @@ -606,7 +606,7 @@ static void domain_enable_resources(device_t dev) #endif } -static const char *domain_acpi_name(struct device *dev) +static const char *domain_acpi_name(const struct device *dev) { if (dev->path.type == DEVICE_PATH_DOMAIN) return "PCI0"; diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c index 8da05ed054..61c4465b05 100644 --- a/src/northbridge/amd/amdfam10/northbridge.c +++ b/src/northbridge/amd/amdfam10/northbridge.c @@ -645,7 +645,7 @@ static void mcf0_control_init(struct device *dev) } #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) -static const char *amdfam10_northbridge_acpi_name(struct device *dev) +static const char *amdfam10_northbridge_acpi_name(const struct device *dev) { return ""; } @@ -1311,7 +1311,7 @@ static int amdfam10_get_smbios_data(device_t dev, int *handle, unsigned long *cu #endif #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) -static const char *amdfam10_domain_acpi_name(struct device *dev) +static const char *amdfam10_domain_acpi_name(const struct device *dev) { if (dev->path.type == DEVICE_PATH_DOMAIN) return "PCI0"; diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c index 6dc1860c5f..692805b905 100644 --- a/src/northbridge/amd/pi/00730F01/northbridge.c +++ b/src/northbridge/amd/pi/00730F01/northbridge.c @@ -813,7 +813,7 @@ static void domain_set_resources(device_t dev) } } -static const char *domain_acpi_name(struct device *dev) +static const char *domain_acpi_name(const struct device *dev) { if (dev->path.type == DEVICE_PATH_DOMAIN) return "PCI0"; diff --git a/src/northbridge/intel/sandybridge/gma.c b/src/northbridge/intel/sandybridge/gma.c index 01b0e155a8..029bb05bb3 100644 --- a/src/northbridge/intel/sandybridge/gma.c +++ b/src/northbridge/intel/sandybridge/gma.c @@ -718,7 +718,7 @@ gma_write_acpi_tables(struct device *const dev, return current; } -static const char *gma_acpi_name(device_t dev) +static const char *gma_acpi_name(const struct device *dev) { return "GFX0"; } diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c index 3c0b9eccca..821da87871 100644 --- a/src/northbridge/intel/sandybridge/northbridge.c +++ b/src/northbridge/intel/sandybridge/northbridge.c @@ -242,7 +242,7 @@ static void pci_domain_set_resources(device_t dev) assign_resources(dev->link_list); } -static const char *northbridge_acpi_name(struct device *dev) +static const char *northbridge_acpi_name(const struct device *dev) { if (dev->path.type == DEVICE_PATH_DOMAIN) return "PCI0"; -- cgit v1.2.3