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/soc/intel/apollolake/chip.c | 2 +- src/soc/intel/cannonlake/chip.c | 2 +- src/soc/intel/skylake/acpi.c | 2 +- src/soc/intel/skylake/include/fsp11/soc/ramstage.h | 2 +- src/soc/intel/skylake/include/fsp20/soc/ramstage.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/soc') diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c index 628304c99d..2c47766fcc 100644 --- a/src/soc/intel/apollolake/chip.c +++ b/src/soc/intel/apollolake/chip.c @@ -49,7 +49,7 @@ static void *vbt; static struct region_device vbt_rdev; -static const char *soc_acpi_name(struct device *dev) +static const char *soc_acpi_name(const struct device *dev) { if (dev->path.type == DEVICE_PATH_DOMAIN) return "PCI0"; diff --git a/src/soc/intel/cannonlake/chip.c b/src/soc/intel/cannonlake/chip.c index 42a59ceec4..6616b66b32 100644 --- a/src/soc/intel/cannonlake/chip.c +++ b/src/soc/intel/cannonlake/chip.c @@ -25,7 +25,7 @@ #include #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) -static const char *soc_acpi_name(struct device *dev) +static const char *soc_acpi_name(const struct device *dev) { if (dev->path.type == DEVICE_PATH_DOMAIN) return "PCI0"; diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c index 929afa46fe..cfb98cd627 100644 --- a/src/soc/intel/skylake/acpi.c +++ b/src/soc/intel/skylake/acpi.c @@ -636,7 +636,7 @@ __attribute__((weak)) void acpi_mainboard_gnvs(global_nvs_t *gnvs) { } -const char *soc_acpi_name(struct device *dev) +const char *soc_acpi_name(const struct device *dev) { if (dev->path.type == DEVICE_PATH_DOMAIN) return "PCI0"; diff --git a/src/soc/intel/skylake/include/fsp11/soc/ramstage.h b/src/soc/intel/skylake/include/fsp11/soc/ramstage.h index 6f9362a4bd..d7e2fe3546 100644 --- a/src/soc/intel/skylake/include/fsp11/soc/ramstage.h +++ b/src/soc/intel/skylake/include/fsp11/soc/ramstage.h @@ -29,7 +29,7 @@ void soc_irq_settings(FSP_SIL_UPD *params); void pch_enable_dev(device_t dev); void soc_init_pre_device(void *chip_info); void soc_fsp_load(void); -const char *soc_acpi_name(struct device *dev); +const char *soc_acpi_name(const struct device *dev); extern struct pci_operations soc_pci_ops; /* Get igd framebuffer bar */ diff --git a/src/soc/intel/skylake/include/fsp20/soc/ramstage.h b/src/soc/intel/skylake/include/fsp20/soc/ramstage.h index 79362fff17..065b6c221f 100644 --- a/src/soc/intel/skylake/include/fsp20/soc/ramstage.h +++ b/src/soc/intel/skylake/include/fsp20/soc/ramstage.h @@ -31,7 +31,7 @@ void pch_enable_dev(device_t dev); void soc_fsp_load(void); void soc_init_pre_device(void *chip_info); void soc_irq_settings(FSP_SIL_UPD *params); -const char *soc_acpi_name(struct device *dev); +const char *soc_acpi_name(const struct device *dev); extern struct pci_operations soc_pci_ops; -- cgit v1.2.3