10 files changed, 11 insertions, 10 deletions
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";
 }