<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26520">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel/apollolake: Get rid of device_t<br><br>Use of device_t has been abandoned in ramstage.<br><br>Change-Id: Id6bcf98892c1944ec9c7e637f63c4c05fe9a0c07<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/soc/intel/apollolake/chip.c<br>M src/soc/intel/apollolake/cpu.c<br>2 files changed, 7 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/20/26520/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c</span><br><span>index c49f734..24c7a59 100644</span><br><span>--- a/src/soc/intel/apollolake/chip.c</span><br><span>+++ b/src/soc/intel/apollolake/chip.c</span><br><span>@@ -155,7 +155,7 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void pci_domain_set_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void pci_domain_set_resources(struct device *dev)</span><br><span> {</span><br><span> assign_resources(dev->link_list);</span><br><span> }</span><br><span>@@ -178,7 +178,7 @@</span><br><span> .acpi_fill_ssdt_generator = generate_cpu_entries,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void enable_dev(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void enable_dev(struct device *dev)</span><br><span> {</span><br><span> /* Set the operations if it is a special bus type */</span><br><span> if (dev->path.type == DEVICE_PATH_DOMAIN)</span><br><span>@@ -196,7 +196,7 @@</span><br><span> */</span><br><span> static void pcie_update_device_tree(unsigned int devfn0, int num_funcs)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- device_t func0;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *func0;</span><br><span> unsigned int devfn;</span><br><span> int i;</span><br><span> unsigned int inc = PCI_DEVFN(0, 1);</span><br><span>@@ -217,7 +217,7 @@</span><br><span> * as that port was move to func0.</span><br><span> */</span><br><span> for (i = 1; i < num_funcs; i++, devfn += inc) {</span><br><span style="color: hsl(0, 100%, 40%);">- device_t dev = dev_find_slot(0, devfn);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev = dev_find_slot(0, devfn);</span><br><span> if (dev == NULL)</span><br><span> continue;</span><br><span> </span><br><span>diff --git a/src/soc/intel/apollolake/cpu.c b/src/soc/intel/apollolake/cpu.c</span><br><span>index cda11d2..4a7e40a 100644</span><br><span>--- a/src/soc/intel/apollolake/cpu.c</span><br><span>+++ b/src/soc/intel/apollolake/cpu.c</span><br><span>@@ -67,7 +67,7 @@</span><br><span> REG_SCRIPT_END</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void soc_core_init(device_t cpu)</span><br><span style="color: hsl(120, 100%, 40%);">+void soc_core_init(struct device *cpu)</span><br><span> {</span><br><span> /* Clear out pending MCEs */</span><br><span> /* TODO(adurbin): This should only be done on a cold boot. Also, some</span><br><span>@@ -96,7 +96,7 @@</span><br><span> }</span><br><span> </span><br><span> #if !IS_ENABLED(CONFIG_SOC_INTEL_COMMON_BLOCK_CPU_MPINIT)</span><br><span style="color: hsl(0, 100%, 40%);">-static void soc_init_core(device_t cpu)</span><br><span style="color: hsl(120, 100%, 40%);">+static void soc_init_core(struct device *cpu)</span><br><span> {</span><br><span> soc_core_init(cpu);</span><br><span> }</span><br><span>@@ -283,7 +283,7 @@</span><br><span> </span><br><span> int soc_fill_sgx_param(struct sgx_param *sgx_param)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- device_t dev = SA_DEV_ROOT;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev = SA_DEV_ROOT;</span><br><span> assert(dev != NULL);</span><br><span> config_t *conf = dev->chip_info;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26520">change 26520</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/26520"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Id6bcf98892c1944ec9c7e637f63c4c05fe9a0c07 </div>
<div style="display:none"> Gerrit-Change-Number: 26520 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>