<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26084">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/gigabyte: Get rid of device_t<br><br>Use of device_t has been abandoned in ramstage.<br><br>Change-Id: I37ba054022241c93c03e6c804e46f4e8a1c1143e<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c<br>M src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c<br>M src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c<br>M src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c<br>M src/mainboard/gigabyte/ga_2761gxdk/mptable.c<br>M src/mainboard/gigabyte/m57sli/acpi_tables.c<br>M src/mainboard/gigabyte/m57sli/get_bus_conf.c<br>M src/mainboard/gigabyte/m57sli/mptable.c<br>M src/mainboard/gigabyte/ma785gm/get_bus_conf.c<br>M src/mainboard/gigabyte/ma785gm/mainboard.c<br>M src/mainboard/gigabyte/ma785gm/mptable.c<br>M src/mainboard/gigabyte/ma785gmt/get_bus_conf.c<br>M src/mainboard/gigabyte/ma785gmt/mainboard.c<br>M src/mainboard/gigabyte/ma785gmt/mptable.c<br>M src/mainboard/gigabyte/ma78gm/get_bus_conf.c<br>M src/mainboard/gigabyte/ma78gm/mainboard.c<br>M src/mainboard/gigabyte/ma78gm/mptable.c<br>17 files changed, 29 insertions(+), 29 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/84/26084/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c b/src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c</span><br><span>index 590e25f..7bc353c 100644</span><br><span>--- a/src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c</span><br><span>+++ b/src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c</span><br><span>@@ -33,7 +33,7 @@</span><br><span> #include <device/pci.h></span><br><span> #include <cbfs.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void mainboard_init(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void mainboard_init(struct device *dev)</span><br><span> {</span><br><span>         RCBA32(0x38c8) = 0x00002005;</span><br><span>         RCBA32(0x38c4) = 0x00802005;</span><br><span>@@ -72,7 +72,7 @@</span><br><span> // mainboard_enable is executed as first thing after</span><br><span> // enumerate_buses().</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void mainboard_enable(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void mainboard_enable(struct device *dev)</span><br><span> {</span><br><span>       dev->ops->init = mainboard_init;</span><br><span> </span><br><span>diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c b/src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c</span><br><span>index 590e25f..7bc353c 100644</span><br><span>--- a/src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c</span><br><span>+++ b/src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c</span><br><span>@@ -33,7 +33,7 @@</span><br><span> #include <device/pci.h></span><br><span> #include <cbfs.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void mainboard_init(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void mainboard_init(struct device *dev)</span><br><span> {</span><br><span>     RCBA32(0x38c8) = 0x00002005;</span><br><span>         RCBA32(0x38c4) = 0x00802005;</span><br><span>@@ -72,7 +72,7 @@</span><br><span> // mainboard_enable is executed as first thing after</span><br><span> // enumerate_buses().</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void mainboard_enable(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void mainboard_enable(struct device *dev)</span><br><span> {</span><br><span>       dev->ops->init = mainboard_init;</span><br><span> </span><br><span>diff --git a/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c b/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c</span><br><span>index 53171c2..75f6b9f 100644</span><br><span>--- a/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c</span><br><span>+++ b/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c</span><br><span>@@ -63,7 +63,7 @@</span><br><span>      unsigned apicid_base;</span><br><span>        unsigned sbdn;</span><br><span> </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>   if (get_bus_conf_done == 1)</span><br><span>diff --git a/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c b/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c</span><br><span>index d1168a7..d2bc182 100644</span><br><span>--- a/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c</span><br><span>+++ b/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c</span><br><span>@@ -109,7 +109,7 @@</span><br><span>   printk(BIOS_INFO, "done.\n");</span><br><span> </span><br><span>  {</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>          dev = dev_find_slot(0, PCI_DEVFN(2, 0));</span><br><span>             if (dev) {</span><br><span>                   /* initialize PCI interupts - these assignments depend</span><br><span>diff --git a/src/mainboard/gigabyte/ga_2761gxdk/mptable.c b/src/mainboard/gigabyte/ga_2761gxdk/mptable.c</span><br><span>index 991f24e..ae59264 100644</span><br><span>--- a/src/mainboard/gigabyte/ga_2761gxdk/mptable.c</span><br><span>+++ b/src/mainboard/gigabyte/ga_2761gxdk/mptable.c</span><br><span>@@ -47,7 +47,7 @@</span><br><span> </span><br><span> /*I/O APICs:     APIC ID Version State           Address*/</span><br><span>    {</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>          struct resource *res;</span><br><span>                uint32_t dword;</span><br><span> </span><br><span>diff --git a/src/mainboard/gigabyte/m57sli/acpi_tables.c b/src/mainboard/gigabyte/m57sli/acpi_tables.c</span><br><span>index 3188af3..72b82f5 100644</span><br><span>--- a/src/mainboard/gigabyte/m57sli/acpi_tables.c</span><br><span>+++ b/src/mainboard/gigabyte/m57sli/acpi_tables.c</span><br><span>@@ -38,7 +38,7 @@</span><br><span> </span><br><span>         unsigned sbdn;</span><br><span>       struct resource *res;</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> </span><br><span>      get_bus_conf();</span><br><span>      sbdn = sysconf.sbdn;</span><br><span>diff --git a/src/mainboard/gigabyte/m57sli/get_bus_conf.c b/src/mainboard/gigabyte/m57sli/get_bus_conf.c</span><br><span>index 9d13b0c..5ef7962 100644</span><br><span>--- a/src/mainboard/gigabyte/m57sli/get_bus_conf.c</span><br><span>+++ b/src/mainboard/gigabyte/m57sli/get_bus_conf.c</span><br><span>@@ -61,7 +61,7 @@</span><br><span>        unsigned apicid_base;</span><br><span>        unsigned sbdn;</span><br><span> </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>   if (get_bus_conf_done == 1)</span><br><span>diff --git a/src/mainboard/gigabyte/m57sli/mptable.c b/src/mainboard/gigabyte/m57sli/mptable.c</span><br><span>index 019a7f5..e9ffe52 100644</span><br><span>--- a/src/mainboard/gigabyte/m57sli/mptable.c</span><br><span>+++ b/src/mainboard/gigabyte/m57sli/mptable.c</span><br><span>@@ -46,7 +46,7 @@</span><br><span> </span><br><span> /*I/O APICs:    APIC ID Version State           Address*/</span><br><span>    {</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>          struct resource *res;</span><br><span> </span><br><span>            dev = dev_find_slot(bus_mcp55[0], PCI_DEVFN(sbdn+ 0x1,0));</span><br><span>diff --git a/src/mainboard/gigabyte/ma785gm/get_bus_conf.c b/src/mainboard/gigabyte/ma785gm/get_bus_conf.c</span><br><span>index 8931d95..18cf0a8 100644</span><br><span>--- a/src/mainboard/gigabyte/ma785gm/get_bus_conf.c</span><br><span>+++ b/src/mainboard/gigabyte/ma785gm/get_bus_conf.c</span><br><span>@@ -57,7 +57,7 @@</span><br><span> void get_bus_conf(void)</span><br><span> {</span><br><span>      u32 apicid_base;</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>   if (get_bus_conf_done == 1)</span><br><span>diff --git a/src/mainboard/gigabyte/ma785gm/mainboard.c b/src/mainboard/gigabyte/ma785gm/mainboard.c</span><br><span>index ac53c43..a95686c 100644</span><br><span>--- a/src/mainboard/gigabyte/ma785gm/mainboard.c</span><br><span>+++ b/src/mainboard/gigabyte/ma785gm/mainboard.c</span><br><span>@@ -31,7 +31,7 @@</span><br><span> {</span><br><span>    u8 byte;</span><br><span>     u16 word;</span><br><span style="color: hsl(0, 100%, 40%);">-       device_t sm_dev;</span><br><span style="color: hsl(120, 100%, 40%);">+      struct device *sm_dev;</span><br><span>       /* set 0 to bit1 :disable GPM9 as SLP_S2 output */</span><br><span>   /* set 0 to bit2 :disable GPM8 as AZ_RST output */</span><br><span>   byte = pm_ioread(0x8d);</span><br><span>@@ -56,7 +56,7 @@</span><br><span> {</span><br><span>     u8 byte;</span><br><span>     u16 word;</span><br><span style="color: hsl(0, 100%, 40%);">-       device_t sm_dev;</span><br><span style="color: hsl(120, 100%, 40%);">+      struct device *sm_dev;</span><br><span> </span><br><span>   /* set 0 to bit1 :disable GPM9 as SLP_S2 output */</span><br><span>   /* set 0 to bit2 :disable GPM8 as AZ_RST output */</span><br><span>@@ -94,7 +94,7 @@</span><br><span>       u8 byte;</span><br><span> //  u16 word;</span><br><span>    u32 dword;</span><br><span style="color: hsl(0, 100%, 40%);">-      device_t sm_dev;</span><br><span style="color: hsl(120, 100%, 40%);">+      struct device *sm_dev;</span><br><span>       /* disable the GPIO40 as CLKREQ2# function */</span><br><span>        byte = pm_ioread(0xd3);</span><br><span>      byte &= ~(1 << 7);</span><br><span>@@ -130,7 +130,7 @@</span><br><span> * enable the dedicated function in ma785gm board.</span><br><span> * This function called early than rs780_enable.</span><br><span> *************************************************/</span><br><span style="color: hsl(0, 100%, 40%);">-static void mainboard_enable(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void mainboard_enable(struct device *dev)</span><br><span> {</span><br><span>    printk(BIOS_INFO, "Mainboard MA785GM-US2H Enable. dev=0x%p\n", dev);</span><br><span> </span><br><span>diff --git a/src/mainboard/gigabyte/ma785gm/mptable.c b/src/mainboard/gigabyte/ma785gm/mptable.c</span><br><span>index 3f9d7c7..379f04a 100644</span><br><span>--- a/src/mainboard/gigabyte/ma785gm/mptable.c</span><br><span>+++ b/src/mainboard/gigabyte/ma785gm/mptable.c</span><br><span>@@ -46,7 +46,7 @@</span><br><span> </span><br><span>      /* I/O APICs:   APIC ID Version State   Address */</span><br><span>   {</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>          u32 dword;</span><br><span>           u8 byte;</span><br><span> </span><br><span>diff --git a/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c b/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c</span><br><span>index 8931d95..18cf0a8 100644</span><br><span>--- a/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c</span><br><span>+++ b/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c</span><br><span>@@ -57,7 +57,7 @@</span><br><span> void get_bus_conf(void)</span><br><span> {</span><br><span>        u32 apicid_base;</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>   if (get_bus_conf_done == 1)</span><br><span>diff --git a/src/mainboard/gigabyte/ma785gmt/mainboard.c b/src/mainboard/gigabyte/ma785gmt/mainboard.c</span><br><span>index 187c30e..acc88fd 100644</span><br><span>--- a/src/mainboard/gigabyte/ma785gmt/mainboard.c</span><br><span>+++ b/src/mainboard/gigabyte/ma785gmt/mainboard.c</span><br><span>@@ -41,7 +41,7 @@</span><br><span> {</span><br><span>        u8 byte;</span><br><span>     u16 word;</span><br><span style="color: hsl(0, 100%, 40%);">-       device_t sm_dev;</span><br><span style="color: hsl(120, 100%, 40%);">+      struct device *sm_dev;</span><br><span>       /* set 0 to bit1 :disable GPM9 as SLP_S2 output */</span><br><span>   /* set 0 to bit2 :disable GPM8 as AZ_RST output */</span><br><span>   byte = pm_ioread(0x8d);</span><br><span>@@ -66,7 +66,7 @@</span><br><span> {</span><br><span>     u8 byte;</span><br><span>     u16 word;</span><br><span style="color: hsl(0, 100%, 40%);">-       device_t sm_dev;</span><br><span style="color: hsl(120, 100%, 40%);">+      struct device *sm_dev;</span><br><span> </span><br><span>   /* set 0 to bit1 :disable GPM9 as SLP_S2 output */</span><br><span>   /* set 0 to bit2 :disable GPM8 as AZ_RST output */</span><br><span>@@ -94,7 +94,7 @@</span><br><span> int is_dev3_present(void)</span><br><span> {</span><br><span>     u16 word;</span><br><span style="color: hsl(0, 100%, 40%);">-       device_t sm_dev;</span><br><span style="color: hsl(120, 100%, 40%);">+      struct device *sm_dev;</span><br><span> </span><br><span>   /* access the smbus extended register */</span><br><span>     sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));</span><br><span>@@ -124,7 +124,7 @@</span><br><span>         u8 byte;</span><br><span> //  u16 word;</span><br><span>    u32 dword;</span><br><span style="color: hsl(0, 100%, 40%);">-      device_t sm_dev;</span><br><span style="color: hsl(120, 100%, 40%);">+      struct device *sm_dev;</span><br><span>       /* disable the GPIO40 as CLKREQ2# function */</span><br><span>        byte = pm_ioread(0xd3);</span><br><span>      byte &= ~(1 << 7);</span><br><span>@@ -179,7 +179,7 @@</span><br><span> {</span><br><span>      u8 byte;</span><br><span>     u16 word;</span><br><span style="color: hsl(0, 100%, 40%);">-       device_t sm_dev;</span><br><span style="color: hsl(120, 100%, 40%);">+      struct device *sm_dev;</span><br><span> </span><br><span>   /* set ADT 7461 */</span><br><span>   ADT7461_write_byte(0x0B, 0x50); /* Local Temperature Hight limit */</span><br><span>@@ -240,7 +240,7 @@</span><br><span> * enable the dedicated function in ma785gmt board.</span><br><span> * This function called early than rs780_enable.</span><br><span> *************************************************/</span><br><span style="color: hsl(0, 100%, 40%);">-static void mainboard_enable(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void mainboard_enable(struct device *dev)</span><br><span> {</span><br><span>    printk(BIOS_INFO, "Mainboard MA785GMT-UD2H Enable. dev=0x%p\n", dev);</span><br><span> </span><br><span>diff --git a/src/mainboard/gigabyte/ma785gmt/mptable.c b/src/mainboard/gigabyte/ma785gmt/mptable.c</span><br><span>index 3f9d7c7..379f04a 100644</span><br><span>--- a/src/mainboard/gigabyte/ma785gmt/mptable.c</span><br><span>+++ b/src/mainboard/gigabyte/ma785gmt/mptable.c</span><br><span>@@ -46,7 +46,7 @@</span><br><span> </span><br><span>         /* I/O APICs:   APIC ID Version State   Address */</span><br><span>   {</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>          u32 dword;</span><br><span>           u8 byte;</span><br><span> </span><br><span>diff --git a/src/mainboard/gigabyte/ma78gm/get_bus_conf.c b/src/mainboard/gigabyte/ma78gm/get_bus_conf.c</span><br><span>index 8931d95..18cf0a8 100644</span><br><span>--- a/src/mainboard/gigabyte/ma78gm/get_bus_conf.c</span><br><span>+++ b/src/mainboard/gigabyte/ma78gm/get_bus_conf.c</span><br><span>@@ -57,7 +57,7 @@</span><br><span> void get_bus_conf(void)</span><br><span> {</span><br><span>        u32 apicid_base;</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>   if (get_bus_conf_done == 1)</span><br><span>diff --git a/src/mainboard/gigabyte/ma78gm/mainboard.c b/src/mainboard/gigabyte/ma78gm/mainboard.c</span><br><span>index 505ba3e..cdfefbb 100644</span><br><span>--- a/src/mainboard/gigabyte/ma78gm/mainboard.c</span><br><span>+++ b/src/mainboard/gigabyte/ma78gm/mainboard.c</span><br><span>@@ -34,7 +34,7 @@</span><br><span> void set_pcie_dereset()</span><br><span> {</span><br><span>     u16 word;</span><br><span style="color: hsl(0, 100%, 40%);">-       device_t sm_dev;</span><br><span style="color: hsl(120, 100%, 40%);">+      struct device *sm_dev;</span><br><span>       /* GPIO 6 reset PCIe slot, GPIO 4 reset GFX PCIe */</span><br><span>  sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));</span><br><span> </span><br><span>@@ -47,7 +47,7 @@</span><br><span> void set_pcie_reset()</span><br><span> {</span><br><span>         u16 word;</span><br><span style="color: hsl(0, 100%, 40%);">-       device_t sm_dev;</span><br><span style="color: hsl(120, 100%, 40%);">+      struct device *sm_dev;</span><br><span>       /* GPIO 6 reset PCIe slot, GPIO 4 reset GFX PCIe */</span><br><span>  sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));</span><br><span> </span><br><span>@@ -67,7 +67,7 @@</span><br><span> * enable the dedicated function in board.</span><br><span> * This function called early than rs780_enable.</span><br><span> *************************************************/</span><br><span style="color: hsl(0, 100%, 40%);">-static void mainboard_enable(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void mainboard_enable(struct device *dev)</span><br><span> {</span><br><span>        printk(BIOS_INFO, "Mainboard MA78GM-US2H Enable. dev=0x%p\n", dev);</span><br><span> </span><br><span>diff --git a/src/mainboard/gigabyte/ma78gm/mptable.c b/src/mainboard/gigabyte/ma78gm/mptable.c</span><br><span>index 3f9d7c7..379f04a 100644</span><br><span>--- a/src/mainboard/gigabyte/ma78gm/mptable.c</span><br><span>+++ b/src/mainboard/gigabyte/ma78gm/mptable.c</span><br><span>@@ -46,7 +46,7 @@</span><br><span> </span><br><span>   /* I/O APICs:   APIC ID Version State   Address */</span><br><span>   {</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>          u32 dword;</span><br><span>           u8 byte;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26084">change 26084</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/26084"/><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: I37ba054022241c93c03e6c804e46f4e8a1c1143e </div>
<div style="display:none"> Gerrit-Change-Number: 26084 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>