summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/soc/intel/apollolake/chip.c8
-rw-r--r--src/soc/intel/apollolake/cpu.c6
2 files changed, 7 insertions, 7 deletions
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c
index c49f73473e..24c7a599e5 100644
--- a/src/soc/intel/apollolake/chip.c
+++ b/src/soc/intel/apollolake/chip.c
@@ -155,7 +155,7 @@ const char *soc_acpi_name(const struct device *dev)
return NULL;
}
-static void pci_domain_set_resources(device_t dev)
+static void pci_domain_set_resources(struct device *dev)
{
assign_resources(dev->link_list);
}
@@ -178,7 +178,7 @@ static struct device_operations cpu_bus_ops = {
.acpi_fill_ssdt_generator = generate_cpu_entries,
};
-static void enable_dev(device_t dev)
+static void enable_dev(struct device *dev)
{
/* Set the operations if it is a special bus type */
if (dev->path.type == DEVICE_PATH_DOMAIN)
@@ -196,7 +196,7 @@ static void enable_dev(device_t dev)
*/
static void pcie_update_device_tree(unsigned int devfn0, int num_funcs)
{
- device_t func0;
+ struct device *func0;
unsigned int devfn;
int i;
unsigned int inc = PCI_DEVFN(0, 1);
@@ -217,7 +217,7 @@ static void pcie_update_device_tree(unsigned int devfn0, int num_funcs)
* as that port was move to func0.
*/
for (i = 1; i < num_funcs; i++, devfn += inc) {
- device_t dev = dev_find_slot(0, devfn);
+ struct device *dev = dev_find_slot(0, devfn);
if (dev == NULL)
continue;
diff --git a/src/soc/intel/apollolake/cpu.c b/src/soc/intel/apollolake/cpu.c
index cda11d201a..4a7e40a33b 100644
--- a/src/soc/intel/apollolake/cpu.c
+++ b/src/soc/intel/apollolake/cpu.c
@@ -67,7 +67,7 @@ static const struct reg_script core_msr_script[] = {
REG_SCRIPT_END
};
-void soc_core_init(device_t cpu)
+void soc_core_init(struct device *cpu)
{
/* Clear out pending MCEs */
/* TODO(adurbin): This should only be done on a cold boot. Also, some
@@ -96,7 +96,7 @@ void soc_core_init(device_t cpu)
}
#if !IS_ENABLED(CONFIG_SOC_INTEL_COMMON_BLOCK_CPU_MPINIT)
-static void soc_init_core(device_t cpu)
+static void soc_init_core(struct device *cpu)
{
soc_core_init(cpu);
}
@@ -283,7 +283,7 @@ void cpu_lock_sgx_memory(void)
int soc_fill_sgx_param(struct sgx_param *sgx_param)
{
- device_t dev = SA_DEV_ROOT;
+ struct device *dev = SA_DEV_ROOT;
assert(dev != NULL);
config_t *conf = dev->chip_info;