summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2017-09-13 16:01:52 -0600
committerAaron Durbin <adurbin@chromium.org>2017-09-14 14:34:27 +0000
commitaa090cb6ea696d9b6a2869e16c53bd8b14a0e7d1 (patch)
treed605b4aabb1c9001049c1500c8b10c5e35219755
parentd07f377872d1d229a8a9cc1d4a2c66f535e95fe3 (diff)
downloadcoreboot-aa090cb6ea696d9b6a2869e16c53bd8b14a0e7d1.tar.xz
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 <adurbin@chromium.org> Reviewed-on: https://review.coreboot.org/21527 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: Subrata Banik <subrata.banik@intel.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
-rw-r--r--src/device/root_device.c2
-rw-r--r--src/drivers/generic/gpio_regulator/gpio_regulator.c2
-rw-r--r--src/drivers/generic/max98357a/max98357a.c2
-rw-r--r--src/drivers/i2c/alps/alps.c2
-rw-r--r--src/drivers/i2c/da7219/da7219.c2
-rw-r--r--src/drivers/i2c/generic/generic.c2
-rw-r--r--src/drivers/i2c/hid/hid.c2
-rw-r--r--src/drivers/i2c/max98927/max98927.c2
-rw-r--r--src/drivers/i2c/nau8825/nau8825.c2
-rw-r--r--src/drivers/i2c/rt5663/rt5663.c2
-rw-r--r--src/drivers/i2c/tpm/chip.c2
-rw-r--r--src/drivers/intel/mipi_camera/camera.c2
-rw-r--r--src/drivers/intel/wifi/wifi.c2
-rw-r--r--src/drivers/pc80/tpm/tpm.c2
-rw-r--r--src/drivers/spi/acpi/acpi.c4
-rw-r--r--src/include/device/device.h2
-rw-r--r--src/northbridge/amd/agesa/family14/northbridge.c2
-rw-r--r--src/northbridge/amd/amdfam10/northbridge.c4
-rw-r--r--src/northbridge/amd/pi/00730F01/northbridge.c2
-rw-r--r--src/northbridge/intel/sandybridge/gma.c2
-rw-r--r--src/northbridge/intel/sandybridge/northbridge.c2
-rw-r--r--src/soc/intel/apollolake/chip.c2
-rw-r--r--src/soc/intel/cannonlake/chip.c2
-rw-r--r--src/soc/intel/skylake/acpi.c2
-rw-r--r--src/soc/intel/skylake/include/fsp11/soc/ramstage.h2
-rw-r--r--src/soc/intel/skylake/include/fsp20/soc/ramstage.h2
-rw-r--r--src/southbridge/amd/cimx/sb800/late.c2
-rw-r--r--src/southbridge/amd/pi/hudson/lpc.c2
-rw-r--r--src/southbridge/amd/sb700/lpc.c3
-rw-r--r--src/southbridge/intel/bd82x6x/azalia.c2
-rw-r--r--src/southbridge/intel/bd82x6x/lpc.c2
-rw-r--r--src/southbridge/intel/bd82x6x/pcie.c2
-rw-r--r--src/southbridge/intel/bd82x6x/sata.c2
-rw-r--r--src/southbridge/intel/bd82x6x/smbus.c2
-rw-r--r--src/southbridge/intel/bd82x6x/usb_ehci.c2
-rw-r--r--src/southbridge/intel/bd82x6x/usb_xhci.c2
36 files changed, 39 insertions, 38 deletions
diff --git a/src/device/root_device.c b/src/device/root_device.c
index 9b3fd49598..8e985931fe 100644
--- a/src/device/root_device.c
+++ b/src/device/root_device.c
@@ -136,7 +136,7 @@ static void root_dev_reset(struct bus *bus)
}
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
-static const char *root_dev_acpi_name(struct device *dev)
+static const char *root_dev_acpi_name(const struct device *dev)
{
return "\\_SB";
}
diff --git a/src/drivers/generic/gpio_regulator/gpio_regulator.c b/src/drivers/generic/gpio_regulator/gpio_regulator.c
index def174486c..c038392bb7 100644
--- a/src/drivers/generic/gpio_regulator/gpio_regulator.c
+++ b/src/drivers/generic/gpio_regulator/gpio_regulator.c
@@ -60,7 +60,7 @@ static void gpio_regulator_fill_ssdt_generator(struct device *dev)
acpigen_pop_len(); /* Scope */
}
-static const char *gpio_regulator_acpi_name(struct device *dev)
+static const char *gpio_regulator_acpi_name(const struct device *dev)
{
struct drivers_generic_gpio_regulator_config *config = dev->chip_info;
static char name[5];
diff --git a/src/drivers/generic/max98357a/max98357a.c b/src/drivers/generic/max98357a/max98357a.c
index 4a057b51d5..71ab1b9bd6 100644
--- a/src/drivers/generic/max98357a/max98357a.c
+++ b/src/drivers/generic/max98357a/max98357a.c
@@ -66,7 +66,7 @@ static void max98357a_fill_ssdt(struct device *dev)
printk(BIOS_INFO, "%s: %s\n", path, dev->chip_ops->name);
}
-static const char *max98357a_acpi_name(struct device *dev)
+static const char *max98357a_acpi_name(const struct device *dev)
{
return MAX98357A_ACPI_NAME;
}
diff --git a/src/drivers/i2c/alps/alps.c b/src/drivers/i2c/alps/alps.c
index f0ccd6c44e..286237402a 100644
--- a/src/drivers/i2c/alps/alps.c
+++ b/src/drivers/i2c/alps/alps.c
@@ -34,7 +34,7 @@ static void i2c_alps_fill_ssdt_generator(struct device *dev)
i2c_generic_fill_ssdt(dev, &i2c_alps_fill_dsm, &config->generic);
}
-static const char *i2c_alps_acpi_name(struct device *dev)
+static const char *i2c_alps_acpi_name(const struct device *dev)
{
return "ALPS";
}
diff --git a/src/drivers/i2c/da7219/da7219.c b/src/drivers/i2c/da7219/da7219.c
index 2e7d46010e..4eef00cf9f 100644
--- a/src/drivers/i2c/da7219/da7219.c
+++ b/src/drivers/i2c/da7219/da7219.c
@@ -95,7 +95,7 @@ static void da7219_fill_ssdt(struct device *dev)
dev->path.i2c.device, config->irq.pin);
}
-static const char *da7219_acpi_name(struct device *dev)
+static const char *da7219_acpi_name(const struct device *dev)
{
return DA7219_ACPI_NAME;
}
diff --git a/src/drivers/i2c/generic/generic.c b/src/drivers/i2c/generic/generic.c
index 460f01514b..13f83935f9 100644
--- a/src/drivers/i2c/generic/generic.c
+++ b/src/drivers/i2c/generic/generic.c
@@ -165,7 +165,7 @@ static void i2c_generic_fill_ssdt_generator(struct device *dev)
}
/* Use name specified in config or build one from I2C address */
-static const char *i2c_generic_acpi_name(struct device *dev)
+static const char *i2c_generic_acpi_name(const struct device *dev)
{
struct drivers_i2c_generic_config *config = dev->chip_info;
static char name[5];
diff --git a/src/drivers/i2c/hid/hid.c b/src/drivers/i2c/hid/hid.c
index 9eb56c25ef..71d70d0cf6 100644
--- a/src/drivers/i2c/hid/hid.c
+++ b/src/drivers/i2c/hid/hid.c
@@ -37,7 +37,7 @@ static void i2c_hid_fill_ssdt_generator(struct device *dev)
i2c_generic_fill_ssdt(dev, &i2c_hid_fill_dsm, &config->generic);
}
-static const char *i2c_hid_acpi_name(struct device *dev)
+static const char *i2c_hid_acpi_name(const struct device *dev)
{
static char name[5];
snprintf(name, sizeof(name), "H%03.3X", dev->path.i2c.device);
diff --git a/src/drivers/i2c/max98927/max98927.c b/src/drivers/i2c/max98927/max98927.c
index e9fc00d433..50b3e0c034 100644
--- a/src/drivers/i2c/max98927/max98927.c
+++ b/src/drivers/i2c/max98927/max98927.c
@@ -73,7 +73,7 @@ static void max98927_fill_ssdt(struct device *dev)
dev->chip_ops->name, dev->path.i2c.device);
}
-static const char *max98927_acpi_name(struct device *dev)
+static const char *max98927_acpi_name(const struct device *dev)
{
struct drivers_i2c_max98927_config *config = dev->chip_info;
diff --git a/src/drivers/i2c/nau8825/nau8825.c b/src/drivers/i2c/nau8825/nau8825.c
index 42dd8478e6..3cf5edd656 100644
--- a/src/drivers/i2c/nau8825/nau8825.c
+++ b/src/drivers/i2c/nau8825/nau8825.c
@@ -92,7 +92,7 @@ static void nau8825_fill_ssdt(struct device *dev)
dev->path.i2c.device, config->irq.pin);
}
-static const char *nau8825_acpi_name(struct device *dev)
+static const char *nau8825_acpi_name(const struct device *dev)
{
return NAU8825_ACPI_NAME;
}
diff --git a/src/drivers/i2c/rt5663/rt5663.c b/src/drivers/i2c/rt5663/rt5663.c
index e8734dc8c2..16237d6203 100644
--- a/src/drivers/i2c/rt5663/rt5663.c
+++ b/src/drivers/i2c/rt5663/rt5663.c
@@ -82,7 +82,7 @@ static void rt5663_fill_ssdt(struct device *dev)
dev->chip_ops->name, dev->path.i2c.device);
}
-static const char *rt5663_acpi_name(struct device *dev)
+static const char *rt5663_acpi_name(const struct device *dev)
{
return RT5663_ACPI_NAME;
}
diff --git a/src/drivers/i2c/tpm/chip.c b/src/drivers/i2c/tpm/chip.c
index 595a05cdbc..6d5c28a446 100644
--- a/src/drivers/i2c/tpm/chip.c
+++ b/src/drivers/i2c/tpm/chip.c
@@ -65,7 +65,7 @@ static void i2c_tpm_fill_ssdt(struct device *dev)
dev->chip_ops->name, dev_path(dev));
}
-static const char *i2c_tpm_acpi_name(struct device *dev)
+static const char *i2c_tpm_acpi_name(const struct device *dev)
{
return "TPMI";
}
diff --git a/src/drivers/intel/mipi_camera/camera.c b/src/drivers/intel/mipi_camera/camera.c
index 00ffad903f..9def9731f2 100644
--- a/src/drivers/intel/mipi_camera/camera.c
+++ b/src/drivers/intel/mipi_camera/camera.c
@@ -74,7 +74,7 @@ static void camera_fill_ssdt(struct device *dev)
dev->chip_ops->name, dev->path.i2c.device);
}
-static const char *camera_acpi_name(struct device *dev)
+static const char *camera_acpi_name(const struct device *dev)
{
struct drivers_intel_mipi_camera_config *config = dev->chip_info;
return config->acpi_name;
diff --git a/src/drivers/intel/wifi/wifi.c b/src/drivers/intel/wifi/wifi.c
index 77918e42d0..3b21165bd3 100644
--- a/src/drivers/intel/wifi/wifi.c
+++ b/src/drivers/intel/wifi/wifi.c
@@ -195,7 +195,7 @@ static void intel_wifi_fill_ssdt(struct device *dev)
dev->chip_ops ? dev->chip_ops->name : "", dev_path(dev));
}
-static const char *intel_wifi_acpi_name(struct device *dev)
+static const char *intel_wifi_acpi_name(const struct device *dev)
{
return "WIFI";
}
diff --git a/src/drivers/pc80/tpm/tpm.c b/src/drivers/pc80/tpm/tpm.c
index e9730a99c5..c0afd4cdad 100644
--- a/src/drivers/pc80/tpm/tpm.c
+++ b/src/drivers/pc80/tpm/tpm.c
@@ -988,7 +988,7 @@ static void lpc_tpm_fill_ssdt(struct device *dev)
dev->chip_ops->name, dev_path(dev));
}
-static const char *lpc_tpm_acpi_name(struct device *dev)
+static const char *lpc_tpm_acpi_name(const struct device *dev)
{
return "TPM";
}
diff --git a/src/drivers/spi/acpi/acpi.c b/src/drivers/spi/acpi/acpi.c
index 2a39814c3d..d36a03ac20 100644
--- a/src/drivers/spi/acpi/acpi.c
+++ b/src/drivers/spi/acpi/acpi.c
@@ -24,7 +24,7 @@
#include <string.h>
#include "chip.h"
-static int spi_acpi_get_bus(struct device *dev)
+static int spi_acpi_get_bus(const struct device *dev)
{
struct device *spi_dev;
struct device_operations *ops;
@@ -178,7 +178,7 @@ static void spi_acpi_fill_ssdt_generator(struct device *dev)
config->desc ? : dev->chip_ops->name, dev_path(dev));
}
-static const char *spi_acpi_name(struct device *dev)
+static const char *spi_acpi_name(const struct device *dev)
{
struct drivers_spi_acpi_config *config = dev->chip_info;
static char name[5];
diff --git a/src/include/device/device.h b/src/include/device/device.h
index 54d4ec314f..1d2afe8394 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -65,7 +65,7 @@ struct device_operations {
unsigned long start, struct acpi_rsdp *rsdp);
void (*acpi_fill_ssdt_generator)(struct device *dev);
void (*acpi_inject_dsdt_generator)(struct device *dev);
- const char *(*acpi_name)(struct device *dev);
+ const char *(*acpi_name)(const struct device *dev);
#endif
const struct pci_operations *ops_pci;
const struct i2c_bus_operations *ops_i2c_bus;
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";
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 <string.h>
#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;
diff --git a/src/southbridge/amd/cimx/sb800/late.c b/src/southbridge/amd/cimx/sb800/late.c
index 58d3a3432a..ed4f8a5ab3 100644
--- a/src/southbridge/amd/cimx/sb800/late.c
+++ b/src/southbridge/amd/cimx/sb800/late.c
@@ -143,7 +143,7 @@ unsigned long acpi_fill_mcfg(unsigned long current)
return current;
}
-static const char *lpc_acpi_name(struct device *dev)
+static const char *lpc_acpi_name(const struct device *dev)
{
if (dev->path.type != DEVICE_PATH_PCI)
return NULL;
diff --git a/src/southbridge/amd/pi/hudson/lpc.c b/src/southbridge/amd/pi/hudson/lpc.c
index 7a3914a9bd..282f17c1f1 100644
--- a/src/southbridge/amd/pi/hudson/lpc.c
+++ b/src/southbridge/amd/pi/hudson/lpc.c
@@ -339,7 +339,7 @@ unsigned long acpi_fill_mcfg(unsigned long current)
return current;
}
-static const char *lpc_acpi_name(struct device *dev)
+static const char *lpc_acpi_name(const struct device *dev)
{
if (dev->path.type != DEVICE_PATH_PCI)
return NULL;
diff --git a/src/southbridge/amd/sb700/lpc.c b/src/southbridge/amd/sb700/lpc.c
index 2943b96a94..643a5a1300 100644
--- a/src/southbridge/amd/sb700/lpc.c
+++ b/src/southbridge/amd/sb700/lpc.c
@@ -252,7 +252,8 @@ static void southbridge_acpi_fill_ssdt_generator(device_t device) {
amd_generate_powernow(ACPI_CPU_CONTROL, 6, 1);
}
-static const char *lpc_acpi_name(struct device *dev) {
+static const char *lpc_acpi_name(const struct device *dev)
+{
if (dev->path.type != DEVICE_PATH_PCI)
return NULL;
diff --git a/src/southbridge/intel/bd82x6x/azalia.c b/src/southbridge/intel/bd82x6x/azalia.c
index 0e974ba53d..9c8eaf6bff 100644
--- a/src/southbridge/intel/bd82x6x/azalia.c
+++ b/src/southbridge/intel/bd82x6x/azalia.c
@@ -331,7 +331,7 @@ static void azalia_init(struct device *dev)
pci_write_config8(dev, 0x43, reg8);
}
-static const char *azalia_acpi_name(device_t dev)
+static const char *azalia_acpi_name(const struct device *dev)
{
return "HDEF";
}
diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c
index 901f71be18..3f722192e5 100644
--- a/src/southbridge/intel/bd82x6x/lpc.c
+++ b/src/southbridge/intel/bd82x6x/lpc.c
@@ -814,7 +814,7 @@ void acpi_fill_fadt(acpi_fadt_t *fadt)
fadt->x_gpe1_blk.addrh = 0x0;
}
-static const char *lpc_acpi_name(device_t dev)
+static const char *lpc_acpi_name(const struct device *dev)
{
return "LPCB";
}
diff --git a/src/southbridge/intel/bd82x6x/pcie.c b/src/southbridge/intel/bd82x6x/pcie.c
index a3eaba963f..34b7694dcf 100644
--- a/src/southbridge/intel/bd82x6x/pcie.c
+++ b/src/southbridge/intel/bd82x6x/pcie.c
@@ -285,7 +285,7 @@ static void pch_pciexp_scan_bridge(device_t dev)
pch_pcie_pm_late(dev);
}
-static const char *pch_pcie_acpi_name(device_t dev)
+static const char *pch_pcie_acpi_name(const struct device *dev)
{
ASSERT(dev);
diff --git a/src/southbridge/intel/bd82x6x/sata.c b/src/southbridge/intel/bd82x6x/sata.c
index ac4945d011..d4268da7c6 100644
--- a/src/southbridge/intel/bd82x6x/sata.c
+++ b/src/southbridge/intel/bd82x6x/sata.c
@@ -244,7 +244,7 @@ static void sata_set_subsystem(device_t dev, unsigned vendor, unsigned device)
}
}
-static const char *sata_acpi_name(device_t dev)
+static const char *sata_acpi_name(const struct device *dev)
{
return "SATA";
}
diff --git a/src/southbridge/intel/bd82x6x/smbus.c b/src/southbridge/intel/bd82x6x/smbus.c
index 6cbdef987e..339089054a 100644
--- a/src/southbridge/intel/bd82x6x/smbus.c
+++ b/src/southbridge/intel/bd82x6x/smbus.c
@@ -100,7 +100,7 @@ static void smbus_read_resources(device_t dev)
res = pci_get_resource(dev, PCI_BASE_ADDRESS_0);
}
-static const char *smbus_acpi_name(device_t dev)
+static const char *smbus_acpi_name(const struct device *dev)
{
return "SBUS";
}
diff --git a/src/southbridge/intel/bd82x6x/usb_ehci.c b/src/southbridge/intel/bd82x6x/usb_ehci.c
index 42d7a83d98..90b29c4df9 100644
--- a/src/southbridge/intel/bd82x6x/usb_ehci.c
+++ b/src/southbridge/intel/bd82x6x/usb_ehci.c
@@ -94,7 +94,7 @@ static void usb_ehci_set_subsystem(device_t dev, unsigned vendor, unsigned devic
pci_write_config8(dev, 0x80, access_cntl);
}
-static const char *usb_ehci_acpi_name(device_t dev)
+static const char *usb_ehci_acpi_name(const struct device *dev)
{
switch (dev->path.pci.devfn) {
case PCI_DEVFN(0x1a, 0):
diff --git a/src/southbridge/intel/bd82x6x/usb_xhci.c b/src/southbridge/intel/bd82x6x/usb_xhci.c
index 1aeb8643b3..6acc63bb91 100644
--- a/src/southbridge/intel/bd82x6x/usb_xhci.c
+++ b/src/southbridge/intel/bd82x6x/usb_xhci.c
@@ -51,7 +51,7 @@ static void usb_xhci_init(struct device *dev)
printk(BIOS_DEBUG, "done.\n");
}
-static const char *xhci_acpi_name(device_t dev)
+static const char *xhci_acpi_name(const struct device *dev)
{
return "XHC";
}