From 02b05d1f6be34c5833c8fbeb6483a2634b758eea Mon Sep 17 00:00:00 2001
From: Elyes HAOUAS <ehaouas@noos.fr>
Date: Fri, 4 May 2018 20:00:08 +0200
Subject: mb/asus: Get rid of device_t

Use of device_t has been abandoned in ramstage.

Change-Id: I8fe817bb514c69a647c2208a0573a2c5fe98722d
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/26076
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
---
 src/mainboard/asus/a8n_e/acpi_tables.c         |  2 +-
 src/mainboard/asus/a8n_e/get_bus_conf.c        |  2 +-
 src/mainboard/asus/a8n_e/mptable.c             |  2 +-
 src/mainboard/asus/am1i-a/mainboard.c          |  2 +-
 src/mainboard/asus/f2a85-m/mainboard.c         |  2 +-
 src/mainboard/asus/f2a85-m/mptable.c           |  2 +-
 src/mainboard/asus/k8v-x/mainboard.c           |  2 +-
 src/mainboard/asus/kcma-d8/acpi_tables.c       |  2 +-
 src/mainboard/asus/kcma-d8/get_bus_conf.c      |  2 +-
 src/mainboard/asus/kcma-d8/mainboard.c         |  6 +++---
 src/mainboard/asus/kcma-d8/mptable.c           |  2 +-
 src/mainboard/asus/kfsn4-dre/acpi_tables.c     |  2 +-
 src/mainboard/asus/kfsn4-dre/get_bus_conf.c    |  2 +-
 src/mainboard/asus/kfsn4-dre/mptable.c         |  2 +-
 src/mainboard/asus/kfsn4-dre_k8/acpi_tables.c  |  2 +-
 src/mainboard/asus/kfsn4-dre_k8/get_bus_conf.c |  2 +-
 src/mainboard/asus/kfsn4-dre_k8/mptable.c      |  2 +-
 src/mainboard/asus/kgpe-d16/acpi_tables.c      |  2 +-
 src/mainboard/asus/kgpe-d16/get_bus_conf.c     |  2 +-
 src/mainboard/asus/kgpe-d16/mainboard.c        |  6 +++---
 src/mainboard/asus/kgpe-d16/mptable.c          |  2 +-
 src/mainboard/asus/m2n-e/get_bus_conf.c        |  2 +-
 src/mainboard/asus/m2n-e/mptable.c             |  2 +-
 src/mainboard/asus/m2v/mainboard.c             |  2 +-
 src/mainboard/asus/m4a78-em/get_bus_conf.c     |  2 +-
 src/mainboard/asus/m4a78-em/mainboard.c        |  8 ++++----
 src/mainboard/asus/m4a78-em/mptable.c          |  2 +-
 src/mainboard/asus/m4a785-m/get_bus_conf.c     |  2 +-
 src/mainboard/asus/m4a785-m/mainboard.c        | 10 +++++-----
 src/mainboard/asus/m4a785-m/mptable.c          |  2 +-
 src/mainboard/asus/m5a88-v/get_bus_conf.c      |  2 +-
 src/mainboard/asus/m5a88-v/mainboard.c         |  2 +-
 32 files changed, 43 insertions(+), 43 deletions(-)

(limited to 'src/mainboard/asus')

diff --git a/src/mainboard/asus/a8n_e/acpi_tables.c b/src/mainboard/asus/a8n_e/acpi_tables.c
index 807145922d..06147ddf5b 100644
--- a/src/mainboard/asus/a8n_e/acpi_tables.c
+++ b/src/mainboard/asus/a8n_e/acpi_tables.c
@@ -21,7 +21,7 @@
 /* APIC */
 unsigned long acpi_fill_madt(unsigned long current)
 {
-	device_t dev;
+	struct device *dev;
 	struct resource *res;
 
 	/* create all subtables for processors */
diff --git a/src/mainboard/asus/a8n_e/get_bus_conf.c b/src/mainboard/asus/a8n_e/get_bus_conf.c
index ea2744a54c..b1e94d8896 100644
--- a/src/mainboard/asus/a8n_e/get_bus_conf.c
+++ b/src/mainboard/asus/a8n_e/get_bus_conf.c
@@ -57,7 +57,7 @@ static unsigned get_bus_conf_done = 0;
 void get_bus_conf(void)
 {
 	unsigned apicid_base, sbdn;
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if (get_bus_conf_done == 1)
diff --git a/src/mainboard/asus/a8n_e/mptable.c b/src/mainboard/asus/a8n_e/mptable.c
index 73b1f15a71..40a06a4c77 100644
--- a/src/mainboard/asus/a8n_e/mptable.c
+++ b/src/mainboard/asus/a8n_e/mptable.c
@@ -46,7 +46,7 @@ static void *smp_write_config_table(void *v)
 
 	/* I/O APICs:	APIC ID	Version	State		Address */
 	{
-		device_t dev;
+		struct device *dev;
 		struct resource *res;
 		uint32_t dword;
 
diff --git a/src/mainboard/asus/am1i-a/mainboard.c b/src/mainboard/asus/am1i-a/mainboard.c
index 9f00efde69..bd6d3a3b52 100644
--- a/src/mainboard/asus/am1i-a/mainboard.c
+++ b/src/mainboard/asus/am1i-a/mainboard.c
@@ -95,7 +95,7 @@ static void pirq_setup(void)
 /**********************************************
  * enable the dedicated function in mainboard.
  **********************************************/
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
 {
 	printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
 
diff --git a/src/mainboard/asus/f2a85-m/mainboard.c b/src/mainboard/asus/f2a85-m/mainboard.c
index 00d887fe49..09645f3d33 100644
--- a/src/mainboard/asus/f2a85-m/mainboard.c
+++ b/src/mainboard/asus/f2a85-m/mainboard.c
@@ -20,7 +20,7 @@
 /*************************************************
  * enable the dedicated function in thatcher board.
  *************************************************/
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
 {
 	msr_t msr;
 
diff --git a/src/mainboard/asus/f2a85-m/mptable.c b/src/mainboard/asus/f2a85-m/mptable.c
index 31357699ff..cf45d94774 100644
--- a/src/mainboard/asus/f2a85-m/mptable.c
+++ b/src/mainboard/asus/f2a85-m/mptable.c
@@ -144,7 +144,7 @@ static void *smp_write_config_table(void *v)
 	/* on board NIC & Slot PCIE.  */
 
 	/* PCI slots */
-	device_t dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
+	struct device *dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
 	if (dev && dev->enabled) {
 		u8 bus_pci = dev->link_list->secondary;
 		/* PCI_SLOT 0. */
diff --git a/src/mainboard/asus/k8v-x/mainboard.c b/src/mainboard/asus/k8v-x/mainboard.c
index ab5b2c40bf..9f35cd389b 100644
--- a/src/mainboard/asus/k8v-x/mainboard.c
+++ b/src/mainboard/asus/k8v-x/mainboard.c
@@ -23,7 +23,7 @@
 
 u32 vt8237_ide_80pin_detect(struct device *dev)
 {
-	device_t lpc_dev;
+	struct device *lpc_dev;
 	u16 acpi_io_base;
 	u32 gpio_in;
 	u32 res;
diff --git a/src/mainboard/asus/kcma-d8/acpi_tables.c b/src/mainboard/asus/kcma-d8/acpi_tables.c
index 436e156f1b..c5f2c33769 100644
--- a/src/mainboard/asus/kcma-d8/acpi_tables.c
+++ b/src/mainboard/asus/kcma-d8/acpi_tables.c
@@ -26,7 +26,7 @@
 
 unsigned long acpi_fill_madt(unsigned long current)
 {
-	device_t dev;
+	struct device *dev;
 	u32 dword;
 	u32 gsi_base = 0;
 	uint32_t apicid_sp5100;
diff --git a/src/mainboard/asus/kcma-d8/get_bus_conf.c b/src/mainboard/asus/kcma-d8/get_bus_conf.c
index 5ebc714a75..d12dcc9185 100644
--- a/src/mainboard/asus/kcma-d8/get_bus_conf.c
+++ b/src/mainboard/asus/kcma-d8/get_bus_conf.c
@@ -60,7 +60,7 @@ static u32 get_bus_conf_done = 0;
 void get_bus_conf(void)
 {
 	u32 apicid_base;
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if (get_bus_conf_done == 1)
diff --git a/src/mainboard/asus/kcma-d8/mainboard.c b/src/mainboard/asus/kcma-d8/mainboard.c
index 0219ee6af0..f8b2bd712f 100644
--- a/src/mainboard/asus/kcma-d8/mainboard.c
+++ b/src/mainboard/asus/kcma-d8/mainboard.c
@@ -30,7 +30,7 @@ void set_pcie_dereset(void);
 
 void set_pcie_reset(void)
 {
-	device_t pcie_core_dev;
+	struct device *pcie_core_dev;
 
 	pcie_core_dev = dev_find_slot(0, PCI_DEVFN(0, 0));
 	set_htiu_enable_bits(pcie_core_dev, 0xA8, 0xFFFFFFFF, 0x28282828);
@@ -39,7 +39,7 @@ void set_pcie_reset(void)
 
 void set_pcie_dereset(void)
 {
-	device_t pcie_core_dev;
+	struct device *pcie_core_dev;
 
 	pcie_core_dev = dev_find_slot(0, PCI_DEVFN(0, 0));
 	set_htiu_enable_bits(pcie_core_dev, 0xA8, 0xFFFFFFFF, 0x6F6F6F6F);
@@ -50,7 +50,7 @@ void set_pcie_dereset(void)
 * enable the dedicated function in kgpe-d16 board.
 * This function is called earlier than sr5650_enable.
 *************************************************/
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
 {
 	printk(BIOS_INFO, "Mainboard KCMA-D8 initializing, dev=0x%p\n", dev);
 
diff --git a/src/mainboard/asus/kcma-d8/mptable.c b/src/mainboard/asus/kcma-d8/mptable.c
index aff077ae7b..4bdb21e872 100644
--- a/src/mainboard/asus/kcma-d8/mptable.c
+++ b/src/mainboard/asus/kcma-d8/mptable.c
@@ -36,7 +36,7 @@ static void *smp_write_config_table(void *v)
 	struct mp_config_table *mc;
 	int bus_isa;
 	u32 apicid_sr5650;
-	device_t dev;
+	struct device *dev;
 	uint8_t sp5100_bus_number;
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
diff --git a/src/mainboard/asus/kfsn4-dre/acpi_tables.c b/src/mainboard/asus/kfsn4-dre/acpi_tables.c
index a19dc9af2c..c6e1b479c7 100644
--- a/src/mainboard/asus/kfsn4-dre/acpi_tables.c
+++ b/src/mainboard/asus/kfsn4-dre/acpi_tables.c
@@ -22,7 +22,7 @@
 /* APIC */
 unsigned long acpi_fill_madt(unsigned long current)
 {
-	device_t dev;
+	struct device *dev;
 	struct resource *res;
 
 	/* create all subtables for processors */
diff --git a/src/mainboard/asus/kfsn4-dre/get_bus_conf.c b/src/mainboard/asus/kfsn4-dre/get_bus_conf.c
index 1a9931fb3e..4b23ca52f0 100644
--- a/src/mainboard/asus/kfsn4-dre/get_bus_conf.c
+++ b/src/mainboard/asus/kfsn4-dre/get_bus_conf.c
@@ -69,7 +69,7 @@ static unsigned get_bus_conf_done = 0;
 void get_bus_conf(void)
 {
 	unsigned apicid_base, sbdn;
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if (get_bus_conf_done == 1)
diff --git a/src/mainboard/asus/kfsn4-dre/mptable.c b/src/mainboard/asus/kfsn4-dre/mptable.c
index cdf86a183c..6081f00c06 100644
--- a/src/mainboard/asus/kfsn4-dre/mptable.c
+++ b/src/mainboard/asus/kfsn4-dre/mptable.c
@@ -51,7 +51,7 @@ static void *smp_write_config_table(void *v)
 
 	/* I/O APICs:	APIC ID	Version	State		Address */
 	{
-		device_t dev;
+		struct device *dev;
 		struct resource *res;
 
 		dev = dev_find_slot(bus_ck804[0], PCI_DEVFN(sbdn + 0x1, 0));
diff --git a/src/mainboard/asus/kfsn4-dre_k8/acpi_tables.c b/src/mainboard/asus/kfsn4-dre_k8/acpi_tables.c
index 6acb94ca11..8c706b5349 100644
--- a/src/mainboard/asus/kfsn4-dre_k8/acpi_tables.c
+++ b/src/mainboard/asus/kfsn4-dre_k8/acpi_tables.c
@@ -22,7 +22,7 @@
 /* APIC */
 unsigned long acpi_fill_madt(unsigned long current)
 {
-	device_t dev;
+	struct device *dev;
 	struct resource *res;
 
 	/* create all subtables for processors */
diff --git a/src/mainboard/asus/kfsn4-dre_k8/get_bus_conf.c b/src/mainboard/asus/kfsn4-dre_k8/get_bus_conf.c
index 50ed3710be..d527751eeb 100644
--- a/src/mainboard/asus/kfsn4-dre_k8/get_bus_conf.c
+++ b/src/mainboard/asus/kfsn4-dre_k8/get_bus_conf.c
@@ -58,7 +58,7 @@ static unsigned get_bus_conf_done = 0;
 void get_bus_conf(void)
 {
 	unsigned apicid_base, sbdn;
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if (get_bus_conf_done == 1)
diff --git a/src/mainboard/asus/kfsn4-dre_k8/mptable.c b/src/mainboard/asus/kfsn4-dre_k8/mptable.c
index 21a433a64f..efa583c47f 100644
--- a/src/mainboard/asus/kfsn4-dre_k8/mptable.c
+++ b/src/mainboard/asus/kfsn4-dre_k8/mptable.c
@@ -51,7 +51,7 @@ static void *smp_write_config_table(void *v)
 
 	/* I/O APICs:	APIC ID	Version	State		Address */
 	{
-		device_t dev;
+		struct device *dev;
 		struct resource *res;
 
 		dev = dev_find_slot(bus_ck804[0], PCI_DEVFN(sbdn + 0x1, 0));
diff --git a/src/mainboard/asus/kgpe-d16/acpi_tables.c b/src/mainboard/asus/kgpe-d16/acpi_tables.c
index 436e156f1b..c5f2c33769 100644
--- a/src/mainboard/asus/kgpe-d16/acpi_tables.c
+++ b/src/mainboard/asus/kgpe-d16/acpi_tables.c
@@ -26,7 +26,7 @@
 
 unsigned long acpi_fill_madt(unsigned long current)
 {
-	device_t dev;
+	struct device *dev;
 	u32 dword;
 	u32 gsi_base = 0;
 	uint32_t apicid_sp5100;
diff --git a/src/mainboard/asus/kgpe-d16/get_bus_conf.c b/src/mainboard/asus/kgpe-d16/get_bus_conf.c
index 5ebc714a75..d12dcc9185 100644
--- a/src/mainboard/asus/kgpe-d16/get_bus_conf.c
+++ b/src/mainboard/asus/kgpe-d16/get_bus_conf.c
@@ -60,7 +60,7 @@ static u32 get_bus_conf_done = 0;
 void get_bus_conf(void)
 {
 	u32 apicid_base;
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if (get_bus_conf_done == 1)
diff --git a/src/mainboard/asus/kgpe-d16/mainboard.c b/src/mainboard/asus/kgpe-d16/mainboard.c
index 65029d45af..ac28f6e40a 100644
--- a/src/mainboard/asus/kgpe-d16/mainboard.c
+++ b/src/mainboard/asus/kgpe-d16/mainboard.c
@@ -30,7 +30,7 @@ void set_pcie_dereset(void);
 
 void set_pcie_reset(void)
 {
-	device_t pcie_core_dev;
+	struct device *pcie_core_dev;
 
 	pcie_core_dev = dev_find_slot(0, PCI_DEVFN(0, 0));
 	set_htiu_enable_bits(pcie_core_dev, 0xA8, 0xFFFFFFFF, 0x28282828);
@@ -39,7 +39,7 @@ void set_pcie_reset(void)
 
 void set_pcie_dereset(void)
 {
-	device_t pcie_core_dev;
+	struct device *pcie_core_dev;
 
 	pcie_core_dev = dev_find_slot(0, PCI_DEVFN(0, 0));
 	set_htiu_enable_bits(pcie_core_dev, 0xA8, 0xFFFFFFFF, 0x6F6F6F6F);
@@ -50,7 +50,7 @@ void set_pcie_dereset(void)
 * enable the dedicated function in kgpe-d16 board.
 * This function is called earlier than sr5650_enable.
 *************************************************/
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
 {
 	printk(BIOS_INFO, "Mainboard KGPE-D16 Enable. dev=0x%p\n", dev);
 
diff --git a/src/mainboard/asus/kgpe-d16/mptable.c b/src/mainboard/asus/kgpe-d16/mptable.c
index a55101dcc7..afde757970 100644
--- a/src/mainboard/asus/kgpe-d16/mptable.c
+++ b/src/mainboard/asus/kgpe-d16/mptable.c
@@ -36,7 +36,7 @@ static void *smp_write_config_table(void *v)
 	struct mp_config_table *mc;
 	int bus_isa;
 	u32 apicid_sr5650;
-	device_t dev;
+	struct device *dev;
 	uint8_t sp5100_bus_number;
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
diff --git a/src/mainboard/asus/m2n-e/get_bus_conf.c b/src/mainboard/asus/m2n-e/get_bus_conf.c
index e56072a6a9..6809eda4a9 100644
--- a/src/mainboard/asus/m2n-e/get_bus_conf.c
+++ b/src/mainboard/asus/m2n-e/get_bus_conf.c
@@ -63,7 +63,7 @@ static unsigned get_bus_conf_done = 0;
 void get_bus_conf(void)
 {
 	unsigned int apicid_base, sbdn;
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if (get_bus_conf_done == 1)
diff --git a/src/mainboard/asus/m2n-e/mptable.c b/src/mainboard/asus/m2n-e/mptable.c
index faa000c0ba..5d9f0fc400 100644
--- a/src/mainboard/asus/m2n-e/mptable.c
+++ b/src/mainboard/asus/m2n-e/mptable.c
@@ -34,7 +34,7 @@ static void *smp_write_config_table(void *v)
 	struct mp_config_table *mc;
 	unsigned int sbdn;
 	int i, j, bus_isa;
-	device_t dev;
+	struct device *dev;
 	struct resource *res;
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
diff --git a/src/mainboard/asus/m2v/mainboard.c b/src/mainboard/asus/m2v/mainboard.c
index 3d538f5c88..e16faebfae 100644
--- a/src/mainboard/asus/m2v/mainboard.c
+++ b/src/mainboard/asus/m2v/mainboard.c
@@ -22,7 +22,7 @@
 
 u32 vt8237_ide_80pin_detect(struct device *dev)
 {
-	device_t lpc_dev;
+	struct device *lpc_dev;
 	u16 acpi_io_base;
 	u32 gpio_in;
 	u32 res;
diff --git a/src/mainboard/asus/m4a78-em/get_bus_conf.c b/src/mainboard/asus/m4a78-em/get_bus_conf.c
index 8931d95d7e..18cf0a841e 100644
--- a/src/mainboard/asus/m4a78-em/get_bus_conf.c
+++ b/src/mainboard/asus/m4a78-em/get_bus_conf.c
@@ -57,7 +57,7 @@ static u32 get_bus_conf_done = 0;
 void get_bus_conf(void)
 {
 	u32 apicid_base;
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if (get_bus_conf_done == 1)
diff --git a/src/mainboard/asus/m4a78-em/mainboard.c b/src/mainboard/asus/m4a78-em/mainboard.c
index 64bd058c0c..99a1cf6e3b 100644
--- a/src/mainboard/asus/m4a78-em/mainboard.c
+++ b/src/mainboard/asus/m4a78-em/mainboard.c
@@ -32,7 +32,7 @@ void set_pcie_dereset()
 {
 	u8 byte;
 	u16 word;
-	device_t sm_dev;
+	struct device *sm_dev;
 	/* set 0 to bit1 :disable GPM9 as SLP_S2 output */
 	/* set 0 to bit2 :disable GPM8 as AZ_RST output */
 	byte = pm_ioread(0x8d);
@@ -57,7 +57,7 @@ void set_pcie_reset()
 {
 	u8 byte;
 	u16 word;
-	device_t sm_dev;
+	struct device *sm_dev;
 
 	/* set 0 to bit1 :disable GPM9 as SLP_S2 output */
 	/* set 0 to bit2 :disable GPM8 as AZ_RST output */
@@ -87,7 +87,7 @@ void set_pcie_reset()
 u8 is_dev3_present(void)
 {
 	u16 word;
-	device_t sm_dev;
+	struct device *sm_dev;
 
 	/* access the smbus extended register */
 	sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
@@ -114,7 +114,7 @@ u8 is_dev3_present(void)
 * enable the dedicated function in this board.
 * This function called early than rs780_enable.
 *************************************************/
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
 {
 	printk(BIOS_INFO, "Mainboard enable. dev=0x%p\n", dev);
 
diff --git a/src/mainboard/asus/m4a78-em/mptable.c b/src/mainboard/asus/m4a78-em/mptable.c
index 3f9d7c7f94..379f04aef6 100644
--- a/src/mainboard/asus/m4a78-em/mptable.c
+++ b/src/mainboard/asus/m4a78-em/mptable.c
@@ -46,7 +46,7 @@ static void *smp_write_config_table(void *v)
 
 	/* I/O APICs:   APIC ID Version State   Address */
 	{
-		device_t dev;
+		struct device *dev;
 		u32 dword;
 		u8 byte;
 
diff --git a/src/mainboard/asus/m4a785-m/get_bus_conf.c b/src/mainboard/asus/m4a785-m/get_bus_conf.c
index 8931d95d7e..18cf0a841e 100644
--- a/src/mainboard/asus/m4a785-m/get_bus_conf.c
+++ b/src/mainboard/asus/m4a785-m/get_bus_conf.c
@@ -57,7 +57,7 @@ static u32 get_bus_conf_done = 0;
 void get_bus_conf(void)
 {
 	u32 apicid_base;
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if (get_bus_conf_done == 1)
diff --git a/src/mainboard/asus/m4a785-m/mainboard.c b/src/mainboard/asus/m4a785-m/mainboard.c
index 7c66257fc8..4f4bb9dc78 100644
--- a/src/mainboard/asus/m4a785-m/mainboard.c
+++ b/src/mainboard/asus/m4a785-m/mainboard.c
@@ -41,7 +41,7 @@ void set_pcie_dereset()
 {
 	u8 byte;
 	u16 word;
-	device_t sm_dev;
+	struct device *sm_dev;
 	/* set 0 to bit1 :disable GPM9 as SLP_S2 output */
 	/* set 0 to bit2 :disable GPM8 as AZ_RST output */
 	byte = pm_ioread(0x8d);
@@ -66,7 +66,7 @@ void set_pcie_reset()
 {
 	u8 byte;
 	u16 word;
-	device_t sm_dev;
+	struct device *sm_dev;
 
 	/* set 0 to bit1 :disable GPM9 as SLP_S2 output */
 	/* set 0 to bit2 :disable GPM8 as AZ_RST output */
@@ -96,7 +96,7 @@ void set_pcie_reset()
 u8 is_dev3_present(void)
 {
 	u16 word;
-	device_t sm_dev;
+	struct device *sm_dev;
 
 	/* access the smbus extended register */
 	sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
@@ -125,7 +125,7 @@ static void set_thermal_config(void)
 {
 	u8 byte;
 	u16 word;
-	device_t sm_dev;
+	struct device *sm_dev;
 
 	/* set ADT 7461 */
 	ADT7461_write_byte(0x0B, 0x50);	/* Local Temperature Hight limit */
@@ -186,7 +186,7 @@ static void set_thermal_config(void)
 * enable the dedicated function in this board.
 * This function called early than rs780_enable.
 *************************************************/
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
 {
 	printk(BIOS_INFO, "Mainboard enable. dev=0x%p\n", dev);
 
diff --git a/src/mainboard/asus/m4a785-m/mptable.c b/src/mainboard/asus/m4a785-m/mptable.c
index 3f9d7c7f94..379f04aef6 100644
--- a/src/mainboard/asus/m4a785-m/mptable.c
+++ b/src/mainboard/asus/m4a785-m/mptable.c
@@ -46,7 +46,7 @@ static void *smp_write_config_table(void *v)
 
 	/* I/O APICs:   APIC ID Version State   Address */
 	{
-		device_t dev;
+		struct device *dev;
 		u32 dword;
 		u8 byte;
 
diff --git a/src/mainboard/asus/m5a88-v/get_bus_conf.c b/src/mainboard/asus/m5a88-v/get_bus_conf.c
index 85daf69ced..7b8d6417a1 100644
--- a/src/mainboard/asus/m5a88-v/get_bus_conf.c
+++ b/src/mainboard/asus/m5a88-v/get_bus_conf.c
@@ -61,7 +61,7 @@ static u32 get_bus_conf_done = 0;
 void get_bus_conf(void)
 {
 	u32 apicid_base;
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if (get_bus_conf_done == 1)
diff --git a/src/mainboard/asus/m5a88-v/mainboard.c b/src/mainboard/asus/m5a88-v/mainboard.c
index 256d88992b..b717b014fd 100644
--- a/src/mainboard/asus/m5a88-v/mainboard.c
+++ b/src/mainboard/asus/m5a88-v/mainboard.c
@@ -64,7 +64,7 @@ u8 is_dev3_present(void)
 * enable the dedicated function in M5A88-V board.
 * This function called early than rs780_enable.
 *************************************************/
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
 {
 
 	printk(BIOS_INFO, "Mainboard ASUS M5A88-V Enable. dev=0x%p\n", dev);
-- 
cgit v1.2.3