<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26002">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">src/device/pnp_device.c: Get rid of device_t<br><br>Use of `device_t` has been abandoned in ramstage.<br><br>Change-Id: Ic25d1eb3c7f0ed5b65aa1cf9e16c39415b7cd3c7<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/device/pnp_device.c<br>1 file changed, 20 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/26002/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/device/pnp_device.c b/src/device/pnp_device.c</span><br><span>index e7839de..ba05c82 100644</span><br><span>--- a/src/device/pnp_device.c</span><br><span>+++ b/src/device/pnp_device.c</span><br><span>@@ -28,13 +28,13 @@</span><br><span> </span><br><span> /* PNP config mode wrappers */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void pnp_enter_conf_mode(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+void pnp_enter_conf_mode(struct device *dev)</span><br><span> {</span><br><span> if (dev->ops->ops_pnp_mode)</span><br><span> dev->ops->ops_pnp_mode->enter_conf_mode(dev);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void pnp_exit_conf_mode(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+void pnp_exit_conf_mode(struct device *dev)</span><br><span> {</span><br><span> if (dev->ops->ops_pnp_mode)</span><br><span> dev->ops->ops_pnp_mode->exit_conf_mode(dev);</span><br><span>@@ -42,24 +42,24 @@</span><br><span> </span><br><span> /* PNP fundamental operations */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void pnp_write_config(device_t dev, u8 reg, u8 value)</span><br><span style="color: hsl(120, 100%, 40%);">+void pnp_write_config(struct device *dev, u8 reg, u8 value)</span><br><span> {</span><br><span> outb(reg, dev->path.pnp.port);</span><br><span> outb(value, dev->path.pnp.port + 1);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-u8 pnp_read_config(device_t dev, u8 reg)</span><br><span style="color: hsl(120, 100%, 40%);">+u8 pnp_read_config(struct device *dev, u8 reg)</span><br><span> {</span><br><span> outb(reg, dev->path.pnp.port);</span><br><span> return inb(dev->path.pnp.port + 1);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void pnp_set_logical_device(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+void pnp_set_logical_device(struct device *dev)</span><br><span> {</span><br><span> pnp_write_config(dev, 0x07, dev->path.pnp.device & 0xff);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void pnp_set_enable(device_t dev, int enable)</span><br><span style="color: hsl(120, 100%, 40%);">+void pnp_set_enable(struct device *dev, int enable)</span><br><span> {</span><br><span> u8 tmp, bitpos;</span><br><span> </span><br><span>@@ -76,7 +76,7 @@</span><br><span> pnp_write_config(dev, 0x30, tmp);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int pnp_read_enable(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+int pnp_read_enable(struct device *dev)</span><br><span> {</span><br><span> u8 tmp, bitpos;</span><br><span> </span><br><span>@@ -88,20 +88,20 @@</span><br><span> return !!(tmp & (1 << bitpos));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void pnp_set_iobase(device_t dev, u8 index, u16 iobase)</span><br><span style="color: hsl(120, 100%, 40%);">+void pnp_set_iobase(struct device *dev, u8 index, u16 iobase)</span><br><span> {</span><br><span> /* Index == 0x60 or 0x62. */</span><br><span> pnp_write_config(dev, index + 0, (iobase >> 8) & 0xff);</span><br><span> pnp_write_config(dev, index + 1, iobase & 0xff);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void pnp_set_irq(device_t dev, u8 index, u8 irq)</span><br><span style="color: hsl(120, 100%, 40%);">+void pnp_set_irq(struct device *dev, u8 index, u8 irq)</span><br><span> {</span><br><span> /* Index == 0x70 or 0x72. */</span><br><span> pnp_write_config(dev, index, irq);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void pnp_set_drq(device_t dev, u8 index, u8 drq)</span><br><span style="color: hsl(120, 100%, 40%);">+void pnp_set_drq(struct device *dev, u8 index, u8 drq)</span><br><span> {</span><br><span> /* Index == 0x74. */</span><br><span> pnp_write_config(dev, index, drq & 0xff);</span><br><span>@@ -109,12 +109,12 @@</span><br><span> </span><br><span> /* PNP device operations */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void pnp_read_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+void pnp_read_resources(struct device *dev)</span><br><span> {</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void pnp_set_resource(device_t dev, struct resource *resource)</span><br><span style="color: hsl(120, 100%, 40%);">+static void pnp_set_resource(struct device *dev, struct resource *resource)</span><br><span> {</span><br><span> if (!(resource->flags & IORESOURCE_ASSIGNED)) {</span><br><span> printk(BIOS_ERR, "ERROR: %s %02lx %s size: 0x%010llx "</span><br><span>@@ -140,7 +140,7 @@</span><br><span> report_resource_stored(dev, resource, "");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void pnp_set_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+void pnp_set_resources(struct device *dev)</span><br><span> {</span><br><span> struct resource *res;</span><br><span> </span><br><span>@@ -156,7 +156,7 @@</span><br><span> pnp_exit_conf_mode(dev);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void pnp_enable_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+void pnp_enable_resources(struct device *dev)</span><br><span> {</span><br><span> pnp_enter_conf_mode(dev);</span><br><span> pnp_set_logical_device(dev);</span><br><span>@@ -164,7 +164,7 @@</span><br><span> pnp_exit_conf_mode(dev);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void pnp_enable(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+void pnp_enable(struct device *dev)</span><br><span> {</span><br><span> if (!dev->enabled) {</span><br><span> pnp_enter_conf_mode(dev);</span><br><span>@@ -174,7 +174,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void pnp_alt_enable(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+void pnp_alt_enable(struct device *dev)</span><br><span> {</span><br><span> pnp_enter_conf_mode(dev);</span><br><span> pnp_set_logical_device(dev);</span><br><span>@@ -191,7 +191,7 @@</span><br><span> </span><br><span> /* PNP chip operations */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void pnp_get_ioresource(device_t dev, u8 index, u16 mask)</span><br><span style="color: hsl(120, 100%, 40%);">+static void pnp_get_ioresource(struct device *dev, u8 index, u16 mask)</span><br><span> {</span><br><span> struct resource *resource;</span><br><span> unsigned moving, gran, step;</span><br><span>@@ -242,7 +242,7 @@</span><br><span> resource->size = 1 << gran;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void get_resources(device_t dev, struct pnp_info *info)</span><br><span style="color: hsl(120, 100%, 40%);">+static void get_resources(struct device *dev, struct pnp_info *info)</span><br><span> {</span><br><span> struct resource *resource;</span><br><span> </span><br><span>@@ -363,11 +363,11 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void pnp_enable_devices(device_t base_dev, struct device_operations *ops,</span><br><span style="color: hsl(120, 100%, 40%);">+void pnp_enable_devices(struct device *base_dev, struct device_operations *ops,</span><br><span> unsigned int functions, struct pnp_info *info)</span><br><span> {</span><br><span> struct device_path path;</span><br><span style="color: hsl(0, 100%, 40%);">- device_t dev;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev;</span><br><span> int i;</span><br><span> </span><br><span> path.type = DEVICE_PATH_PNP;</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26002">change 26002</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/26002"/><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: Ic25d1eb3c7f0ed5b65aa1cf9e16c39415b7cd3c7 </div>
<div style="display:none"> Gerrit-Change-Number: 26002 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>