3 files changed, 10 insertions, 8 deletions
diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c
index c3c946deaa..b506cb41ac 100644
--- a/src/arch/x86/boot/acpi.c
+++ b/src/arch/x86/boot/acpi.c
@@ -141,7 +141,7 @@ int acpi_create_madt_lapic(acpi_madt_lapic_t *lapic, u8 cpu, u8 apic)
 
 unsigned long acpi_create_madt_lapics(unsigned long current)
 {
-	device_t cpu;
+	struct device *cpu;
 	int index = 0;
 
 	for (cpu = all_devices; cpu; cpu = cpu->next) {
@@ -278,7 +278,7 @@ void acpi_create_ssdt_generator(acpi_header_t *ssdt, const char *oem_table_id)
 	acpigen_set_current((char *) current);
 	{
 #if IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
-		device_t dev;
+		struct device *dev;
 		for (dev = all_devices; dev; dev = dev->next)
 			if (dev->ops && dev->ops->acpi_fill_ssdt_generator) {
 				dev->ops->acpi_fill_ssdt_generator();
@@ -708,7 +708,7 @@ unsigned long write_acpi_tables(unsigned long start)
 	acpi_header_t *dsdt;
 	acpi_mcfg_t *mcfg;
 	acpi_madt_t *madt;
-	device_t dev;
+	struct device *dev;
 
 	current = start;
 
diff --git a/src/arch/x86/boot/mpspec.c b/src/arch/x86/boot/mpspec.c
index d079d083b9..8049be4fe5 100644
--- a/src/arch/x86/boot/mpspec.c
+++ b/src/arch/x86/boot/mpspec.c
@@ -166,7 +166,7 @@ void smp_write_processors(struct mp_config_table *mc)
 	unsigned cpu_features;
 	unsigned cpu_feature_flags;
 	struct cpuid_result result;
-	device_t cpu;
+	struct device *cpu;
 
 	boot_apic_id = lapicid();
 	apic_version = lapic_read(LAPIC_LVR) & 0xff;
@@ -493,7 +493,9 @@ unsigned long __attribute__((weak)) write_smp_table(unsigned long addr)
 	struct drivers_generic_ioapic_config *ioapic_config;
 	struct mp_config_table *mc;
 	int isa_bus, pin, parentpin;
-	device_t dev, parent, oldparent;
+	struct device *dev;
+	struct device *parent;
+	struct device *oldparent;
 	void *tmp, *v;
 	int isaioapic = -1, have_fixed_entries;
 
diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/boot/smbios.c
index 724def3419..64889f713c 100644
--- a/src/arch/x86/boot/smbios.c
+++ b/src/arch/x86/boot/smbios.c
@@ -303,7 +303,7 @@ static int smbios_write_type11(unsigned long *current, int *handle)
 {
 	struct smbios_type11 *t = (struct smbios_type11 *)*current;
 	int len;
-	device_t dev;
+	struct device *dev;
 
 	memset(t, 0, sizeof *t);
 	t->type = SMBIOS_OEM_STRINGS;
@@ -379,9 +379,9 @@ static int smbios_write_type127(unsigned long *current, int handle)
 	return len;
 }
 
-static int smbios_walk_device_tree(device_t tree, int *handle, unsigned long *current)
+static int smbios_walk_device_tree(struct device *tree, int *handle, unsigned long *current)
 {
-	device_t dev;
+	struct device *dev;
 	int len = 0;
 
 	for(dev = tree; dev; dev = dev->next) {