<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27004">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel/braswell: Get rid of device_t<br><br>Change-Id: I30ca4d117b1c21b1b4f1935585f17bd8a15a807b<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/soc/intel/braswell/pmutil.c<br>M src/soc/intel/braswell/smihandler.c<br>M src/soc/intel/braswell/spi.c<br>3 files changed, 7 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/27004/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/intel/braswell/pmutil.c b/src/soc/intel/braswell/pmutil.c</span><br><span>index 18e655c..5f078df 100644</span><br><span>--- a/src/soc/intel/braswell/pmutil.c</span><br><span>+++ b/src/soc/intel/braswell/pmutil.c</span><br><span>@@ -27,9 +27,9 @@</span><br><span> </span><br><span> #if defined(__SIMPLE_DEVICE__)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static const device_t pcu_dev = PCI_DEV(0, PCU_DEV, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+static const pci_devfn_t pcu_dev = PCI_DEV(0, PCU_DEV, 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static inline device_t get_pcu_dev(void)</span><br><span style="color: hsl(120, 100%, 40%);">+static inline pci_devfn_t get_pcu_dev(void)</span><br><span> {</span><br><span> return pcu_dev;</span><br><span> }</span><br><span>@@ -38,8 +38,8 @@</span><br><span> #include <device/device.h></span><br><span> #include <device/pci.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static device_t pcu_dev;</span><br><span style="color: hsl(0, 100%, 40%);">-static device_t get_pcu_dev(void)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct device *pcu_dev;</span><br><span style="color: hsl(120, 100%, 40%);">+static struct device *get_pcu_dev(void)</span><br><span> {</span><br><span> if (pcu_dev == NULL)</span><br><span> pcu_dev = dev_find_slot(0, PCI_DEVFN(PCU_DEV, 0));</span><br><span>diff --git a/src/soc/intel/braswell/smihandler.c b/src/soc/intel/braswell/smihandler.c</span><br><span>index 0f5c7c9..edbb766 100644</span><br><span>--- a/src/soc/intel/braswell/smihandler.c</span><br><span>+++ b/src/soc/intel/braswell/smihandler.c</span><br><span>@@ -70,7 +70,7 @@</span><br><span> for (slot = 0; slot < 0x20; slot++) {</span><br><span> for (func = 0; func < 8; func++) {</span><br><span> u32 reg32;</span><br><span style="color: hsl(0, 100%, 40%);">- device_t dev = PCI_DEV(bus, slot, func);</span><br><span style="color: hsl(120, 100%, 40%);">+ pci_devfn_t dev = PCI_DEV(bus, slot, func);</span><br><span> </span><br><span> val = pci_read_config32(dev, PCI_VENDOR_ID);</span><br><span> </span><br><span>diff --git a/src/soc/intel/braswell/spi.c b/src/soc/intel/braswell/spi.c</span><br><span>index b9e1627..f2d178d 100644</span><br><span>--- a/src/soc/intel/braswell/spi.c</span><br><span>+++ b/src/soc/intel/braswell/spi.c</span><br><span>@@ -233,13 +233,12 @@</span><br><span> </span><br><span> static ich9_spi_regs *spi_regs(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- device_t dev;</span><br><span> uint32_t sbase;</span><br><span> </span><br><span> #if ENV_SMM</span><br><span style="color: hsl(0, 100%, 40%);">- dev = PCI_DEV(0, LPC_DEV, LPC_FUNC);</span><br><span style="color: hsl(120, 100%, 40%);">+ pci_devfn_t dev = PCI_DEV(0, LPC_DEV, LPC_FUNC);</span><br><span> #else</span><br><span style="color: hsl(0, 100%, 40%);">- dev = dev_find_slot(0, PCI_DEVFN(LPC_DEV, LPC_FUNC));</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev = dev_find_slot(0, PCI_DEVFN(LPC_DEV, LPC_FUNC));</span><br><span> #endif</span><br><span> if (!dev) {</span><br><span> printk(BIOS_ERR, "%s: PCI device not found", __func__);</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27004">change 27004</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/27004"/><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: I30ca4d117b1c21b1b4f1935585f17bd8a15a807b </div>
<div style="display:none"> Gerrit-Change-Number: 27004 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>