<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26086">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/google: Get rid of device_t<br><br>Use of device_t has been abandoned in ramstage.<br><br>Change-Id: I8e549e4222ae2ed6b9c46f81c5b5253e8b227ee8<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/mainboard/google/auron/mainboard.c<br>M src/mainboard/google/auron/variant.h<br>M src/mainboard/google/auron/variants/auron_paine/variant.c<br>M src/mainboard/google/auron/variants/auron_yuna/variant.c<br>M src/mainboard/google/auron/variants/gandof/variant.c<br>M src/mainboard/google/auron/variants/lulu/variant.c<br>M src/mainboard/google/auron/variants/samus/variant.c<br>M src/mainboard/google/beltino/chromeos.c<br>M src/mainboard/google/beltino/mainboard.c<br>M src/mainboard/google/butterfly/chromeos.c<br>M src/mainboard/google/butterfly/mainboard.c<br>M src/mainboard/google/chell/mainboard.c<br>M src/mainboard/google/cheza/mainboard.c<br>M src/mainboard/google/cyan/mainboard.c<br>M src/mainboard/google/daisy/mainboard.c<br>M src/mainboard/google/eve/mainboard.c<br>M src/mainboard/google/fizz/mainboard.c<br>M src/mainboard/google/foster/mainboard.c<br>M src/mainboard/google/gale/mainboard.c<br>M src/mainboard/google/glados/mainboard.c<br>M src/mainboard/google/gru/mainboard.c<br>M src/mainboard/google/jecht/chromeos.c<br>M src/mainboard/google/jecht/mainboard.c<br>M src/mainboard/google/kahlee/mainboard.c<br>M src/mainboard/google/kahlee/mptable.c<br>M src/mainboard/google/lars/mainboard.c<br>M src/mainboard/google/link/mainboard.c<br>M src/mainboard/google/nyan/mainboard.c<br>M src/mainboard/google/nyan_big/mainboard.c<br>M src/mainboard/google/nyan_blaze/mainboard.c<br>M src/mainboard/google/oak/mainboard.c<br>M src/mainboard/google/octopus/mainboard.c<br>M src/mainboard/google/parrot/chromeos.c<br>M src/mainboard/google/parrot/mainboard.c<br>M src/mainboard/google/peach_pit/mainboard.c<br>M src/mainboard/google/poppy/mainboard.c<br>M src/mainboard/google/poppy/variants/nami/mainboard.c<br>M src/mainboard/google/poppy/variants/nami/pl2.c<br>M src/mainboard/google/purin/mainboard.c<br>M src/mainboard/google/rambi/mainboard.c<br>M src/mainboard/google/reef/mainboard.c<br>M src/mainboard/google/rotor/mainboard.c<br>M src/mainboard/google/slippy/mainboard.c<br>M src/mainboard/google/smaug/mainboard.c<br>M src/mainboard/google/storm/mainboard.c<br>M src/mainboard/google/stout/chromeos.c<br>M src/mainboard/google/stout/mainboard.c<br>M src/mainboard/google/urara/mainboard.c<br>M src/mainboard/google/veyron/mainboard.c<br>M src/mainboard/google/veyron_mickey/mainboard.c<br>M src/mainboard/google/veyron_rialto/mainboard.c<br>M src/mainboard/google/zoombini/mainboard.c<br>52 files changed, 107 insertions(+), 107 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/86/26086/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/auron/mainboard.c b/src/mainboard/google/auron/mainboard.c</span><br><span>index ca0c083..9eece73 100644</span><br><span>--- a/src/mainboard/google/auron/mainboard.c</span><br><span>+++ b/src/mainboard/google/auron/mainboard.c</span><br><span>@@ -20,12 +20,12 @@</span><br><span> #include "variant.h"</span><br><span> </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> mainboard_ec_init();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int mainboard_smbios_data(device_t dev, int *handle,</span><br><span style="color: hsl(120, 100%, 40%);">+static int mainboard_smbios_data(struct device *dev, int *handle,</span><br><span> unsigned long *current)</span><br><span> {</span><br><span> return variant_smbios_data(dev, handle, current);</span><br><span>@@ -34,7 +34,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> dev->ops->get_smbios_data = mainboard_smbios_data;</span><br><span>diff --git a/src/mainboard/google/auron/variant.h b/src/mainboard/google/auron/variant.h</span><br><span>index 41c157f..eeae2fe 100644</span><br><span>--- a/src/mainboard/google/auron/variant.h</span><br><span>+++ b/src/mainboard/google/auron/variant.h</span><br><span>@@ -18,7 +18,7 @@</span><br><span> #include <device/device.h></span><br><span> #include <soc/romstage.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int variant_smbios_data(device_t dev, int *handle, unsigned long *current);</span><br><span style="color: hsl(120, 100%, 40%);">+int variant_smbios_data(struct device *dev, int *handle, unsigned long *current);</span><br><span> void variant_romstage_entry(struct romstage_params *rp);</span><br><span> </span><br><span> #endif</span><br><span>diff --git a/src/mainboard/google/auron/variants/auron_paine/variant.c b/src/mainboard/google/auron/variants/auron_paine/variant.c</span><br><span>index f1af14d..438a1f4 100644</span><br><span>--- a/src/mainboard/google/auron/variants/auron_paine/variant.c</span><br><span>+++ b/src/mainboard/google/auron/variants/auron_paine/variant.c</span><br><span>@@ -16,7 +16,7 @@</span><br><span> #include <variant/onboard.h></span><br><span> #include <mainboard/google/auron/variant.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int variant_smbios_data(device_t dev, int *handle,</span><br><span style="color: hsl(120, 100%, 40%);">+int variant_smbios_data(struct device *dev, int *handle,</span><br><span> unsigned long *current)</span><br><span> {</span><br><span> int len = 0;</span><br><span>diff --git a/src/mainboard/google/auron/variants/auron_yuna/variant.c b/src/mainboard/google/auron/variants/auron_yuna/variant.c</span><br><span>index f1af14d..438a1f4 100644</span><br><span>--- a/src/mainboard/google/auron/variants/auron_yuna/variant.c</span><br><span>+++ b/src/mainboard/google/auron/variants/auron_yuna/variant.c</span><br><span>@@ -16,7 +16,7 @@</span><br><span> #include <variant/onboard.h></span><br><span> #include <mainboard/google/auron/variant.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int variant_smbios_data(device_t dev, int *handle,</span><br><span style="color: hsl(120, 100%, 40%);">+int variant_smbios_data(struct device *dev, int *handle,</span><br><span> unsigned long *current)</span><br><span> {</span><br><span> int len = 0;</span><br><span>diff --git a/src/mainboard/google/auron/variants/gandof/variant.c b/src/mainboard/google/auron/variants/gandof/variant.c</span><br><span>index ad88f0d..be1a689 100644</span><br><span>--- a/src/mainboard/google/auron/variants/gandof/variant.c</span><br><span>+++ b/src/mainboard/google/auron/variants/gandof/variant.c</span><br><span>@@ -18,7 +18,7 @@</span><br><span> #include <variant/onboard.h></span><br><span> #include <mainboard/google/auron/variant.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int variant_smbios_data(device_t dev, int *handle,</span><br><span style="color: hsl(120, 100%, 40%);">+int variant_smbios_data(struct device *dev, int *handle,</span><br><span> unsigned long *current)</span><br><span> {</span><br><span> int len = 0;</span><br><span>diff --git a/src/mainboard/google/auron/variants/lulu/variant.c b/src/mainboard/google/auron/variants/lulu/variant.c</span><br><span>index 9d77c27..e63e6a1 100644</span><br><span>--- a/src/mainboard/google/auron/variants/lulu/variant.c</span><br><span>+++ b/src/mainboard/google/auron/variants/lulu/variant.c</span><br><span>@@ -18,7 +18,7 @@</span><br><span> #include <variant/onboard.h></span><br><span> #include <mainboard/google/auron/variant.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int variant_smbios_data(device_t dev, int *handle,</span><br><span style="color: hsl(120, 100%, 40%);">+int variant_smbios_data(struct device *dev, int *handle,</span><br><span> unsigned long *current)</span><br><span> {</span><br><span> int len = 0;</span><br><span>diff --git a/src/mainboard/google/auron/variants/samus/variant.c b/src/mainboard/google/auron/variants/samus/variant.c</span><br><span>index 0c50e1f..2e7d6f7 100644</span><br><span>--- a/src/mainboard/google/auron/variants/samus/variant.c</span><br><span>+++ b/src/mainboard/google/auron/variants/samus/variant.c</span><br><span>@@ -26,7 +26,7 @@</span><br><span> return samus_board_version();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int variant_smbios_data(device_t dev, int *handle,</span><br><span style="color: hsl(120, 100%, 40%);">+int variant_smbios_data(struct device *dev, int *handle,</span><br><span> unsigned long *current)</span><br><span> {</span><br><span> /* N/A for SAMUS */</span><br><span>diff --git a/src/mainboard/google/beltino/chromeos.c b/src/mainboard/google/beltino/chromeos.c</span><br><span>index 7412c62..7b01ebb 100644</span><br><span>--- a/src/mainboard/google/beltino/chromeos.c</span><br><span>+++ b/src/mainboard/google/beltino/chromeos.c</span><br><span>@@ -48,7 +48,7 @@</span><br><span> </span><br><span> int get_write_protect_state(void)</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> #ifdef __PRE_RAM__</span><br><span> dev = PCI_DEV(0, 0x1f, 2);</span><br><span> #else</span><br><span>@@ -59,7 +59,7 @@</span><br><span> </span><br><span> int get_recovery_mode_switch(void)</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> #ifdef __PRE_RAM__</span><br><span> dev = PCI_DEV(0, 0x1f, 2);</span><br><span> #else</span><br><span>diff --git a/src/mainboard/google/beltino/mainboard.c b/src/mainboard/google/beltino/mainboard.c</span><br><span>index 00c1da0..eb1d31c 100644</span><br><span>--- a/src/mainboard/google/beltino/mainboard.c</span><br><span>+++ b/src/mainboard/google/beltino/mainboard.c</span><br><span>@@ -40,7 +40,7 @@</span><br><span> </span><br><span> </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> lan_init();</span><br><span> }</span><br><span>@@ -48,7 +48,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> dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;</span><br><span>diff --git a/src/mainboard/google/butterfly/chromeos.c b/src/mainboard/google/butterfly/chromeos.c</span><br><span>index 42f6189..a1603d4 100644</span><br><span>--- a/src/mainboard/google/butterfly/chromeos.c</span><br><span>+++ b/src/mainboard/google/butterfly/chromeos.c</span><br><span>@@ -37,7 +37,7 @@</span><br><span> </span><br><span> void fill_lb_gpios(struct lb_gpios *gpios)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- device_t dev = dev_find_slot(0, PCI_DEVFN(0x1f,0));</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev = dev_find_slot(0, PCI_DEVFN(0x1f,0));</span><br><span> u16 gpio_base = pci_read_config16(dev, GPIOBASE) & 0xfffe;</span><br><span> </span><br><span> int lidswitch = 0;</span><br><span>diff --git a/src/mainboard/google/butterfly/mainboard.c b/src/mainboard/google/butterfly/mainboard.c</span><br><span>index a100981..e7235ed 100644</span><br><span>--- a/src/mainboard/google/butterfly/mainboard.c</span><br><span>+++ b/src/mainboard/google/butterfly/mainboard.c</span><br><span>@@ -181,7 +181,7 @@</span><br><span> ec_mem_write(EC_KBID_REG, kbd_type);</span><br><span> }</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> u32 search_address = 0x0;</span><br><span> size_t search_length = -1;</span><br><span>@@ -254,7 +254,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int butterfly_onboard_smbios_data(device_t dev, int *handle,</span><br><span style="color: hsl(120, 100%, 40%);">+static int butterfly_onboard_smbios_data(struct device *dev, int *handle,</span><br><span> unsigned long *current)</span><br><span> {</span><br><span> int len = 0;</span><br><span>@@ -274,7 +274,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> dev->ops->get_smbios_data = butterfly_onboard_smbios_data;</span><br><span>diff --git a/src/mainboard/google/chell/mainboard.c b/src/mainboard/google/chell/mainboard.c</span><br><span>index bfa79b4..e2cf9ad 100644</span><br><span>--- a/src/mainboard/google/chell/mainboard.c</span><br><span>+++ b/src/mainboard/google/chell/mainboard.c</span><br><span>@@ -23,13 +23,13 @@</span><br><span> #include <vendorcode/google/chromeos/chromeos.h></span><br><span> #include "ec.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> mainboard_ec_init();</span><br><span> }</span><br><span> </span><br><span> static unsigned long mainboard_write_acpi_tables(</span><br><span style="color: hsl(0, 100%, 40%);">- device_t device, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *device, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span> {</span><br><span> uintptr_t start_addr;</span><br><span> uintptr_t end_addr;</span><br><span>@@ -66,7 +66,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> dev->ops->write_acpi_tables = mainboard_write_acpi_tables;</span><br><span>diff --git a/src/mainboard/google/cheza/mainboard.c b/src/mainboard/google/cheza/mainboard.c</span><br><span>index c249a32..568d486 100644</span><br><span>--- a/src/mainboard/google/cheza/mainboard.c</span><br><span>+++ b/src/mainboard/google/cheza/mainboard.c</span><br><span>@@ -17,12 +17,12 @@</span><br><span> #include <bootblock_common.h></span><br><span> #include <timestamp.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> </span><br><span> }</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/google/cyan/mainboard.c b/src/mainboard/google/cyan/mainboard.c</span><br><span>index e5ad945..4cce5a5 100644</span><br><span>--- a/src/mainboard/google/cyan/mainboard.c</span><br><span>+++ b/src/mainboard/google/cyan/mainboard.c</span><br><span>@@ -19,7 +19,7 @@</span><br><span> #include <vendorcode/google/chromeos/chromeos.h></span><br><span> #include "ec.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> mainboard_ec_init();</span><br><span> }</span><br><span>@@ -28,7 +28,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> dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;</span><br><span>diff --git a/src/mainboard/google/daisy/mainboard.c b/src/mainboard/google/daisy/mainboard.c</span><br><span>index 336a9e5..b6c5518 100644</span><br><span>--- a/src/mainboard/google/daisy/mainboard.c</span><br><span>+++ b/src/mainboard/google/daisy/mainboard.c</span><br><span>@@ -252,7 +252,7 @@</span><br><span> }</span><br><span> </span><br><span> /* this happens after cpu_init where exynos resources are set */</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> int dp_tries;</span><br><span> struct s5p_dp_device dp_device = {</span><br><span>@@ -316,7 +316,7 @@</span><br><span> // gpio_info();</span><br><span> }</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/google/eve/mainboard.c b/src/mainboard/google/eve/mainboard.c</span><br><span>index d30eff2..b9ad358 100644</span><br><span>--- a/src/mainboard/google/eve/mainboard.c</span><br><span>+++ b/src/mainboard/google/eve/mainboard.c</span><br><span>@@ -24,13 +24,13 @@</span><br><span> static const char *oem_id_maxim = "GOOGLE";</span><br><span> static const char *oem_table_id_maxim = "EVEMAX";</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> mainboard_ec_init();</span><br><span> }</span><br><span> </span><br><span> static unsigned long mainboard_write_acpi_tables(</span><br><span style="color: hsl(0, 100%, 40%);">- device_t device, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *device, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span> {</span><br><span> uintptr_t start_addr;</span><br><span> uintptr_t end_addr;</span><br><span>@@ -63,7 +63,7 @@</span><br><span> return end_addr;</span><br><span> }</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> dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;</span><br><span>diff --git a/src/mainboard/google/fizz/mainboard.c b/src/mainboard/google/fizz/mainboard.c</span><br><span>index e6a0296..eb48e40 100644</span><br><span>--- a/src/mainboard/google/fizz/mainboard.c</span><br><span>+++ b/src/mainboard/google/fizz/mainboard.c</span><br><span>@@ -227,13 +227,13 @@</span><br><span> return sku_str;</span><br><span> }</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> mainboard_ec_init();</span><br><span> }</span><br><span> </span><br><span> static unsigned long mainboard_write_acpi_tables(</span><br><span style="color: hsl(0, 100%, 40%);">- device_t device, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *device, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span> {</span><br><span> const char *oem_id = "GOOGLE";</span><br><span> const char *oem_table_id = "FIZZ";</span><br><span>@@ -291,9 +291,9 @@</span><br><span> printk(BIOS_ERR, "Failed to set BJ limit\n");</span><br><span> }</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 style="color: hsl(0, 100%, 40%);">- device_t root = SA_DEV_ROOT;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *root = SA_DEV_ROOT;</span><br><span> config_t *conf = root->chip_info;</span><br><span> </span><br><span> mainboard_set_power_limits(conf);</span><br><span>diff --git a/src/mainboard/google/foster/mainboard.c b/src/mainboard/google/foster/mainboard.c</span><br><span>index 65e41cc..3c2d831 100644</span><br><span>--- a/src/mainboard/google/foster/mainboard.c</span><br><span>+++ b/src/mainboard/google/foster/mainboard.c</span><br><span>@@ -106,7 +106,7 @@</span><br><span> clock_enable_audio();</span><br><span> }</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> soc_configure_pads(padcfgs, ARRAY_SIZE(padcfgs));</span><br><span> soc_configure_funits(funitcfgs, ARRAY_SIZE(funitcfgs));</span><br><span>@@ -115,7 +115,7 @@</span><br><span> setup_audio();</span><br><span> }</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/google/gale/mainboard.c b/src/mainboard/google/gale/mainboard.c</span><br><span>index de384f9..3a69fa2 100644</span><br><span>--- a/src/mainboard/google/gale/mainboard.c</span><br><span>+++ b/src/mainboard/google/gale/mainboard.c</span><br><span>@@ -37,7 +37,7 @@</span><br><span> setup_usb_host1();</span><br><span> }</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> /* disable mmu and d-cache before setting up secure world.*/</span><br><span> dcache_mmu_disable();</span><br><span>@@ -60,7 +60,7 @@</span><br><span> //audio_clock_config(6144000);</span><br><span> }</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/google/glados/mainboard.c b/src/mainboard/google/glados/mainboard.c</span><br><span>index 855d69d..be23f4e 100644</span><br><span>--- a/src/mainboard/google/glados/mainboard.c</span><br><span>+++ b/src/mainboard/google/glados/mainboard.c</span><br><span>@@ -23,13 +23,13 @@</span><br><span> #include <vendorcode/google/chromeos/chromeos.h></span><br><span> #include "ec.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> mainboard_ec_init();</span><br><span> }</span><br><span> </span><br><span> static unsigned long mainboard_write_acpi_tables(</span><br><span style="color: hsl(0, 100%, 40%);">- device_t device, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *device, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span> {</span><br><span> uintptr_t start_addr;</span><br><span> uintptr_t end_addr;</span><br><span>@@ -70,7 +70,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> dev->ops->write_acpi_tables = mainboard_write_acpi_tables;</span><br><span>diff --git a/src/mainboard/google/gru/mainboard.c b/src/mainboard/google/gru/mainboard.c</span><br><span>index c9f3c48..41307c7 100644</span><br><span>--- a/src/mainboard/google/gru/mainboard.c</span><br><span>+++ b/src/mainboard/google/gru/mainboard.c</span><br><span>@@ -333,7 +333,7 @@</span><br><span> usb_power_cycle(port);</span><br><span> }</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> configure_sdmmc();</span><br><span> configure_emmc();</span><br><span>@@ -689,7 +689,7 @@</span><br><span> }</span><br><span> }</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/google/jecht/chromeos.c b/src/mainboard/google/jecht/chromeos.c</span><br><span>index f99fd6d..1bc8bd0 100644</span><br><span>--- a/src/mainboard/google/jecht/chromeos.c</span><br><span>+++ b/src/mainboard/google/jecht/chromeos.c</span><br><span>@@ -51,7 +51,7 @@</span><br><span> </span><br><span> int get_write_protect_state(void)</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> #ifdef __PRE_RAM__</span><br><span> dev = PCI_DEV(0, 0x1f, 2);</span><br><span> #else</span><br><span>@@ -62,7 +62,7 @@</span><br><span> </span><br><span> int get_recovery_mode_switch(void)</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> #ifdef __PRE_RAM__</span><br><span> dev = PCI_DEV(0, 0x1f, 2);</span><br><span> #else</span><br><span>diff --git a/src/mainboard/google/jecht/mainboard.c b/src/mainboard/google/jecht/mainboard.c</span><br><span>index 7e57505..0a827c6 100644</span><br><span>--- a/src/mainboard/google/jecht/mainboard.c</span><br><span>+++ b/src/mainboard/google/jecht/mainboard.c</span><br><span>@@ -25,7 +25,7 @@</span><br><span> outb(0xcb, 0xb2);</span><br><span> }</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> lan_init();</span><br><span> }</span><br><span>@@ -33,7 +33,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> dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;</span><br><span>diff --git a/src/mainboard/google/kahlee/mainboard.c b/src/mainboard/google/kahlee/mainboard.c</span><br><span>index f1df881..a01ae0a 100644</span><br><span>--- a/src/mainboard/google/kahlee/mainboard.c</span><br><span>+++ b/src/mainboard/google/kahlee/mainboard.c</span><br><span>@@ -184,7 +184,7 @@</span><br><span> /*************************************************</span><br><span> * Dedicated mainboard function</span><br><span> *************************************************/</span><br><span style="color: hsl(0, 100%, 40%);">-static void kahlee_enable(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void kahlee_enable(struct device *dev)</span><br><span> {</span><br><span> printk(BIOS_INFO, "Mainboard "</span><br><span> CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");</span><br><span>diff --git a/src/mainboard/google/kahlee/mptable.c b/src/mainboard/google/kahlee/mptable.c</span><br><span>index e29b3e3..860bb5a 100644</span><br><span>--- a/src/mainboard/google/kahlee/mptable.c</span><br><span>+++ b/src/mainboard/google/kahlee/mptable.c</span><br><span>@@ -115,7 +115,7 @@</span><br><span> /* on board NIC & Slot PCIE. */</span><br><span> </span><br><span> /* PCI slots */</span><br><span style="color: hsl(0, 100%, 40%);">- device_t dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));</span><br><span> if (dev && dev->enabled) {</span><br><span> u8 bus_pci = dev->link_list->secondary;</span><br><span> /* PCI_SLOT 0. */</span><br><span>diff --git a/src/mainboard/google/lars/mainboard.c b/src/mainboard/google/lars/mainboard.c</span><br><span>index e044405..43895fb 100644</span><br><span>--- a/src/mainboard/google/lars/mainboard.c</span><br><span>+++ b/src/mainboard/google/lars/mainboard.c</span><br><span>@@ -23,13 +23,13 @@</span><br><span> #include <vendorcode/google/chromeos/chromeos.h></span><br><span> #include "ec.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> mainboard_ec_init();</span><br><span> }</span><br><span> </span><br><span> static unsigned long mainboard_write_acpi_tables(</span><br><span style="color: hsl(0, 100%, 40%);">- device_t device, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *device, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span> {</span><br><span> uintptr_t start_addr;</span><br><span> uintptr_t end_addr;</span><br><span>@@ -66,7 +66,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> dev->ops->write_acpi_tables = mainboard_write_acpi_tables;</span><br><span>diff --git a/src/mainboard/google/link/mainboard.c b/src/mainboard/google/link/mainboard.c</span><br><span>index 24062e9..ce61912 100644</span><br><span>--- a/src/mainboard/google/link/mainboard.c</span><br><span>+++ b/src/mainboard/google/link/mainboard.c</span><br><span>@@ -141,7 +141,7 @@</span><br><span> </span><br><span> </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> /* Initialize the Embedded Controller */</span><br><span> link_ec_init();</span><br><span>@@ -158,7 +158,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int link_onboard_smbios_data(device_t dev, int *handle,</span><br><span style="color: hsl(120, 100%, 40%);">+static int link_onboard_smbios_data(struct device *dev, int *handle,</span><br><span> unsigned long *current)</span><br><span> {</span><br><span> int len = 0;</span><br><span>@@ -196,7 +196,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> dev->ops->get_smbios_data = link_onboard_smbios_data;</span><br><span>diff --git a/src/mainboard/google/nyan/mainboard.c b/src/mainboard/google/nyan/mainboard.c</span><br><span>index 92bb3e3..b447a4a 100644</span><br><span>--- a/src/mainboard/google/nyan/mainboard.c</span><br><span>+++ b/src/mainboard/google/nyan/mainboard.c</span><br><span>@@ -194,7 +194,7 @@</span><br><span> tegra_spi_init(CONFIG_EC_GOOGLE_CHROMEEC_SPI_BUS);</span><br><span> }</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> set_clock_sources();</span><br><span> </span><br><span>@@ -244,7 +244,7 @@</span><br><span> setup_ec_spi();</span><br><span> }</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/google/nyan_big/mainboard.c b/src/mainboard/google/nyan_big/mainboard.c</span><br><span>index 0c0fe5e..5457be6 100644</span><br><span>--- a/src/mainboard/google/nyan_big/mainboard.c</span><br><span>+++ b/src/mainboard/google/nyan_big/mainboard.c</span><br><span>@@ -194,7 +194,7 @@</span><br><span> tegra_spi_init(CONFIG_EC_GOOGLE_CHROMEEC_SPI_BUS);</span><br><span> }</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> set_clock_sources();</span><br><span> </span><br><span>@@ -242,7 +242,7 @@</span><br><span> setup_ec_spi();</span><br><span> }</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/google/nyan_blaze/mainboard.c b/src/mainboard/google/nyan_blaze/mainboard.c</span><br><span>index c3b936c..6b448cb 100644</span><br><span>--- a/src/mainboard/google/nyan_blaze/mainboard.c</span><br><span>+++ b/src/mainboard/google/nyan_blaze/mainboard.c</span><br><span>@@ -194,7 +194,7 @@</span><br><span> tegra_spi_init(CONFIG_EC_GOOGLE_CHROMEEC_SPI_BUS);</span><br><span> }</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> set_clock_sources();</span><br><span> </span><br><span>@@ -242,7 +242,7 @@</span><br><span> setup_ec_spi();</span><br><span> }</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/google/oak/mainboard.c b/src/mainboard/google/oak/mainboard.c</span><br><span>index 327e799..82e6fc0 100644</span><br><span>--- a/src/mainboard/google/oak/mainboard.c</span><br><span>+++ b/src/mainboard/google/oak/mainboard.c</span><br><span>@@ -311,7 +311,7 @@</span><br><span> set_vbe_mode_info_valid(&edid, (uintptr_t)0);</span><br><span> }</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> /* TP_SHIFT_EN: Enables the level shifter for I2C bus 4 (TPAD), which</span><br><span> * also contains the PS8640 eDP brige and the USB hub.</span><br><span>@@ -346,7 +346,7 @@</span><br><span> configure_touchscreen();</span><br><span> }</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/google/octopus/mainboard.c b/src/mainboard/google/octopus/mainboard.c</span><br><span>index 3709823..fc533af 100644</span><br><span>--- a/src/mainboard/google/octopus/mainboard.c</span><br><span>+++ b/src/mainboard/google/octopus/mainboard.c</span><br><span>@@ -42,7 +42,7 @@</span><br><span> }</span><br><span> </span><br><span> static unsigned long mainboard_write_acpi_tables(</span><br><span style="color: hsl(0, 100%, 40%);">- device_t device, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *device, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span> {</span><br><span> uintptr_t start_addr;</span><br><span> uintptr_t end_addr;</span><br><span>@@ -65,7 +65,7 @@</span><br><span> return end_addr;</span><br><span> }</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->write_acpi_tables = mainboard_write_acpi_tables;</span><br><span> dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;</span><br><span>diff --git a/src/mainboard/google/parrot/chromeos.c b/src/mainboard/google/parrot/chromeos.c</span><br><span>index d2448eb..3bf1e0b 100644</span><br><span>--- a/src/mainboard/google/parrot/chromeos.c</span><br><span>+++ b/src/mainboard/google/parrot/chromeos.c</span><br><span>@@ -34,7 +34,7 @@</span><br><span> </span><br><span> void fill_lb_gpios(struct lb_gpios *gpios)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- device_t dev = dev_find_slot(0, PCI_DEVFN(0x1f,0));</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev = dev_find_slot(0, PCI_DEVFN(0x1f,0));</span><br><span> u16 gpio_base = pci_read_config32(dev, GPIOBASE) & 0xfffe;</span><br><span> u16 gen_pmcon_1 = pci_read_config32(dev, GEN_PMCON_1);</span><br><span> </span><br><span>diff --git a/src/mainboard/google/parrot/mainboard.c b/src/mainboard/google/parrot/mainboard.c</span><br><span>index 4d357f8..9940c14 100644</span><br><span>--- a/src/mainboard/google/parrot/mainboard.c</span><br><span>+++ b/src/mainboard/google/parrot/mainboard.c</span><br><span>@@ -41,13 +41,13 @@</span><br><span> }</span><br><span> </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> /* Initialize the Embedded Controller */</span><br><span> parrot_ec_init();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int parrot_onboard_smbios_data(device_t dev, int *handle,</span><br><span style="color: hsl(120, 100%, 40%);">+static int parrot_onboard_smbios_data(struct device *dev, int *handle,</span><br><span> unsigned long *current)</span><br><span> {</span><br><span> int len = 0;</span><br><span>@@ -78,7 +78,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> dev->ops->get_smbios_data = parrot_onboard_smbios_data;</span><br><span>diff --git a/src/mainboard/google/peach_pit/mainboard.c b/src/mainboard/google/peach_pit/mainboard.c</span><br><span>index 14d3e2f..d94b8c6 100644</span><br><span>--- a/src/mainboard/google/peach_pit/mainboard.c</span><br><span>+++ b/src/mainboard/google/peach_pit/mainboard.c</span><br><span>@@ -399,7 +399,7 @@</span><br><span> }</span><br><span> </span><br><span> /* this happens after cpu_init where exynos resources are set */</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> /* we'll stick with the crummy u-boot struct for now.*/</span><br><span> /* doing this as an auto since the struct has to be writeable */</span><br><span>@@ -456,7 +456,7 @@</span><br><span> setup_usb();</span><br><span> }</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/google/poppy/mainboard.c b/src/mainboard/google/poppy/mainboard.c</span><br><span>index 743a920..b3e91e8 100644</span><br><span>--- a/src/mainboard/google/poppy/mainboard.c</span><br><span>+++ b/src/mainboard/google/poppy/mainboard.c</span><br><span>@@ -21,12 +21,12 @@</span><br><span> #include <soc/nhlt.h></span><br><span> #include <vendorcode/google/chromeos/chromeos.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> mainboard_ec_init();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static unsigned long mainboard_write_acpi_tables(device_t device,</span><br><span style="color: hsl(120, 100%, 40%);">+static unsigned long mainboard_write_acpi_tables(struct device *device,</span><br><span> unsigned long current, acpi_rsdp_t *rsdp)</span><br><span> {</span><br><span> uintptr_t start_addr;</span><br><span>@@ -55,7 +55,7 @@</span><br><span> return end_addr;</span><br><span> }</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> dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;</span><br><span>diff --git a/src/mainboard/google/poppy/variants/nami/mainboard.c b/src/mainboard/google/poppy/variants/nami/mainboard.c</span><br><span>index 11d4060..544cdd5 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/nami/mainboard.c</span><br><span>+++ b/src/mainboard/google/poppy/variants/nami/mainboard.c</span><br><span>@@ -42,7 +42,7 @@</span><br><span> {</span><br><span> /* Override dev tree settings per board */</span><br><span> uint32_t sku_id = variant_board_sku();</span><br><span style="color: hsl(0, 100%, 40%);">- device_t root = SA_DEV_ROOT;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *root = SA_DEV_ROOT;</span><br><span> config_t *cfg = root->chip_info;</span><br><span> switch (sku_id) {</span><br><span> case SKU_1_VAYNE:</span><br><span>diff --git a/src/mainboard/google/poppy/variants/nami/pl2.c b/src/mainboard/google/poppy/variants/nami/pl2.c</span><br><span>index 6744f2c..9746d74 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/nami/pl2.c</span><br><span>+++ b/src/mainboard/google/poppy/variants/nami/pl2.c</span><br><span>@@ -32,7 +32,7 @@</span><br><span> return PL2_DEFAULT;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void nami_enable(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void nami_enable(struct device *dev)</span><br><span> {</span><br><span> struct device *root = SA_DEV_ROOT;</span><br><span> config_t *conf = root->chip_info;</span><br><span>diff --git a/src/mainboard/google/purin/mainboard.c b/src/mainboard/google/purin/mainboard.c</span><br><span>index c238442..bc7b545 100644</span><br><span>--- a/src/mainboard/google/purin/mainboard.c</span><br><span>+++ b/src/mainboard/google/purin/mainboard.c</span><br><span>@@ -17,11 +17,11 @@</span><br><span> #include <boot/coreboot_tables.h></span><br><span> #include <symbols.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> }</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/google/rambi/mainboard.c b/src/mainboard/google/rambi/mainboard.c</span><br><span>index b8dd805..32ef960 100644</span><br><span>--- a/src/mainboard/google/rambi/mainboard.c</span><br><span>+++ b/src/mainboard/google/rambi/mainboard.c</span><br><span>@@ -126,7 +126,7 @@</span><br><span> }</span><br><span> #endif</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> mainboard_ec_init();</span><br><span> #if IS_ENABLED(CONFIG_BOARD_GOOGLE_NINJA) || IS_ENABLED(CONFIG_BOARD_GOOGLE_SUMO)</span><br><span>@@ -134,7 +134,7 @@</span><br><span> #endif</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int mainboard_smbios_data(device_t dev, int *handle,</span><br><span style="color: hsl(120, 100%, 40%);">+static int mainboard_smbios_data(struct device *dev, int *handle,</span><br><span> unsigned long *current)</span><br><span> {</span><br><span> int len = 0;</span><br><span>@@ -164,7 +164,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> dev->ops->get_smbios_data = mainboard_smbios_data;</span><br><span>diff --git a/src/mainboard/google/reef/mainboard.c b/src/mainboard/google/reef/mainboard.c</span><br><span>index 6831d57..6db9ac6 100644</span><br><span>--- a/src/mainboard/google/reef/mainboard.c</span><br><span>+++ b/src/mainboard/google/reef/mainboard.c</span><br><span>@@ -108,7 +108,7 @@</span><br><span> }</span><br><span> </span><br><span> static unsigned long mainboard_write_acpi_tables(</span><br><span style="color: hsl(0, 100%, 40%);">- device_t device, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *device, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span> {</span><br><span> uintptr_t start_addr;</span><br><span> uintptr_t end_addr;</span><br><span>@@ -136,7 +136,7 @@</span><br><span> return end_addr;</span><br><span> }</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->write_acpi_tables = mainboard_write_acpi_tables;</span><br><span> dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;</span><br><span>diff --git a/src/mainboard/google/rotor/mainboard.c b/src/mainboard/google/rotor/mainboard.c</span><br><span>index 92d29e8..63867bb 100644</span><br><span>--- a/src/mainboard/google/rotor/mainboard.c</span><br><span>+++ b/src/mainboard/google/rotor/mainboard.c</span><br><span>@@ -15,12 +15,12 @@</span><br><span> </span><br><span> #include <device/device.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> /* TODO: implement mainboard_init */</span><br><span> }</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/google/slippy/mainboard.c b/src/mainboard/google/slippy/mainboard.c</span><br><span>index 10252d8..cfe0917 100644</span><br><span>--- a/src/mainboard/google/slippy/mainboard.c</span><br><span>+++ b/src/mainboard/google/slippy/mainboard.c</span><br><span>@@ -41,12 +41,12 @@</span><br><span> </span><br><span> </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> mainboard_ec_init();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int mainboard_smbios_data(device_t dev, int *handle,</span><br><span style="color: hsl(120, 100%, 40%);">+static int mainboard_smbios_data(struct device *dev, int *handle,</span><br><span> unsigned long *current)</span><br><span> {</span><br><span> int len = 0;</span><br><span>@@ -84,7 +84,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> dev->ops->get_smbios_data = mainboard_smbios_data;</span><br><span>diff --git a/src/mainboard/google/smaug/mainboard.c b/src/mainboard/google/smaug/mainboard.c</span><br><span>index c783ca4..8628426 100644</span><br><span>--- a/src/mainboard/google/smaug/mainboard.c</span><br><span>+++ b/src/mainboard/google/smaug/mainboard.c</span><br><span>@@ -183,7 +183,7 @@</span><br><span> power_gate_partition(partitions[i]);</span><br><span> }</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> soc_configure_pads(padcfgs, ARRAY_SIZE(padcfgs));</span><br><span> soc_configure_funits(funits, ARRAY_SIZE(funits));</span><br><span>@@ -200,12 +200,12 @@</span><br><span> powergate_unused_partitions();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void display_startup(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+void display_startup(struct device *dev)</span><br><span> {</span><br><span> dsi_display_startup(dev);</span><br><span> }</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/google/storm/mainboard.c b/src/mainboard/google/storm/mainboard.c</span><br><span>index df01c4f..05f9821 100644</span><br><span>--- a/src/mainboard/google/storm/mainboard.c</span><br><span>+++ b/src/mainboard/google/storm/mainboard.c</span><br><span>@@ -76,7 +76,7 @@</span><br><span> gpio_set(SW_RESET_GPIO, 1);</span><br><span> }</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> /* disable mmu and d-cache before setting up secure world.*/</span><br><span> dcache_mmu_disable();</span><br><span>@@ -104,7 +104,7 @@</span><br><span> audio_clock_config(6144000);</span><br><span> }</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/google/stout/chromeos.c b/src/mainboard/google/stout/chromeos.c</span><br><span>index 047e6a1..d2c0827 100644</span><br><span>--- a/src/mainboard/google/stout/chromeos.c</span><br><span>+++ b/src/mainboard/google/stout/chromeos.c</span><br><span>@@ -97,11 +97,11 @@</span><br><span> int get_recovery_mode_switch(void)</span><br><span> {</span><br><span> #ifdef __PRE_RAM__</span><br><span style="color: hsl(0, 100%, 40%);">- device_t dev = PCI_DEV(0, 0x1f, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev = PCI_DEV(0, 0x1f, 0);</span><br><span> #else</span><br><span> static int ec_in_rec_mode = 0;</span><br><span> static int ec_rec_flag_good = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- device_t dev = dev_find_slot(0, PCI_DEVFN(0x1f,0));</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev = dev_find_slot(0, PCI_DEVFN(0x1f,0));</span><br><span> #endif</span><br><span> </span><br><span> u8 ec_status = ec_read(EC_STATUS_REG);</span><br><span>diff --git a/src/mainboard/google/stout/mainboard.c b/src/mainboard/google/stout/mainboard.c</span><br><span>index 4e3839f..399e2b4 100644</span><br><span>--- a/src/mainboard/google/stout/mainboard.c</span><br><span>+++ b/src/mainboard/google/stout/mainboard.c</span><br><span>@@ -42,7 +42,7 @@</span><br><span> </span><br><span> </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> struct device *ethernet_dev = NULL;</span><br><span> </span><br><span>@@ -64,7 +64,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> dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;</span><br><span>diff --git a/src/mainboard/google/urara/mainboard.c b/src/mainboard/google/urara/mainboard.c</span><br><span>index 27fdd90..b5c1b7d 100644</span><br><span>--- a/src/mainboard/google/urara/mainboard.c</span><br><span>+++ b/src/mainboard/google/urara/mainboard.c</span><br><span>@@ -21,7 +21,7 @@</span><br><span> </span><br><span> #include <vendorcode/google/chromeos/chromeos.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> #if IS_ENABLED(CONFIG_CHROMEOS)</span><br><span> /* Copy WIFI calibration data into CBMEM. */</span><br><span>@@ -29,7 +29,7 @@</span><br><span> #endif</span><br><span> }</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, "Enable Pistachio device...\n");</span><br><span> dev->ops->init = &mainboard_init;</span><br><span>diff --git a/src/mainboard/google/veyron/mainboard.c b/src/mainboard/google/veyron/mainboard.c</span><br><span>index 15e2a57..93f14c2 100644</span><br><span>--- a/src/mainboard/google/veyron/mainboard.c</span><br><span>+++ b/src/mainboard/google/veyron/mainboard.c</span><br><span>@@ -99,7 +99,7 @@</span><br><span> write32(&rk3288_grf->iomux_edp_hotplug, IOMUX_EDP_HOTPLUG);</span><br><span> }</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> gpio_output(GPIO_RESET, 0);</span><br><span> </span><br><span>@@ -110,7 +110,7 @@</span><br><span> configure_vop();</span><br><span> }</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/google/veyron_mickey/mainboard.c b/src/mainboard/google/veyron_mickey/mainboard.c</span><br><span>index 26fcbb9..cf78275 100644</span><br><span>--- a/src/mainboard/google/veyron_mickey/mainboard.c</span><br><span>+++ b/src/mainboard/google/veyron_mickey/mainboard.c</span><br><span>@@ -78,7 +78,7 @@</span><br><span> gpio_output(GPIO(7, B, 3), 1); /* POWER_HDMI_ON */</span><br><span> }</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> gpio_output(GPIO_RESET, 0);</span><br><span> </span><br><span>@@ -89,7 +89,7 @@</span><br><span> configure_hdmi();</span><br><span> }</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/google/veyron_rialto/mainboard.c b/src/mainboard/google/veyron_rialto/mainboard.c</span><br><span>index b6b25be..40914ef 100644</span><br><span>--- a/src/mainboard/google/veyron_rialto/mainboard.c</span><br><span>+++ b/src/mainboard/google/veyron_rialto/mainboard.c</span><br><span>@@ -75,7 +75,7 @@</span><br><span> gpio_output(GPIO(4, D, 2), 0); /* 3G_ON_OFF */</span><br><span> }</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> gpio_output(GPIO_RESET, 0);</span><br><span> </span><br><span>@@ -94,7 +94,7 @@</span><br><span> }</span><br><span> }</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/google/zoombini/mainboard.c b/src/mainboard/google/zoombini/mainboard.c</span><br><span>index eee2d74..96e1ac0 100644</span><br><span>--- a/src/mainboard/google/zoombini/mainboard.c</span><br><span>+++ b/src/mainboard/google/zoombini/mainboard.c</span><br><span>@@ -20,12 +20,12 @@</span><br><span> #include <arch/acpi.h></span><br><span> #include <baseboard/variants.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> mainboard_ec_init();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static unsigned long mainboard_write_acpi_tables(device_t device,</span><br><span style="color: hsl(120, 100%, 40%);">+static unsigned long mainboard_write_acpi_tables(struct device *device,</span><br><span> unsigned long current, acpi_rsdp_t *rsdp)</span><br><span> {</span><br><span> uintptr_t start_addr;</span><br><span>@@ -49,7 +49,7 @@</span><br><span> return end_addr;</span><br><span> }</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> dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26086">change 26086</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/26086"/><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: I8e549e4222ae2ed6b9c46f81c5b5253e8b227ee8 </div>
<div style="display:none"> Gerrit-Change-Number: 26086 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>