[coreboot-gerrit] Patch set updated for coreboot: 0af464f mainboard: Don't hide pointer behind typedef

Edward O'Callaghan (eocallaghan@alterapraxis.com) gerrit at coreboot.org
Thu Oct 30 21:02:05 CET 2014


Edward O'Callaghan (eocallaghan at alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7139

-gerrit

commit 0af464f1d310b5d3477e469a17fd604f154030d9
Author: Edward O'Callaghan <eocallaghan at alterapraxis.com>
Date:   Tue Oct 21 09:54:41 2014 +1100

    mainboard: Don't hide pointer behind typedef
    
    Change-Id: I4a0e4e1598e16e13b43401c7e834b292121b63ce
    Signed-off-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>
---
 src/mainboard/advansus/a785e-i/get_bus_conf.c       |  2 +-
 src/mainboard/advansus/a785e-i/mainboard.c          |  2 +-
 src/mainboard/amd/bimini_fam10/get_bus_conf.c       |  2 +-
 src/mainboard/amd/bimini_fam10/mainboard.c          |  4 ++--
 src/mainboard/amd/dbm690t/get_bus_conf.c            |  2 +-
 src/mainboard/amd/dbm690t/mainboard.c               |  4 ++--
 src/mainboard/amd/dbm690t/mptable.c                 |  2 +-
 src/mainboard/amd/dinar/mainboard.c                 |  2 +-
 src/mainboard/amd/dinar/mptable.c                   |  2 +-
 src/mainboard/amd/inagua/mainboard.c                |  2 +-
 src/mainboard/amd/inagua/mptable.c                  |  2 +-
 src/mainboard/amd/mahogany/get_bus_conf.c           |  2 +-
 src/mainboard/amd/mahogany/mainboard.c              |  8 ++++----
 src/mainboard/amd/mahogany/mptable.c                |  2 +-
 src/mainboard/amd/mahogany_fam10/get_bus_conf.c     |  2 +-
 src/mainboard/amd/mahogany_fam10/mainboard.c        |  8 ++++----
 src/mainboard/amd/mahogany_fam10/mptable.c          |  2 +-
 src/mainboard/amd/olivehill/mainboard.c             |  2 +-
 src/mainboard/amd/olivehill/mptable.c               |  2 +-
 src/mainboard/amd/olivehillplus/mainboard.c         |  2 +-
 src/mainboard/amd/olivehillplus/mptable.c           |  2 +-
 src/mainboard/amd/parmer/mainboard.c                |  2 +-
 src/mainboard/amd/parmer/mptable.c                  |  2 +-
 src/mainboard/amd/persimmon/mainboard.c             |  2 +-
 src/mainboard/amd/persimmon/mptable.c               |  2 +-
 src/mainboard/amd/pistachio/get_bus_conf.c          |  2 +-
 src/mainboard/amd/pistachio/mainboard.c             |  4 ++--
 src/mainboard/amd/pistachio/mptable.c               |  2 +-
 src/mainboard/amd/rumba/mainboard.c                 |  2 +-
 src/mainboard/amd/serengeti_cheetah/get_bus_conf.c  |  4 ++--
 src/mainboard/amd/serengeti_cheetah/mainboard.c     |  2 +-
 src/mainboard/amd/serengeti_cheetah/mptable.c       |  4 ++--
 .../amd/serengeti_cheetah_fam10/get_bus_conf.c      |  4 ++--
 src/mainboard/amd/serengeti_cheetah_fam10/mptable.c |  4 ++--
 src/mainboard/amd/south_station/mainboard.c         |  2 +-
 src/mainboard/amd/south_station/mptable.c           |  2 +-
 src/mainboard/amd/thatcher/mainboard.c              |  2 +-
 src/mainboard/amd/thatcher/mptable.c                |  2 +-
 src/mainboard/amd/tilapia_fam10/get_bus_conf.c      |  2 +-
 src/mainboard/amd/tilapia_fam10/mainboard.c         | 14 +++++++-------
 src/mainboard/amd/tilapia_fam10/mptable.c           |  2 +-
 src/mainboard/amd/torpedo/mainboard.c               |  2 +-
 src/mainboard/amd/torpedo/mptable.c                 |  2 +-
 src/mainboard/amd/union_station/mainboard.c         |  2 +-
 src/mainboard/amd/union_station/mptable.c           |  2 +-
 src/mainboard/apple/macbook21/mainboard.c           |  4 ++--
 src/mainboard/arima/hdama/mptable.c                 | 10 +++++-----
 src/mainboard/asrock/939a785gmh/get_bus_conf.c      |  2 +-
 src/mainboard/asrock/939a785gmh/mainboard.c         |  4 ++--
 src/mainboard/asrock/939a785gmh/mptable.c           |  2 +-
 src/mainboard/asrock/e350m1/mainboard.c             |  2 +-
 src/mainboard/asrock/e350m1/mptable.c               |  2 +-
 src/mainboard/asrock/imb-a180/mainboard.c           |  2 +-
 src/mainboard/asrock/imb-a180/mptable.c             |  2 +-
 src/mainboard/asus/a8n_e/get_bus_conf.c             |  2 +-
 src/mainboard/asus/a8n_e/mptable.c                  |  2 +-
 src/mainboard/asus/dsbf/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/m2n-e/get_bus_conf.c             |  2 +-
 src/mainboard/asus/m2n-e/mainboard.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 +-
 src/mainboard/avalue/eax-785e/get_bus_conf.c        |  2 +-
 src/mainboard/avalue/eax-785e/mainboard.c           |  2 +-
 src/mainboard/bachmann/ot200/mainboard.c            |  2 +-
 src/mainboard/broadcom/blast/get_bus_conf.c         |  2 +-
 src/mainboard/broadcom/blast/mptable.c              |  4 ++--
 src/mainboard/dmp/vortex86ex/mainboard.c            |  2 +-
 src/mainboard/emulation/qemu-armv7/mainboard.c      |  2 +-
 src/mainboard/emulation/qemu-i440fx/mainboard.c     |  2 +-
 src/mainboard/emulation/qemu-q35/mainboard.c        |  2 +-
 src/mainboard/getac/p470/mainboard.c                |  6 +++---
 src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c   |  2 +-
 src/mainboard/gigabyte/ga_2761gxdk/mptable.c        |  2 +-
 src/mainboard/gigabyte/m57sli/get_bus_conf.c        |  2 +-
 src/mainboard/gigabyte/m57sli/mainboard.c           |  2 +-
 src/mainboard/gigabyte/m57sli/mptable.c             |  2 +-
 src/mainboard/gigabyte/ma785gm/get_bus_conf.c       |  2 +-
 src/mainboard/gigabyte/ma785gm/mainboard.c          |  8 ++++----
 src/mainboard/gigabyte/ma785gm/mptable.c            |  2 +-
 src/mainboard/gigabyte/ma785gmt/get_bus_conf.c      |  2 +-
 src/mainboard/gigabyte/ma785gmt/mainboard.c         | 12 ++++++------
 src/mainboard/gigabyte/ma785gmt/mptable.c           |  2 +-
 src/mainboard/gigabyte/ma78gm/get_bus_conf.c        |  2 +-
 src/mainboard/gigabyte/ma78gm/mainboard.c           |  6 +++---
 src/mainboard/gigabyte/ma78gm/mptable.c             |  2 +-
 src/mainboard/gizmosphere/gizmo/mainboard.c         |  4 ++--
 src/mainboard/gizmosphere/gizmo/mptable.c           |  2 +-
 src/mainboard/google/bolt/mainboard.c               |  6 +++---
 src/mainboard/google/butterfly/mainboard.c          |  6 +++---
 src/mainboard/google/daisy/mainboard.c              |  4 ++--
 src/mainboard/google/falco/mainboard.c              |  6 +++---
 src/mainboard/google/link/mainboard.c               |  6 +++---
 src/mainboard/google/nyan/mainboard.c               |  4 ++--
 src/mainboard/google/nyan_big/mainboard.c           |  4 ++--
 src/mainboard/google/panther/mainboard.c            |  4 ++--
 src/mainboard/google/parrot/mainboard.c             |  6 +++---
 src/mainboard/google/peach_pit/mainboard.c          |  4 ++--
 src/mainboard/google/peppy/mainboard.c              |  6 +++---
 src/mainboard/google/rambi/mainboard.c              |  6 +++---
 src/mainboard/google/samus/mainboard.c              |  6 +++---
 src/mainboard/google/slippy/mainboard.c             |  6 +++---
 src/mainboard/google/storm/mainboard.c              |  4 ++--
 src/mainboard/google/stout/mainboard.c              |  4 ++--
 src/mainboard/hp/dl145_g1/get_bus_conf.c            |  2 +-
 src/mainboard/hp/dl145_g1/mptable.c                 |  2 +-
 src/mainboard/hp/dl145_g3/get_bus_conf.c            |  2 +-
 src/mainboard/hp/dl145_g3/mptable.c                 |  8 ++++----
 src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c      |  2 +-
 src/mainboard/hp/dl165_g6_fam10/mptable.c           |  8 ++++----
 src/mainboard/hp/pavilion_m6_1035dx/mainboard.c     |  2 +-
 src/mainboard/hp/pavilion_m6_1035dx/mptable.c       |  2 +-
 src/mainboard/ibase/mb899/mainboard.c               |  2 +-
 src/mainboard/ibm/e325/mptable.c                    |  4 ++--
 src/mainboard/ibm/e326/mptable.c                    |  4 ++--
 src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c  |  2 +-
 src/mainboard/iei/kino-780am2-fam10/mainboard.c     |  2 +-
 src/mainboard/iei/kino-780am2-fam10/mptable.c       |  2 +-
 src/mainboard/intel/baskingridge/mainboard.c        |  2 +-
 src/mainboard/intel/bayleybay_fsp/mainboard.c       |  2 +-
 src/mainboard/intel/cougar_canyon2/mainboard.c      |  2 +-
 src/mainboard/intel/eagleheights/mptable.c          |  2 +-
 src/mainboard/intel/emeraldlake2/mainboard.c        |  2 +-
 src/mainboard/intel/jarrell/mptable.c               |  4 ++--
 src/mainboard/intel/minnowmax/mainboard.c           |  2 +-
 src/mainboard/intel/mohonpeak/mainboard.c           |  2 +-
 src/mainboard/intel/truxton/mptable.c               |  2 +-
 src/mainboard/intel/wtm2/mainboard.c                |  2 +-
 src/mainboard/intel/xe7501devkit/mptable.c          |  2 +-
 src/mainboard/iwave/iWRainbowG6/mainboard.c         |  2 +-
 src/mainboard/iwave/iWRainbowG6/mptable.c           |  2 +-
 src/mainboard/iwill/dk8_htx/get_bus_conf.c          |  4 ++--
 src/mainboard/iwill/dk8_htx/mainboard.c             |  2 +-
 src/mainboard/iwill/dk8_htx/mptable.c               |  4 ++--
 src/mainboard/iwill/dk8s2/mptable.c                 |  4 ++--
 src/mainboard/iwill/dk8x/mptable.c                  |  4 ++--
 src/mainboard/jetway/nf81-t56n-lf/mainboard.c       |  2 +-
 src/mainboard/jetway/nf81-t56n-lf/mptable.c         |  2 +-
 src/mainboard/jetway/pa78vm5/get_bus_conf.c         |  2 +-
 src/mainboard/jetway/pa78vm5/mainboard.c            |  8 ++++----
 src/mainboard/jetway/pa78vm5/mptable.c              |  2 +-
 src/mainboard/kontron/986lcd-m/mainboard.c          |  2 +-
 src/mainboard/kontron/kt690/get_bus_conf.c          |  2 +-
 src/mainboard/kontron/kt690/mainboard.c             |  4 ++--
 src/mainboard/kontron/kt690/mptable.c               |  2 +-
 src/mainboard/kontron/ktqm77/mainboard.c            |  6 +++---
 src/mainboard/lenovo/t520/mainboard.c               |  4 ++--
 src/mainboard/lenovo/t530/mainboard.c               |  4 ++--
 src/mainboard/lenovo/t60/mainboard.c                |  7 ++++---
 src/mainboard/lenovo/x200/mainboard.c               |  4 ++--
 src/mainboard/lenovo/x201/mainboard.c               |  6 +++---
 src/mainboard/lenovo/x220/mainboard.c               |  4 ++--
 src/mainboard/lenovo/x230/mainboard.c               |  4 ++--
 src/mainboard/lenovo/x60/mainboard.c                |  8 +++++---
 src/mainboard/lippert/frontrunner-af/mainboard.c    |  2 +-
 src/mainboard/lippert/frontrunner-af/mptable.c      |  2 +-
 src/mainboard/lippert/toucan-af/mainboard.c         |  2 +-
 src/mainboard/lippert/toucan-af/mptable.c           |  2 +-
 src/mainboard/msi/ms7135/get_bus_conf.c             |  2 +-
 src/mainboard/msi/ms7135/mptable.c                  |  2 +-
 src/mainboard/msi/ms7260/get_bus_conf.c             |  2 +-
 src/mainboard/msi/ms7260/mainboard.c                |  2 +-
 src/mainboard/msi/ms7260/mptable.c                  |  2 +-
 src/mainboard/msi/ms9185/get_bus_conf.c             |  2 +-
 src/mainboard/msi/ms9185/mptable.c                  |  4 ++--
 src/mainboard/msi/ms9282/get_bus_conf.c             |  2 +-
 src/mainboard/msi/ms9282/mainboard.c                |  2 +-
 src/mainboard/msi/ms9282/mptable.c                  |  2 +-
 src/mainboard/msi/ms9652_fam10/get_bus_conf.c       |  2 +-
 src/mainboard/msi/ms9652_fam10/mainboard.c          |  2 +-
 src/mainboard/msi/ms9652_fam10/mptable.c            |  2 +-
 src/mainboard/newisys/khepri/mptable.c              |  4 ++--
 src/mainboard/nvidia/l1_2pvv/get_bus_conf.c         |  2 +-
 src/mainboard/nvidia/l1_2pvv/mainboard.c            |  2 +-
 src/mainboard/nvidia/l1_2pvv/mptable.c              |  8 ++++----
 src/mainboard/packardbell/ms2290/mainboard.c        |  2 +-
 src/mainboard/rca/rm4100/mainboard.c                |  4 ++--
 src/mainboard/roda/rk886ex/mainboard.c              |  4 ++--
 src/mainboard/roda/rk9/mainboard.c                  |  2 +-
 src/mainboard/samsung/lumpy/mainboard.c             |  8 +++-----
 src/mainboard/samsung/stumpy/mainboard.c            |  2 +-
 src/mainboard/siemens/sitemp_g1p1/get_bus_conf.c    |  2 +-
 src/mainboard/siemens/sitemp_g1p1/mainboard.c       | 21 +++++++++++----------
 src/mainboard/siemens/sitemp_g1p1/mptable.c         |  2 +-
 src/mainboard/sunw/ultra40/get_bus_conf.c           |  2 +-
 src/mainboard/sunw/ultra40/mptable.c                |  2 +-
 src/mainboard/supermicro/h8dme/get_bus_conf.c       |  2 +-
 src/mainboard/supermicro/h8dme/mptable.c            |  2 +-
 src/mainboard/supermicro/h8dmr/get_bus_conf.c       |  2 +-
 src/mainboard/supermicro/h8dmr/mptable.c            |  2 +-
 src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c |  2 +-
 src/mainboard/supermicro/h8dmr_fam10/mptable.c      |  2 +-
 src/mainboard/supermicro/h8qgi/mainboard.c          |  2 +-
 src/mainboard/supermicro/h8qgi/mptable.c            |  2 +-
 src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c |  2 +-
 src/mainboard/supermicro/h8qme_fam10/mptable.c      |  2 +-
 src/mainboard/supermicro/h8scm/mainboard.c          |  2 +-
 src/mainboard/supermicro/h8scm/mptable.c            |  2 +-
 src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c |  2 +-
 src/mainboard/supermicro/h8scm_fam10/mainboard.c    |  6 +++---
 src/mainboard/supermicro/h8scm_fam10/mptable.c      |  2 +-
 src/mainboard/supermicro/x6dai_g/mptable.c          |  2 +-
 src/mainboard/supermicro/x6dhe_g/mptable.c          |  4 ++--
 src/mainboard/supermicro/x6dhe_g2/mptable.c         |  4 ++--
 src/mainboard/supermicro/x6dhr_ig/mptable.c         |  4 ++--
 src/mainboard/supermicro/x6dhr_ig2/mptable.c        |  4 ++--
 src/mainboard/supermicro/x7db8/mainboard.c          |  2 +-
 src/mainboard/technexion/tim5690/get_bus_conf.c     |  2 +-
 src/mainboard/technexion/tim5690/mainboard.c        |  4 ++--
 src/mainboard/technexion/tim5690/mptable.c          |  2 +-
 src/mainboard/technexion/tim8690/get_bus_conf.c     |  2 +-
 src/mainboard/technexion/tim8690/mainboard.c        |  6 +++---
 src/mainboard/technexion/tim8690/mptable.c          |  2 +-
 src/mainboard/thomson/ip1000/mainboard.c            |  4 ++--
 src/mainboard/tyan/s2735/mptable.c                  |  2 +-
 src/mainboard/tyan/s2850/mptable.c                  |  4 ++--
 src/mainboard/tyan/s2875/mptable.c                  |  4 ++--
 src/mainboard/tyan/s2880/mptable.c                  |  6 +++---
 src/mainboard/tyan/s2881/get_bus_conf.c             |  2 +-
 src/mainboard/tyan/s2881/mptable.c                  |  2 +-
 src/mainboard/tyan/s2882/mptable.c                  |  6 +++---
 src/mainboard/tyan/s2885/get_bus_conf.c             |  2 +-
 src/mainboard/tyan/s2885/mptable.c                  |  2 +-
 src/mainboard/tyan/s2891/get_bus_conf.c             |  2 +-
 src/mainboard/tyan/s2891/mainboard.c                |  2 +-
 src/mainboard/tyan/s2891/mptable.c                  |  2 +-
 src/mainboard/tyan/s2892/get_bus_conf.c             |  2 +-
 src/mainboard/tyan/s2892/mainboard.c                |  2 +-
 src/mainboard/tyan/s2892/mptable.c                  |  2 +-
 src/mainboard/tyan/s2895/get_bus_conf.c             |  2 +-
 src/mainboard/tyan/s2895/mainboard.c                |  2 +-
 src/mainboard/tyan/s2895/mptable.c                  |  2 +-
 src/mainboard/tyan/s2912/get_bus_conf.c             |  2 +-
 src/mainboard/tyan/s2912/mptable.c                  |  2 +-
 src/mainboard/tyan/s2912_fam10/get_bus_conf.c       |  2 +-
 src/mainboard/tyan/s2912_fam10/mptable.c            |  2 +-
 src/mainboard/tyan/s4880/mptable.c                  |  6 +++---
 src/mainboard/tyan/s4882/mptable.c                  |  6 +++---
 src/mainboard/tyan/s8226/mainboard.c                |  2 +-
 src/mainboard/tyan/s8226/mptable.c                  |  2 +-
 src/mainboard/via/epia-m850/mainboard.c             |  2 +-
 src/mainboard/winent/mb6047/get_bus_conf.c          |  2 +-
 src/mainboard/winent/mb6047/mainboard.c             |  2 +-
 src/mainboard/winent/mb6047/mptable.c               |  2 +-
 254 files changed, 397 insertions(+), 395 deletions(-)

diff --git a/src/mainboard/advansus/a785e-i/get_bus_conf.c b/src/mainboard/advansus/a785e-i/get_bus_conf.c
index 80e1d3e..2c5757a 100644
--- a/src/mainboard/advansus/a785e-i/get_bus_conf.c
+++ b/src/mainboard/advansus/a785e-i/get_bus_conf.c
@@ -67,7 +67,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/advansus/a785e-i/mainboard.c b/src/mainboard/advansus/a785e-i/mainboard.c
index 9b6450d..686e968 100644
--- a/src/mainboard/advansus/a785e-i/mainboard.c
+++ b/src/mainboard/advansus/a785e-i/mainboard.c
@@ -73,7 +73,7 @@ u8 is_dev3_present(void)
 * enable the dedicated function in A785E-I 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 A785E-I Enable. dev=0x%p\n", dev);
 
diff --git a/src/mainboard/amd/bimini_fam10/get_bus_conf.c b/src/mainboard/amd/bimini_fam10/get_bus_conf.c
index f7c55143..6b31272 100644
--- a/src/mainboard/amd/bimini_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/bimini_fam10/get_bus_conf.c
@@ -64,7 +64,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/amd/bimini_fam10/mainboard.c b/src/mainboard/amd/bimini_fam10/mainboard.c
index 32c8862..cd4f50e 100644
--- a/src/mainboard/amd/bimini_fam10/mainboard.c
+++ b/src/mainboard/amd/bimini_fam10/mainboard.c
@@ -100,7 +100,7 @@ static void get_ide_dma66(void)
 {
 	u8 byte;
 	/*u32 sm_dev, ide_dev; */
-	device_t sm_dev, ide_dev;
+	struct device * sm_dev, ide_dev;
 
 	sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
 
@@ -123,7 +123,7 @@ static void get_ide_dma66(void)
 * enable the dedicated function in bimini 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 BIMINI Enable. dev=0x%p\n", dev);
 
diff --git a/src/mainboard/amd/dbm690t/get_bus_conf.c b/src/mainboard/amd/dbm690t/get_bus_conf.c
index 084e2b1..c959280 100644
--- a/src/mainboard/amd/dbm690t/get_bus_conf.c
+++ b/src/mainboard/amd/dbm690t/get_bus_conf.c
@@ -63,7 +63,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/amd/dbm690t/mainboard.c b/src/mainboard/amd/dbm690t/mainboard.c
index 43a8d91..b92426c 100644
--- a/src/mainboard/amd/dbm690t/mainboard.c
+++ b/src/mainboard/amd/dbm690t/mainboard.c
@@ -119,7 +119,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 */
@@ -180,7 +180,7 @@ static void set_thermal_config(void)
 * enable the dedicated function in dbm690t board.
 * This function called early than rs690_enable.
 *************************************************/
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	printk(BIOS_INFO, "Mainboard DBM690T Enable. dev=0x%p\n", dev);
 
diff --git a/src/mainboard/amd/dbm690t/mptable.c b/src/mainboard/amd/dbm690t/mptable.c
index 09d137a..c154fe4 100644
--- a/src/mainboard/amd/dbm690t/mptable.c
+++ b/src/mainboard/amd/dbm690t/mptable.c
@@ -50,7 +50,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/amd/dinar/mainboard.c b/src/mainboard/amd/dinar/mainboard.c
index 00f1a84..83171a0 100644
--- a/src/mainboard/amd/dinar/mainboard.c
+++ b/src/mainboard/amd/dinar/mainboard.c
@@ -68,7 +68,7 @@ void set_pcie_dereset(void *nbconfig)
 /*************************************************
  * enable the dedicated function in dinar board.
  *************************************************/
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	printk(BIOS_INFO, "Mainboard Dinar Enable. dev=0x%p\n", dev);
 }
diff --git a/src/mainboard/amd/dinar/mptable.c b/src/mainboard/amd/dinar/mptable.c
index 4e481f5..e796ffe 100644
--- a/src/mainboard/amd/dinar/mptable.c
+++ b/src/mainboard/amd/dinar/mptable.c
@@ -34,7 +34,7 @@ static void *smp_write_config_table(void *v)
 	int bus_isa;
 	u32 apicid_sb700;
 	u32 apicid_rd890;
-	device_t dev;
+	struct device * dev;
 	u32 dword;
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
diff --git a/src/mainboard/amd/inagua/mainboard.c b/src/mainboard/amd/inagua/mainboard.c
index dc23007..0c57350 100644
--- a/src/mainboard/amd/inagua/mainboard.c
+++ b/src/mainboard/amd/inagua/mainboard.c
@@ -74,7 +74,7 @@ void set_pcie_dereset(void)
 /**********************************************
  * Enable the dedicated functions of the board.
  **********************************************/
-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/amd/inagua/mptable.c b/src/mainboard/amd/inagua/mptable.c
index 7686bd2..65f67cc 100644
--- a/src/mainboard/amd/inagua/mptable.c
+++ b/src/mainboard/amd/inagua/mptable.c
@@ -108,7 +108,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/amd/mahogany/get_bus_conf.c b/src/mainboard/amd/mahogany/get_bus_conf.c
index f05ce7f..2e5a44f 100644
--- a/src/mainboard/amd/mahogany/get_bus_conf.c
+++ b/src/mainboard/amd/mahogany/get_bus_conf.c
@@ -63,7 +63,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/amd/mahogany/mainboard.c b/src/mainboard/amd/mahogany/mainboard.c
index 0e542ff..e851e8f 100644
--- a/src/mainboard/amd/mahogany/mainboard.c
+++ b/src/mainboard/amd/mahogany/mainboard.c
@@ -37,7 +37,7 @@ u8 is_dev3_present(void);
 void set_pcie_dereset()
 {
 	u16 word;
-	device_t sm_dev;
+	struct device * sm_dev;
 	/* GPIO 6 reset PCIe slot, GPIO 4 reset GFX PCIe */
 	sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
 
@@ -50,7 +50,7 @@ void set_pcie_dereset()
 void set_pcie_reset()
 {
 	u16 word;
-	device_t sm_dev;
+	struct device * sm_dev;
 	/* GPIO 6 reset PCIe slot, GPIO 4 reset GFX PCIe */
 	sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
 
@@ -70,7 +70,7 @@ static void get_ide_dma66(void)
 {
 	u8 byte;
 	/*u32 sm_dev, ide_dev; */
-	device_t sm_dev, ide_dev;
+	struct device * sm_dev, ide_dev;
 
 	sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
 
@@ -97,7 +97,7 @@ u8 is_dev3_present(void)
 * enable the dedicated function in mahogany 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 MAHOGANY Enable. dev=0x%p\n", dev);
 
diff --git a/src/mainboard/amd/mahogany/mptable.c b/src/mainboard/amd/mahogany/mptable.c
index bd31846..bebf041 100644
--- a/src/mainboard/amd/mahogany/mptable.c
+++ b/src/mainboard/amd/mahogany/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;
 		u32 dword;
 		u8 byte;
 
diff --git a/src/mainboard/amd/mahogany_fam10/get_bus_conf.c b/src/mainboard/amd/mahogany_fam10/get_bus_conf.c
index 47342fb..414b6e7 100644
--- a/src/mainboard/amd/mahogany_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/mahogany_fam10/get_bus_conf.c
@@ -63,7 +63,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/amd/mahogany_fam10/mainboard.c b/src/mainboard/amd/mahogany_fam10/mainboard.c
index 7d4514a..8f90235 100644
--- a/src/mainboard/amd/mahogany_fam10/mainboard.c
+++ b/src/mainboard/amd/mahogany_fam10/mainboard.c
@@ -37,7 +37,7 @@ u8 is_dev3_present(void);
 void set_pcie_dereset()
 {
 	u16 word;
-	device_t sm_dev;
+	struct device * sm_dev;
 	/* GPIO 6 reset PCIe slot, GPIO 4 reset GFX PCIe */
 	sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
 
@@ -50,7 +50,7 @@ void set_pcie_dereset()
 void set_pcie_reset()
 {
 	u16 word;
-	device_t sm_dev;
+	struct device * sm_dev;
 	/* GPIO 6 reset PCIe slot, GPIO 4 reset GFX PCIe */
 	sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
 
@@ -70,7 +70,7 @@ static void get_ide_dma66(void)
 {
 	u8 byte;
 	/*u32 sm_dev, ide_dev; */
-	device_t sm_dev, ide_dev;
+	struct device * sm_dev, ide_dev;
 
 	sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
 
@@ -98,7 +98,7 @@ u8 is_dev3_present(void)
 * enable the dedicated function in mahogany 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 MAHOGANY Enable. dev=0x%p\n", dev);
 
diff --git a/src/mainboard/amd/mahogany_fam10/mptable.c b/src/mainboard/amd/mahogany_fam10/mptable.c
index 11426c2..759ab30 100644
--- a/src/mainboard/amd/mahogany_fam10/mptable.c
+++ b/src/mainboard/amd/mahogany_fam10/mptable.c
@@ -50,7 +50,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/amd/olivehill/mainboard.c b/src/mainboard/amd/olivehill/mainboard.c
index ac40c84..961a111 100644
--- a/src/mainboard/amd/olivehill/mainboard.c
+++ b/src/mainboard/amd/olivehill/mainboard.c
@@ -32,7 +32,7 @@
 /**********************************************
  * 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/amd/olivehill/mptable.c b/src/mainboard/amd/olivehill/mptable.c
index db4a3ff..d209582 100644
--- a/src/mainboard/amd/olivehill/mptable.c
+++ b/src/mainboard/amd/olivehill/mptable.c
@@ -182,7 +182,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/amd/olivehillplus/mainboard.c b/src/mainboard/amd/olivehillplus/mainboard.c
index 6073fd4..1e58d88 100644
--- a/src/mainboard/amd/olivehillplus/mainboard.c
+++ b/src/mainboard/amd/olivehillplus/mainboard.c
@@ -32,7 +32,7 @@
 /**********************************************
  * 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/amd/olivehillplus/mptable.c b/src/mainboard/amd/olivehillplus/mptable.c
index 73660e4..0ca9217 100644
--- a/src/mainboard/amd/olivehillplus/mptable.c
+++ b/src/mainboard/amd/olivehillplus/mptable.c
@@ -143,7 +143,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/amd/parmer/mainboard.c b/src/mainboard/amd/parmer/mainboard.c
index 2ba714a..4b192c2 100644
--- a/src/mainboard/amd/parmer/mainboard.c
+++ b/src/mainboard/amd/parmer/mainboard.c
@@ -32,7 +32,7 @@
 /*************************************************
  * enable the dedicated function in parmer board.
  *************************************************/
-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/amd/parmer/mptable.c b/src/mainboard/amd/parmer/mptable.c
index 05da01a..7999dd8 100644
--- a/src/mainboard/amd/parmer/mptable.c
+++ b/src/mainboard/amd/parmer/mptable.c
@@ -143,7 +143,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/amd/persimmon/mainboard.c b/src/mainboard/amd/persimmon/mainboard.c
index 58ac983..34918a8 100644
--- a/src/mainboard/amd/persimmon/mainboard.c
+++ b/src/mainboard/amd/persimmon/mainboard.c
@@ -151,7 +151,7 @@ void set_pcie_dereset(void)
 /**********************************************
  * Enable the dedicated functions of the board.
  **********************************************/
-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/amd/persimmon/mptable.c b/src/mainboard/amd/persimmon/mptable.c
index 1227d89..1ae44c4 100644
--- a/src/mainboard/amd/persimmon/mptable.c
+++ b/src/mainboard/amd/persimmon/mptable.c
@@ -113,7 +113,7 @@ static void *smp_write_config_table(void *v)
 	PCI_INT(0x2, 0x0, 0x0, intr_data_ptr[PIRQ_E]);	/* Use INTE */
 
 	/* 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/amd/pistachio/get_bus_conf.c b/src/mainboard/amd/pistachio/get_bus_conf.c
index 084e2b1..c959280 100644
--- a/src/mainboard/amd/pistachio/get_bus_conf.c
+++ b/src/mainboard/amd/pistachio/get_bus_conf.c
@@ -63,7 +63,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/amd/pistachio/mainboard.c b/src/mainboard/amd/pistachio/mainboard.c
index 75f92bd..db2cbcf 100644
--- a/src/mainboard/amd/pistachio/mainboard.c
+++ b/src/mainboard/amd/pistachio/mainboard.c
@@ -76,7 +76,7 @@ static void set_thermal_config(void)
 	u8 byte, byte2;
 	u16 word;
 	u32 dword;
-	device_t sm_dev;
+	struct device * sm_dev;
 
 	/* set adt7475 */
 	ADT7475_write_byte(0x40, 0x04);
@@ -250,7 +250,7 @@ static void set_thermal_config(void)
 * enable the dedicated function in pistachio board.
 * This function called early than rs690_enable.
 *************************************************/
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	printk(BIOS_INFO, "Mainboard Pistachio Enable. dev=0x%p\n", dev);
 
diff --git a/src/mainboard/amd/pistachio/mptable.c b/src/mainboard/amd/pistachio/mptable.c
index 09d137a..c154fe4 100644
--- a/src/mainboard/amd/pistachio/mptable.c
+++ b/src/mainboard/amd/pistachio/mptable.c
@@ -50,7 +50,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/amd/rumba/mainboard.c b/src/mainboard/amd/rumba/mainboard.c
index 5725c78..2f6af29 100644
--- a/src/mainboard/amd/rumba/mainboard.c
+++ b/src/mainboard/amd/rumba/mainboard.c
@@ -7,7 +7,7 @@
 
 static void init(struct device *dev)
 {
-	device_t nic = NULL;
+	struct device * nic = NULL;
 	unsigned bus = 0;
 	unsigned devfn = PCI_DEVFN(0xd, 0);
 	int nicirq = 1;
diff --git a/src/mainboard/amd/serengeti_cheetah/get_bus_conf.c b/src/mainboard/amd/serengeti_cheetah/get_bus_conf.c
index f5cd846..f2d7f9e 100644
--- a/src/mainboard/amd/serengeti_cheetah/get_bus_conf.c
+++ b/src/mainboard/amd/serengeti_cheetah/get_bus_conf.c
@@ -48,7 +48,7 @@ static unsigned get_hcid(unsigned i)
 
 	unsigned devn = sysconf.hcdn[i] & 0xff;
 
-	device_t dev;
+	struct device *dev;
 
 	dev = dev_find_slot(busn, PCI_DEVFN(devn, 0));
 
@@ -76,7 +76,7 @@ void get_bus_conf(void)
 
 	unsigned apicid_base;
 
-	device_t dev;
+	struct device *dev;
 	int i, j;
 	struct mb_sysconf_t *m;
 
diff --git a/src/mainboard/amd/serengeti_cheetah/mainboard.c b/src/mainboard/amd/serengeti_cheetah/mainboard.c
index b9c88f6..26f61f8 100644
--- a/src/mainboard/amd/serengeti_cheetah/mainboard.c
+++ b/src/mainboard/amd/serengeti_cheetah/mainboard.c
@@ -5,7 +5,7 @@
 #include <arch/acpigen.h>
 #include "mainboard.h"
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
 }
diff --git a/src/mainboard/amd/serengeti_cheetah/mptable.c b/src/mainboard/amd/serengeti_cheetah/mptable.c
index 866875d..341b367 100644
--- a/src/mainboard/amd/serengeti_cheetah/mptable.c
+++ b/src/mainboard/amd/serengeti_cheetah/mptable.c
@@ -31,7 +31,7 @@ static void *smp_write_config_table(void *v)
 /*I/O APICs:	APIC ID	Version	State		Address*/
 	smp_write_ioapic(mc, m->apicid_8111, 0x11, IO_APIC_ADDR); //8111
         {
-                device_t dev;
+                struct device * dev;
 		struct resource *res;
                 dev = dev_find_slot(m->bus_8132_0, PCI_DEVFN(m->sbdn3, 1));
                 if (dev) {
@@ -114,7 +114,7 @@ static void *smp_write_config_table(void *v)
         for(i=1; i< sysconf.hc_possible_num; i++) {
                 if(!(sysconf.pci1234[i] & 0x1) ) continue;
                 int ii;
-                device_t dev;
+                struct device * dev;
                 struct resource *res;
                 switch(sysconf.hcid[i]) {
                 case 1:
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c b/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c
index 48d5cc3..02dfb3c 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c
@@ -71,7 +71,7 @@ static u32 get_hcid(u32 i)
 	u32 id = 0;
 	u32 busn = (sysconf.pci1234[i] >> 12) & 0xff;
 	u32 devn = sysconf.hcdn[i] & 0xff;
-	device_t dev;
+	struct device *dev;
 
 	dev = dev_find_slot(busn, PCI_DEVFN(devn,0));
 
@@ -95,7 +95,7 @@ void get_bus_conf(void)
 {
 	u32 apicid_base;
 
-	device_t dev;
+	struct device *dev;
 	int i, j;
 	struct mb_sysconf_t *m;
 
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c b/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c
index 5335cb8..3b4731b 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c
@@ -50,7 +50,7 @@ static void *smp_write_config_table(void *v)
 	/*I/O APICs:	APIC ID	Version	State	Address*/
 	smp_write_ioapic(mc, m->apicid_8111, 0x11, IO_APIC_ADDR); //8111
 	{
-		device_t dev;
+		struct device * dev;
 		struct resource *res;
 		dev = dev_find_slot(m->bus_8132_0, PCI_DEVFN(m->sbdn3, 1));
 		if (dev) {
@@ -134,7 +134,7 @@ static void *smp_write_config_table(void *v)
 		if(!(sysconf.pci1234[i] & 0x1) ) continue;
 		int ii;
 		int jj;
-		device_t dev;
+		struct device * dev;
 		struct resource *res;
 		switch(sysconf.hcid[i]) {
 		case 1:
diff --git a/src/mainboard/amd/south_station/mainboard.c b/src/mainboard/amd/south_station/mainboard.c
index 43d6a78..1be0c0a 100644
--- a/src/mainboard/amd/south_station/mainboard.c
+++ b/src/mainboard/amd/south_station/mainboard.c
@@ -77,7 +77,7 @@ static void southstation_led_init(void)
 /**********************************************
  * Enable the dedicated functions of the board.
  **********************************************/
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
 	southstation_led_init();
diff --git a/src/mainboard/amd/south_station/mptable.c b/src/mainboard/amd/south_station/mptable.c
index c2ec4a2..0446e6c 100644
--- a/src/mainboard/amd/south_station/mptable.c
+++ b/src/mainboard/amd/south_station/mptable.c
@@ -105,7 +105,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/amd/thatcher/mainboard.c b/src/mainboard/amd/thatcher/mainboard.c
index 834117e..e7b7ecf 100644
--- a/src/mainboard/amd/thatcher/mainboard.c
+++ b/src/mainboard/amd/thatcher/mainboard.c
@@ -32,7 +32,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/amd/thatcher/mptable.c b/src/mainboard/amd/thatcher/mptable.c
index 8ddd1b6..e34b899 100644
--- a/src/mainboard/amd/thatcher/mptable.c
+++ b/src/mainboard/amd/thatcher/mptable.c
@@ -143,7 +143,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/amd/tilapia_fam10/get_bus_conf.c b/src/mainboard/amd/tilapia_fam10/get_bus_conf.c
index 47342fb..414b6e7 100644
--- a/src/mainboard/amd/tilapia_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/tilapia_fam10/get_bus_conf.c
@@ -63,7 +63,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/amd/tilapia_fam10/mainboard.c b/src/mainboard/amd/tilapia_fam10/mainboard.c
index 48e4c17..efea2fa 100644
--- a/src/mainboard/amd/tilapia_fam10/mainboard.c
+++ b/src/mainboard/amd/tilapia_fam10/mainboard.c
@@ -45,7 +45,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);
@@ -70,7 +70,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 */
@@ -102,7 +102,7 @@ static void get_ide_dma66(void)
 {
 	u8 byte;
 	/*u32 sm_dev, ide_dev; */
-	device_t sm_dev, ide_dev;
+	struct device * sm_dev, ide_dev;
 
 	sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
 
@@ -127,7 +127,7 @@ static void get_ide_dma66(void)
 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));
@@ -157,7 +157,7 @@ static void set_gpio40_gfx(void)
 {
 	u8 byte;
 	u32 dword;
-	device_t sm_dev;
+	struct device * sm_dev;
 	/* disable the GPIO40 as CLKREQ2# function */
 	byte = pm_ioread(0xd3);
 	byte &= ~(1 << 7);
@@ -212,7 +212,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 */
@@ -273,7 +273,7 @@ static void set_thermal_config(void)
 * enable the dedicated function in tilapia 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 TILAPIA Enable. dev=0x%p\n", dev);
 
diff --git a/src/mainboard/amd/tilapia_fam10/mptable.c b/src/mainboard/amd/tilapia_fam10/mptable.c
index 11426c2..759ab30 100644
--- a/src/mainboard/amd/tilapia_fam10/mptable.c
+++ b/src/mainboard/amd/tilapia_fam10/mptable.c
@@ -50,7 +50,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/amd/torpedo/mainboard.c b/src/mainboard/amd/torpedo/mainboard.c
index 9b52b89..f5f9c94 100644
--- a/src/mainboard/amd/torpedo/mainboard.c
+++ b/src/mainboard/amd/torpedo/mainboard.c
@@ -52,7 +52,7 @@ void set_pcie_dereset(void)
 /*************************************************
 * enable the dedicated function in torpedo board.
 *************************************************/
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
   printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable. dev=0x%p\n", dev);
 }
diff --git a/src/mainboard/amd/torpedo/mptable.c b/src/mainboard/amd/torpedo/mptable.c
index 477d97a..53038dd 100644
--- a/src/mainboard/amd/torpedo/mptable.c
+++ b/src/mainboard/amd/torpedo/mptable.c
@@ -186,7 +186,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;
 
diff --git a/src/mainboard/amd/union_station/mainboard.c b/src/mainboard/amd/union_station/mainboard.c
index 8816e8d..ca2e887 100644
--- a/src/mainboard/amd/union_station/mainboard.c
+++ b/src/mainboard/amd/union_station/mainboard.c
@@ -50,7 +50,7 @@ void set_pcie_dereset(void)
 /**********************************************
  * Enable the dedicated functions of the board.
  **********************************************/
-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/amd/union_station/mptable.c b/src/mainboard/amd/union_station/mptable.c
index c2ec4a2..0446e6c 100644
--- a/src/mainboard/amd/union_station/mptable.c
+++ b/src/mainboard/amd/union_station/mptable.c
@@ -105,7 +105,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/apple/macbook21/mainboard.c b/src/mainboard/apple/macbook21/mainboard.c
index 99527c1..c9858d8 100644
--- a/src/mainboard/apple/macbook21/mainboard.c
+++ b/src/mainboard/apple/macbook21/mainboard.c
@@ -41,12 +41,12 @@ int get_cst_entries(acpi_cstate_t **entries)
 	return 0;
 }
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS, GMA_INT15_PANEL_FIT_DEFAULT, PANEL, 3);
 }
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->init = mainboard_init;
 }
diff --git a/src/mainboard/arima/hdama/mptable.c b/src/mainboard/arima/hdama/mptable.c
index 6ee2704..c1a6cef 100644
--- a/src/mainboard/arima/hdama/mptable.c
+++ b/src/mainboard/arima/hdama/mptable.c
@@ -13,7 +13,7 @@
 
 static unsigned node_link_to_bus(unsigned node, unsigned link)
 {
-	device_t dev;
+	struct device * dev;
 	unsigned reg;
 
 	dev = dev_find_slot(0, PCI_DEVFN(0x18, 1));
@@ -48,7 +48,7 @@ static unsigned node_link_to_bus(unsigned node, unsigned link)
 static unsigned max_apicid(void)
 {
 	unsigned max;
-	device_t dev;
+	struct device * dev;
 	max = 0;
 	for(dev = all_devices; dev; dev = dev->next) {
 		if (dev->path.type != DEVICE_PATH_APIC)
@@ -84,7 +84,7 @@ static void *smp_write_config_table(void *v)
 	apicid_8131_1 = apicid_base + 1;
 	apicid_8131_2 = apicid_base + 2;
 	{
-		device_t dev;
+		struct device * dev;
 
 		/* HT chain 0 */
 		bus_chain_0 = node_link_to_bus(0, 0);
@@ -127,7 +127,7 @@ static void *smp_write_config_table(void *v)
 	/* IOAPIC handling */
 	smp_write_ioapic(mc, apicid_8111, 0x11, IO_APIC_ADDR);
 	{
-		device_t dev;
+		struct device * dev;
 		struct resource *res;
 		/* 8131 apic 3 */
 		dev = dev_find_slot(bus_chain_0, PCI_DEVFN(0x01,1));
@@ -206,7 +206,7 @@ static void *smp_write_config_table(void *v)
 static void reboot_if_hotswap(void)
 {
 	/* Hack patch work around for hot swap enable 33mhz problem */
-	device_t dev;
+	struct device * dev;
 	uint32_t data;
 	unsigned long htic;
 	int reset;
diff --git a/src/mainboard/asrock/939a785gmh/get_bus_conf.c b/src/mainboard/asrock/939a785gmh/get_bus_conf.c
index f05ce7f..2e5a44f 100644
--- a/src/mainboard/asrock/939a785gmh/get_bus_conf.c
+++ b/src/mainboard/asrock/939a785gmh/get_bus_conf.c
@@ -63,7 +63,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/asrock/939a785gmh/mainboard.c b/src/mainboard/asrock/939a785gmh/mainboard.c
index 58ad8b2..a8d2913 100644
--- a/src/mainboard/asrock/939a785gmh/mainboard.c
+++ b/src/mainboard/asrock/939a785gmh/mainboard.c
@@ -67,7 +67,7 @@ static void get_ide_dma66(void)
 {
 	u8 byte;
 	/*u32 sm_dev, ide_dev; */
-	device_t sm_dev, ide_dev;
+	struct device * sm_dev, ide_dev;
 
 	sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
 
@@ -95,7 +95,7 @@ u8 is_dev3_present(void)
 * enable the dedicated function in mahogany 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 939A785GMH/128M Enable. dev=0x%p\n", dev);
 
diff --git a/src/mainboard/asrock/939a785gmh/mptable.c b/src/mainboard/asrock/939a785gmh/mptable.c
index 790d1da..0d174bc 100644
--- a/src/mainboard/asrock/939a785gmh/mptable.c
+++ b/src/mainboard/asrock/939a785gmh/mptable.c
@@ -50,7 +50,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/asrock/e350m1/mainboard.c b/src/mainboard/asrock/e350m1/mainboard.c
index a98a179..1f554f2 100644
--- a/src/mainboard/asrock/e350m1/mainboard.c
+++ b/src/mainboard/asrock/e350m1/mainboard.c
@@ -50,7 +50,7 @@ void set_pcie_dereset(void)
 /**********************************************
  * Enable the dedicated functions of the board.
  **********************************************/
-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/asrock/e350m1/mptable.c b/src/mainboard/asrock/e350m1/mptable.c
index 14fa316..23b5261 100644
--- a/src/mainboard/asrock/e350m1/mptable.c
+++ b/src/mainboard/asrock/e350m1/mptable.c
@@ -106,7 +106,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/asrock/imb-a180/mainboard.c b/src/mainboard/asrock/imb-a180/mainboard.c
index ac40c84..961a111 100644
--- a/src/mainboard/asrock/imb-a180/mainboard.c
+++ b/src/mainboard/asrock/imb-a180/mainboard.c
@@ -32,7 +32,7 @@
 /**********************************************
  * 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/asrock/imb-a180/mptable.c b/src/mainboard/asrock/imb-a180/mptable.c
index d9ca7b7..38db63a 100644
--- a/src/mainboard/asrock/imb-a180/mptable.c
+++ b/src/mainboard/asrock/imb-a180/mptable.c
@@ -183,7 +183,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/a8n_e/get_bus_conf.c b/src/mainboard/asus/a8n_e/get_bus_conf.c
index a55401b..22d0123 100644
--- a/src/mainboard/asus/a8n_e/get_bus_conf.c
+++ b/src/mainboard/asus/a8n_e/get_bus_conf.c
@@ -63,7 +63,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 a954d92..b6e1059 100644
--- a/src/mainboard/asus/a8n_e/mptable.c
+++ b/src/mainboard/asus/a8n_e/mptable.c
@@ -50,7 +50,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/dsbf/mainboard.c b/src/mainboard/asus/dsbf/mainboard.c
index 1d666c9..cf0c044 100644
--- a/src/mainboard/asus/dsbf/mainboard.c
+++ b/src/mainboard/asus/dsbf/mainboard.c
@@ -27,7 +27,7 @@
 #include <device/pci_ops.h>
 #include <arch/io.h>
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 }
 
diff --git a/src/mainboard/asus/f2a85-m/mainboard.c b/src/mainboard/asus/f2a85-m/mainboard.c
index 191eea8..ff4eb20 100644
--- a/src/mainboard/asus/f2a85-m/mainboard.c
+++ b/src/mainboard/asus/f2a85-m/mainboard.c
@@ -32,7 +32,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 cc81819..e5d7603 100644
--- a/src/mainboard/asus/f2a85-m/mptable.c
+++ b/src/mainboard/asus/f2a85-m/mptable.c
@@ -149,7 +149,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 cd45213..2898b51 100644
--- a/src/mainboard/asus/k8v-x/mainboard.c
+++ b/src/mainboard/asus/k8v-x/mainboard.c
@@ -27,7 +27,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/m2n-e/get_bus_conf.c b/src/mainboard/asus/m2n-e/get_bus_conf.c
index fd7d304..c9d113d 100644
--- a/src/mainboard/asus/m2n-e/get_bus_conf.c
+++ b/src/mainboard/asus/m2n-e/get_bus_conf.c
@@ -69,7 +69,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/mainboard.c b/src/mainboard/asus/m2n-e/mainboard.c
index 2c18100..7bf4639 100644
--- a/src/mainboard/asus/m2n-e/mainboard.c
+++ b/src/mainboard/asus/m2n-e/mainboard.c
@@ -21,7 +21,7 @@
 #include <device/device.h>
 
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 }
 
diff --git a/src/mainboard/asus/m2n-e/mptable.c b/src/mainboard/asus/m2n-e/mptable.c
index 333ec49..69a5260 100644
--- a/src/mainboard/asus/m2n-e/mptable.c
+++ b/src/mainboard/asus/m2n-e/mptable.c
@@ -38,7 +38,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 21adac0..cbacc88 100644
--- a/src/mainboard/asus/m2v/mainboard.c
+++ b/src/mainboard/asus/m2v/mainboard.c
@@ -26,7 +26,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 47342fb..414b6e7 100644
--- a/src/mainboard/asus/m4a78-em/get_bus_conf.c
+++ b/src/mainboard/asus/m4a78-em/get_bus_conf.c
@@ -63,7 +63,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 1a2e9fc..b32ca0c 100644
--- a/src/mainboard/asus/m4a78-em/mainboard.c
+++ b/src/mainboard/asus/m4a78-em/mainboard.c
@@ -36,7 +36,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);
@@ -61,7 +61,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 */
@@ -91,7 +91,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));
@@ -118,7 +118,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 11426c2..759ab30 100644
--- a/src/mainboard/asus/m4a78-em/mptable.c
+++ b/src/mainboard/asus/m4a78-em/mptable.c
@@ -50,7 +50,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 47342fb..414b6e7 100644
--- a/src/mainboard/asus/m4a785-m/get_bus_conf.c
+++ b/src/mainboard/asus/m4a785-m/get_bus_conf.c
@@ -63,7 +63,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 b1154ab..edaecab 100644
--- a/src/mainboard/asus/m4a785-m/mainboard.c
+++ b/src/mainboard/asus/m4a785-m/mainboard.c
@@ -45,7 +45,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);
@@ -70,7 +70,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 */
@@ -100,7 +100,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));
@@ -129,7 +129,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 */
@@ -190,7 +190,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 11426c2..759ab30 100644
--- a/src/mainboard/asus/m4a785-m/mptable.c
+++ b/src/mainboard/asus/m4a785-m/mptable.c
@@ -50,7 +50,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 f90c6b8..4c8efff 100644
--- a/src/mainboard/asus/m5a88-v/get_bus_conf.c
+++ b/src/mainboard/asus/m5a88-v/get_bus_conf.c
@@ -67,7 +67,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 8ee338e..1da327b 100644
--- a/src/mainboard/asus/m5a88-v/mainboard.c
+++ b/src/mainboard/asus/m5a88-v/mainboard.c
@@ -73,7 +73,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);
diff --git a/src/mainboard/avalue/eax-785e/get_bus_conf.c b/src/mainboard/avalue/eax-785e/get_bus_conf.c
index f90c6b8..4c8efff 100644
--- a/src/mainboard/avalue/eax-785e/get_bus_conf.c
+++ b/src/mainboard/avalue/eax-785e/get_bus_conf.c
@@ -67,7 +67,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/avalue/eax-785e/mainboard.c b/src/mainboard/avalue/eax-785e/mainboard.c
index 6ce3469..6ee5923 100644
--- a/src/mainboard/avalue/eax-785e/mainboard.c
+++ b/src/mainboard/avalue/eax-785e/mainboard.c
@@ -73,7 +73,7 @@ u8 is_dev3_present(void)
 * enable the dedicated function in EAX-785E 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 " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
 
diff --git a/src/mainboard/bachmann/ot200/mainboard.c b/src/mainboard/bachmann/ot200/mainboard.c
index d4b0b2d..ea13cef 100644
--- a/src/mainboard/bachmann/ot200/mainboard.c
+++ b/src/mainboard/bachmann/ot200/mainboard.c
@@ -46,7 +46,7 @@ static void init(struct device *dev)
 	u32 chksum = 0;
 	char block[20];
 	msr_t reset;
-	device_t eeprom_dev = dev_find_slot_on_smbus(1, 0x52);
+	struct device * eeprom_dev = dev_find_slot_on_smbus(1, 0x52);
 
 	if (eeprom_dev == 0) {
 		printk(BIOS_WARNING, "eeprom not found\n");
diff --git a/src/mainboard/broadcom/blast/get_bus_conf.c b/src/mainboard/broadcom/blast/get_bus_conf.c
index 5de8952..f95d70a 100644
--- a/src/mainboard/broadcom/blast/get_bus_conf.c
+++ b/src/mainboard/broadcom/blast/get_bus_conf.c
@@ -50,7 +50,7 @@ void get_bus_conf(void)
 
 	unsigned apicid_base;
 
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if (get_bus_conf_done == 1)
diff --git a/src/mainboard/broadcom/blast/mptable.c b/src/mainboard/broadcom/blast/mptable.c
index d7ae6b7..9d415d2 100644
--- a/src/mainboard/broadcom/blast/mptable.c
+++ b/src/mainboard/broadcom/blast/mptable.c
@@ -34,7 +34,7 @@ static void *smp_write_config_table(void *v)
 
 /*I/O APICs:	APIC ID	Version	State		Address*/
         {
-                device_t dev = 0;
+                struct device * dev = 0;
 		struct resource *res;
 		for(i=0; i<3; i++) {
 	                dev = dev_find_device(0x1166, 0x0235, dev);
@@ -70,7 +70,7 @@ static void *smp_write_config_table(void *v)
         /* enable int */
         /* why here? must get the BAR and PCI command bit 1 set before enable it ....*/
         {
-                device_t dev;
+                struct device * dev;
                 dev = dev_find_device(0x1166, 0x0205, 0);
                 if(dev) {
                         uint32_t dword;
diff --git a/src/mainboard/dmp/vortex86ex/mainboard.c b/src/mainboard/dmp/vortex86ex/mainboard.c
index 2761035..381658a 100644
--- a/src/mainboard/dmp/vortex86ex/mainboard.c
+++ b/src/mainboard/dmp/vortex86ex/mainboard.c
@@ -25,7 +25,7 @@
 #include <device/pci_def.h>
 
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 }
 
diff --git a/src/mainboard/emulation/qemu-armv7/mainboard.c b/src/mainboard/emulation/qemu-armv7/mainboard.c
index 83a55e3..815f50e 100644
--- a/src/mainboard/emulation/qemu-armv7/mainboard.c
+++ b/src/mainboard/emulation/qemu-armv7/mainboard.c
@@ -16,7 +16,7 @@
 #include <console/console.h>
 #include <device/device.h>
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	printk(BIOS_INFO, "Enable qemu/armv7 device...\n");
 }
diff --git a/src/mainboard/emulation/qemu-i440fx/mainboard.c b/src/mainboard/emulation/qemu-i440fx/mainboard.c
index a8a61c4..6d1f2b0 100644
--- a/src/mainboard/emulation/qemu-i440fx/mainboard.c
+++ b/src/mainboard/emulation/qemu-i440fx/mainboard.c
@@ -30,7 +30,7 @@ static const unsigned char qemu_i440fx_irqs[] = {
 	11, 10, 10, 11,
 };
 
-static void qemu_nb_init(device_t dev)
+static void qemu_nb_init(struct device * dev)
 {
 	/* Map memory at 0xc0000 - 0xfffff */
 	int i;
diff --git a/src/mainboard/emulation/qemu-q35/mainboard.c b/src/mainboard/emulation/qemu-q35/mainboard.c
index e991b53..622ea54 100644
--- a/src/mainboard/emulation/qemu-q35/mainboard.c
+++ b/src/mainboard/emulation/qemu-q35/mainboard.c
@@ -33,7 +33,7 @@ static const unsigned char qemu_q35_irqs[] = {
 	10, 10, 11, 11,
 };
 
-static void qemu_nb_init(device_t dev)
+static void qemu_nb_init(struct device * dev)
 {
 	/* Map memory at 0xc0000 - 0xfffff */
 	int i;
diff --git a/src/mainboard/getac/p470/mainboard.c b/src/mainboard/getac/p470/mainboard.c
index 2b33ff0..1dc881a 100644
--- a/src/mainboard/getac/p470/mainboard.c
+++ b/src/mainboard/getac/p470/mainboard.c
@@ -62,7 +62,7 @@ static void pcie_limit_power(void)
 	// machine. It should set the slot numbers and enable power
 	// limitation for the PCIe slots.
 
-	device_t dev;
+	struct device * dev;
 
 	dev = dev_find_slot(0, PCI_DEVFN(28,0));
 	if (dev) pci_write_config32(dev, 0x54, 0x0010a0e0);
@@ -79,14 +79,14 @@ static void pcie_limit_power(void)
 }
 
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	ec_enable();
 }
 
 // mainboard_enable is executed as first thing after
 // enumerate_buses(). Is there no mainboard_init()?
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->init = mainboard_init;
 	dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c b/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c
index 9315cbd..c9c1950 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c
@@ -69,7 +69,7 @@ void get_bus_conf(void)
 	unsigned apicid_base;
 	unsigned sbdn;
 
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if (get_bus_conf_done == 1)
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/mptable.c b/src/mainboard/gigabyte/ga_2761gxdk/mptable.c
index 0af6cf0..9e8c7bf 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/mptable.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/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;
 		uint32_t dword;
 
diff --git a/src/mainboard/gigabyte/m57sli/get_bus_conf.c b/src/mainboard/gigabyte/m57sli/get_bus_conf.c
index c798415..db5b685 100644
--- a/src/mainboard/gigabyte/m57sli/get_bus_conf.c
+++ b/src/mainboard/gigabyte/m57sli/get_bus_conf.c
@@ -67,7 +67,7 @@ void get_bus_conf(void)
 	unsigned apicid_base;
 	unsigned sbdn;
 
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if (get_bus_conf_done == 1)
diff --git a/src/mainboard/gigabyte/m57sli/mainboard.c b/src/mainboard/gigabyte/m57sli/mainboard.c
index 291d4f7..a668696 100644
--- a/src/mainboard/gigabyte/m57sli/mainboard.c
+++ b/src/mainboard/gigabyte/m57sli/mainboard.c
@@ -26,7 +26,7 @@
 #include <device/pci_ops.h>
 
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 }
 
diff --git a/src/mainboard/gigabyte/m57sli/mptable.c b/src/mainboard/gigabyte/m57sli/mptable.c
index 1536823..43459bc 100644
--- a/src/mainboard/gigabyte/m57sli/mptable.c
+++ b/src/mainboard/gigabyte/m57sli/mptable.c
@@ -50,7 +50,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_mcp55[0], PCI_DEVFN(sbdn+ 0x1,0));
diff --git a/src/mainboard/gigabyte/ma785gm/get_bus_conf.c b/src/mainboard/gigabyte/ma785gm/get_bus_conf.c
index 47342fb..414b6e7 100644
--- a/src/mainboard/gigabyte/ma785gm/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ma785gm/get_bus_conf.c
@@ -63,7 +63,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/gigabyte/ma785gm/mainboard.c b/src/mainboard/gigabyte/ma785gm/mainboard.c
index cd06069..9fe9c7f 100644
--- a/src/mainboard/gigabyte/ma785gm/mainboard.c
+++ b/src/mainboard/gigabyte/ma785gm/mainboard.c
@@ -35,7 +35,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);
@@ -60,7 +60,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 */
@@ -98,7 +98,7 @@ static void set_gpio40_gfx(void)
 	u8 byte;
 //	u16 word;
 	u32 dword;
-	device_t sm_dev;
+	struct device * sm_dev;
 	/* disable the GPIO40 as CLKREQ2# function */
 	byte = pm_ioread(0xd3);
 	byte &= ~(1 << 7);
@@ -134,7 +134,7 @@ static void set_gpio40_gfx(void)
 * enable the dedicated function in ma785gm 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 MA785GM-US2H Enable. dev=0x%p\n", dev);
 
diff --git a/src/mainboard/gigabyte/ma785gm/mptable.c b/src/mainboard/gigabyte/ma785gm/mptable.c
index 11426c2..759ab30 100644
--- a/src/mainboard/gigabyte/ma785gm/mptable.c
+++ b/src/mainboard/gigabyte/ma785gm/mptable.c
@@ -50,7 +50,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/gigabyte/ma785gmt/get_bus_conf.c b/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c
index 47342fb..414b6e7 100644
--- a/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c
@@ -63,7 +63,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/gigabyte/ma785gmt/mainboard.c b/src/mainboard/gigabyte/ma785gmt/mainboard.c
index 89b50bb..f591ebb 100644
--- a/src/mainboard/gigabyte/ma785gmt/mainboard.c
+++ b/src/mainboard/gigabyte/ma785gmt/mainboard.c
@@ -45,7 +45,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);
@@ -70,7 +70,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 */
@@ -98,7 +98,7 @@ void set_pcie_reset()
 int 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));
@@ -128,7 +128,7 @@ static void set_gpio40_gfx(void)
 	u8 byte;
 //	u16 word;
 	u32 dword;
-	device_t sm_dev;
+	struct device * sm_dev;
 	/* disable the GPIO40 as CLKREQ2# function */
 	byte = pm_ioread(0xd3);
 	byte &= ~(1 << 7);
@@ -183,7 +183,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 */
@@ -244,7 +244,7 @@ static void set_thermal_config(void)
 * enable the dedicated function in ma785gmt 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 MA785GMT-UD2H Enable. dev=0x%p\n", dev);
 
diff --git a/src/mainboard/gigabyte/ma785gmt/mptable.c b/src/mainboard/gigabyte/ma785gmt/mptable.c
index 11426c2..759ab30 100644
--- a/src/mainboard/gigabyte/ma785gmt/mptable.c
+++ b/src/mainboard/gigabyte/ma785gmt/mptable.c
@@ -50,7 +50,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/gigabyte/ma78gm/get_bus_conf.c b/src/mainboard/gigabyte/ma78gm/get_bus_conf.c
index 47342fb..414b6e7 100644
--- a/src/mainboard/gigabyte/ma78gm/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ma78gm/get_bus_conf.c
@@ -63,7 +63,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/gigabyte/ma78gm/mainboard.c b/src/mainboard/gigabyte/ma78gm/mainboard.c
index 49df0c2..2fd5c52 100644
--- a/src/mainboard/gigabyte/ma78gm/mainboard.c
+++ b/src/mainboard/gigabyte/ma78gm/mainboard.c
@@ -38,7 +38,7 @@ u8 is_dev3_present(void);
 void set_pcie_dereset()
 {
 	u16 word;
-	device_t sm_dev;
+	struct device * sm_dev;
 	/* GPIO 6 reset PCIe slot, GPIO 4 reset GFX PCIe */
 	sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
 
@@ -51,7 +51,7 @@ void set_pcie_dereset()
 void set_pcie_reset()
 {
 	u16 word;
-	device_t sm_dev;
+	struct device * sm_dev;
 	/* GPIO 6 reset PCIe slot, GPIO 4 reset GFX PCIe */
 	sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
 
@@ -71,7 +71,7 @@ u8 is_dev3_present(void)
 * enable the dedicated function in 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 MA78GM-US2H Enable. dev=0x%p\n", dev);
 
diff --git a/src/mainboard/gigabyte/ma78gm/mptable.c b/src/mainboard/gigabyte/ma78gm/mptable.c
index 11426c2..759ab30 100644
--- a/src/mainboard/gigabyte/ma78gm/mptable.c
+++ b/src/mainboard/gigabyte/ma78gm/mptable.c
@@ -50,7 +50,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/gizmosphere/gizmo/mainboard.c b/src/mainboard/gizmosphere/gizmo/mainboard.c
index a9afdfb..ad8fa58 100755
--- a/src/mainboard/gizmosphere/gizmo/mainboard.c
+++ b/src/mainboard/gizmosphere/gizmo/mainboard.c
@@ -55,7 +55,7 @@ void set_pcie_dereset(void)
 /**********************************************
  * Enable the dedicated functions of the board.
  **********************************************/
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
 
@@ -78,7 +78,7 @@ static void mainboard_enable(device_t dev)
 void mainboard_final( void *chip_info );
 void mainboard_final( void *chip_info )
 {
-	device_t ahci_dev;
+	struct device * ahci_dev;
 	u32 ABAR;
 	u8 *memptr;
 
diff --git a/src/mainboard/gizmosphere/gizmo/mptable.c b/src/mainboard/gizmosphere/gizmo/mptable.c
index b98598a..8301bd5 100755
--- a/src/mainboard/gizmosphere/gizmo/mptable.c
+++ b/src/mainboard/gizmosphere/gizmo/mptable.c
@@ -106,7 +106,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/google/bolt/mainboard.c b/src/mainboard/google/bolt/mainboard.c
index 0ccf90d..7676d56 100644
--- a/src/mainboard/google/bolt/mainboard.c
+++ b/src/mainboard/google/bolt/mainboard.c
@@ -44,12 +44,12 @@ void mainboard_suspend_resume(void)
 
 
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	mainboard_ec_init();
 }
 
-static int mainboard_smbios_data(device_t dev, int *handle,
+static int mainboard_smbios_data(struct device * dev, int *handle,
 				 unsigned long *current)
 {
 	int len = 0;
@@ -87,7 +87,7 @@ static int mainboard_smbios_data(device_t dev, int *handle,
 // mainboard_enable is executed as first thing after
 // enumerate_buses().
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->init = mainboard_init;
 	dev->ops->get_smbios_data = mainboard_smbios_data;
diff --git a/src/mainboard/google/butterfly/mainboard.c b/src/mainboard/google/butterfly/mainboard.c
index 655fc2f..c4006c6 100644
--- a/src/mainboard/google/butterfly/mainboard.c
+++ b/src/mainboard/google/butterfly/mainboard.c
@@ -194,7 +194,7 @@ void mainboard_suspend_resume(void)
 
 
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	u32 search_address = 0x0;
 	size_t search_length = -1;
@@ -258,7 +258,7 @@ static void mainboard_init(device_t dev)
 	}
 }
 
-static int butterfly_onboard_smbios_data(device_t dev, int *handle,
+static int butterfly_onboard_smbios_data(struct device * dev, int *handle,
 					 unsigned long *current)
 {
 	int len = 0;
@@ -278,7 +278,7 @@ static int butterfly_onboard_smbios_data(device_t dev, int *handle,
 // mainboard_enable is executed as first thing after
 // enumerate_buses().
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->init = mainboard_init;
 	dev->ops->get_smbios_data = butterfly_onboard_smbios_data;
diff --git a/src/mainboard/google/daisy/mainboard.c b/src/mainboard/google/daisy/mainboard.c
index 0adadb6..fc9a08c 100644
--- a/src/mainboard/google/daisy/mainboard.c
+++ b/src/mainboard/google/daisy/mainboard.c
@@ -258,7 +258,7 @@ static void gpio_init(void)
 }
 
 /* this happens after cpu_init where exynos resources are set */
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	int dp_tries;
 	struct s5p_dp_device dp_device = {
@@ -322,7 +322,7 @@ static void mainboard_init(device_t dev)
 	// gpio_info();
 }
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->init = &mainboard_init;
 
diff --git a/src/mainboard/google/falco/mainboard.c b/src/mainboard/google/falco/mainboard.c
index 0ccf90d..7676d56 100644
--- a/src/mainboard/google/falco/mainboard.c
+++ b/src/mainboard/google/falco/mainboard.c
@@ -44,12 +44,12 @@ void mainboard_suspend_resume(void)
 
 
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	mainboard_ec_init();
 }
 
-static int mainboard_smbios_data(device_t dev, int *handle,
+static int mainboard_smbios_data(struct device * dev, int *handle,
 				 unsigned long *current)
 {
 	int len = 0;
@@ -87,7 +87,7 @@ static int mainboard_smbios_data(device_t dev, int *handle,
 // mainboard_enable is executed as first thing after
 // enumerate_buses().
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->init = mainboard_init;
 	dev->ops->get_smbios_data = mainboard_smbios_data;
diff --git a/src/mainboard/google/link/mainboard.c b/src/mainboard/google/link/mainboard.c
index ed40f8f..d1a3856 100644
--- a/src/mainboard/google/link/mainboard.c
+++ b/src/mainboard/google/link/mainboard.c
@@ -149,7 +149,7 @@ static int int15_handler(void)
 
 
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	/* Initialize the Embedded Controller */
 	link_ec_init();
@@ -166,7 +166,7 @@ static void mainboard_init(device_t dev)
 	}
 }
 
-static int link_onboard_smbios_data(device_t dev, int *handle,
+static int link_onboard_smbios_data(struct device * dev, int *handle,
 				     unsigned long *current)
 {
 	int len = 0;
@@ -204,7 +204,7 @@ static int link_onboard_smbios_data(device_t dev, int *handle,
 // mainboard_enable is executed as first thing after
 // enumerate_buses().
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->init = mainboard_init;
 	dev->ops->get_smbios_data = link_onboard_smbios_data;
diff --git a/src/mainboard/google/nyan/mainboard.c b/src/mainboard/google/nyan/mainboard.c
index 6fa8a95..d7df116 100644
--- a/src/mainboard/google/nyan/mainboard.c
+++ b/src/mainboard/google/nyan/mainboard.c
@@ -232,7 +232,7 @@ static void setup_ec_spi(void)
 	spi->rx_frame_header_enable = 1;
 }
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	set_clock_sources();
 
@@ -284,7 +284,7 @@ static void mainboard_init(device_t dev)
 	setup_ec_spi();
 }
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->init = &mainboard_init;
 }
diff --git a/src/mainboard/google/nyan_big/mainboard.c b/src/mainboard/google/nyan_big/mainboard.c
index 4a05991..908d610 100644
--- a/src/mainboard/google/nyan_big/mainboard.c
+++ b/src/mainboard/google/nyan_big/mainboard.c
@@ -232,7 +232,7 @@ static void setup_ec_spi(void)
 	spi->rx_frame_header_enable = 1;
 }
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	set_clock_sources();
 
@@ -281,7 +281,7 @@ static void mainboard_init(device_t dev)
 	setup_ec_spi();
 }
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->init = &mainboard_init;
 }
diff --git a/src/mainboard/google/panther/mainboard.c b/src/mainboard/google/panther/mainboard.c
index 5058eca..a1bd459 100644
--- a/src/mainboard/google/panther/mainboard.c
+++ b/src/mainboard/google/panther/mainboard.c
@@ -44,7 +44,7 @@ void mainboard_suspend_resume(void)
 
 
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	lan_init();
 }
@@ -52,7 +52,7 @@ static void mainboard_init(device_t dev)
 // mainboard_enable is executed as first thing after
 // enumerate_buses().
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->init = mainboard_init;
 	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_EDP, GMA_INT15_PANEL_FIT_CENTERING, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
diff --git a/src/mainboard/google/parrot/mainboard.c b/src/mainboard/google/parrot/mainboard.c
index 547680e..207bcfd 100644
--- a/src/mainboard/google/parrot/mainboard.c
+++ b/src/mainboard/google/parrot/mainboard.c
@@ -48,13 +48,13 @@ void mainboard_suspend_resume(void)
 
 
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	/* Initialize the Embedded Controller */
 	parrot_ec_init();
 }
 
-static int parrot_onboard_smbios_data(device_t dev, int *handle,
+static int parrot_onboard_smbios_data(struct device * dev, int *handle,
 				     unsigned long *current)
 {
 	int len = 0;
@@ -85,7 +85,7 @@ static int parrot_onboard_smbios_data(device_t dev, int *handle,
 // mainboard_enable is executed as first thing after
 // enumerate_buses().
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->init = mainboard_init;
 	dev->ops->get_smbios_data = parrot_onboard_smbios_data;
diff --git a/src/mainboard/google/peach_pit/mainboard.c b/src/mainboard/google/peach_pit/mainboard.c
index 1fb441d..53db9fa 100644
--- a/src/mainboard/google/peach_pit/mainboard.c
+++ b/src/mainboard/google/peach_pit/mainboard.c
@@ -405,7 +405,7 @@ static void sdmmc_vdd(void)
 }
 
 /* this happens after cpu_init where exynos resources are set */
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	/* we'll stick with the crummy u-boot struct for now.*/
 	/* doing this as an auto since the struct has to be writeable */
@@ -462,7 +462,7 @@ static void mainboard_init(device_t dev)
 	setup_usb();
 }
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->init = &mainboard_init;
 
diff --git a/src/mainboard/google/peppy/mainboard.c b/src/mainboard/google/peppy/mainboard.c
index 0ccf90d..7676d56 100644
--- a/src/mainboard/google/peppy/mainboard.c
+++ b/src/mainboard/google/peppy/mainboard.c
@@ -44,12 +44,12 @@ void mainboard_suspend_resume(void)
 
 
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	mainboard_ec_init();
 }
 
-static int mainboard_smbios_data(device_t dev, int *handle,
+static int mainboard_smbios_data(struct device * dev, int *handle,
 				 unsigned long *current)
 {
 	int len = 0;
@@ -87,7 +87,7 @@ static int mainboard_smbios_data(device_t dev, int *handle,
 // mainboard_enable is executed as first thing after
 // enumerate_buses().
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->init = mainboard_init;
 	dev->ops->get_smbios_data = mainboard_smbios_data;
diff --git a/src/mainboard/google/rambi/mainboard.c b/src/mainboard/google/rambi/mainboard.c
index cd3fc48..b43928d 100644
--- a/src/mainboard/google/rambi/mainboard.c
+++ b/src/mainboard/google/rambi/mainboard.c
@@ -127,12 +127,12 @@ static int int15_handler(void)
 }
 #endif
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	mainboard_ec_init();
 }
 
-static int mainboard_smbios_data(device_t dev, int *handle,
+static int mainboard_smbios_data(struct device * dev, int *handle,
 				 unsigned long *current)
 {
 	int len = 0;
@@ -161,7 +161,7 @@ static int mainboard_smbios_data(device_t dev, int *handle,
 // mainboard_enable is executed as first thing after
 // enumerate_buses().
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->init = mainboard_init;
 	dev->ops->get_smbios_data = mainboard_smbios_data;
diff --git a/src/mainboard/google/samus/mainboard.c b/src/mainboard/google/samus/mainboard.c
index 7977ce3..de7f434 100644
--- a/src/mainboard/google/samus/mainboard.c
+++ b/src/mainboard/google/samus/mainboard.c
@@ -42,12 +42,12 @@ void mainboard_suspend_resume(void)
 	outb(0xcb, 0xb2);
 }
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	mainboard_ec_init();
 }
 
-static int mainboard_smbios_data(device_t dev, int *handle,
+static int mainboard_smbios_data(struct device * dev, int *handle,
 				 unsigned long *current)
 {
 	int len = 0;
@@ -112,7 +112,7 @@ static int mainboard_smbios_data(device_t dev, int *handle,
 // mainboard_enable is executed as first thing after
 // enumerate_buses().
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->init = mainboard_init;
 	dev->ops->get_smbios_data = mainboard_smbios_data;
diff --git a/src/mainboard/google/slippy/mainboard.c b/src/mainboard/google/slippy/mainboard.c
index 0ccf90d..7676d56 100644
--- a/src/mainboard/google/slippy/mainboard.c
+++ b/src/mainboard/google/slippy/mainboard.c
@@ -44,12 +44,12 @@ void mainboard_suspend_resume(void)
 
 
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	mainboard_ec_init();
 }
 
-static int mainboard_smbios_data(device_t dev, int *handle,
+static int mainboard_smbios_data(struct device * dev, int *handle,
 				 unsigned long *current)
 {
 	int len = 0;
@@ -87,7 +87,7 @@ static int mainboard_smbios_data(device_t dev, int *handle,
 // mainboard_enable is executed as first thing after
 // enumerate_buses().
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->init = mainboard_init;
 	dev->ops->get_smbios_data = mainboard_smbios_data;
diff --git a/src/mainboard/google/storm/mainboard.c b/src/mainboard/google/storm/mainboard.c
index 0b0182f..4792ea9 100644
--- a/src/mainboard/google/storm/mainboard.c
+++ b/src/mainboard/google/storm/mainboard.c
@@ -20,11 +20,11 @@
 #include <device/device.h>
 #include <boot/coreboot_tables.h>
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 }
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->init = &mainboard_init;
 }
diff --git a/src/mainboard/google/stout/mainboard.c b/src/mainboard/google/stout/mainboard.c
index 9bcbfe4..58d89b8 100644
--- a/src/mainboard/google/stout/mainboard.c
+++ b/src/mainboard/google/stout/mainboard.c
@@ -48,7 +48,7 @@ void mainboard_suspend_resume(void)
 
 
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	struct device *ethernet_dev = NULL;
 
@@ -70,7 +70,7 @@ static void mainboard_init(device_t dev)
 // mainboard_enable is executed as first thing after
 // enumerate_buses().
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->init = mainboard_init;
 	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS, GMA_INT15_PANEL_FIT_DEFAULT, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
diff --git a/src/mainboard/hp/dl145_g1/get_bus_conf.c b/src/mainboard/hp/dl145_g1/get_bus_conf.c
index acfa023..6a36ef7 100644
--- a/src/mainboard/hp/dl145_g1/get_bus_conf.c
+++ b/src/mainboard/hp/dl145_g1/get_bus_conf.c
@@ -51,7 +51,7 @@ void get_bus_conf(void)
 
 	unsigned apicid_base;
 
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if(get_bus_conf_done==1) return; //do it only once
diff --git a/src/mainboard/hp/dl145_g1/mptable.c b/src/mainboard/hp/dl145_g1/mptable.c
index b9af38b..7e81143 100644
--- a/src/mainboard/hp/dl145_g1/mptable.c
+++ b/src/mainboard/hp/dl145_g1/mptable.c
@@ -31,7 +31,7 @@ static void *smp_write_config_table(void *v)
 /*I/O APICs:	APIC ID	Version	State		Address*/
 	smp_write_ioapic(mc, m->apicid_8111, 0x20, IO_APIC_ADDR);
 	{
-		device_t dev;
+		struct device * dev;
 		struct resource *res;
 		dev = dev_find_slot(m->bus_8131_0, PCI_DEVFN(m->sbdn3,1));
 		if (dev) {
diff --git a/src/mainboard/hp/dl145_g3/get_bus_conf.c b/src/mainboard/hp/dl145_g3/get_bus_conf.c
index ba0fc88..59b35aa 100644
--- a/src/mainboard/hp/dl145_g3/get_bus_conf.c
+++ b/src/mainboard/hp/dl145_g3/get_bus_conf.c
@@ -70,7 +70,7 @@ void get_bus_conf(void)
 
 	unsigned apicid_base;
 
-	device_t dev;
+	struct device *dev;
 	int i;
 	struct mb_sysconf_t *m;
 
diff --git a/src/mainboard/hp/dl145_g3/mptable.c b/src/mainboard/hp/dl145_g3/mptable.c
index 6c71bad..6b3032b 100644
--- a/src/mainboard/hp/dl145_g3/mptable.c
+++ b/src/mainboard/hp/dl145_g3/mptable.c
@@ -58,7 +58,7 @@ static void *smp_write_config_table(void *v)
 
 	/*I/O APICs:   APIC ID Version State           Address*/
 	{
-		device_t dev = 0;
+		struct device * dev = 0;
 		int i;
 		struct resource *res;
 		for(i=0; i<3; i++) {
@@ -90,7 +90,7 @@ static void *smp_write_config_table(void *v)
 	outb(0x0e, 0x4d1);
 
 	{
-		device_t dev;
+		struct device * dev;
 		dev = dev_find_device(0x1166, 0x0205, 0);
 		if(dev) {
 			uint32_t dword;
@@ -106,7 +106,7 @@ static void *smp_write_config_table(void *v)
 
 	// hide XIOAPIC PCI configuration space
 	{
-		device_t dev;
+		struct device * dev;
 		dev = dev_find_device(0x1166, 0x205, 0);
 		if (dev) {
 			uint32_t dword;
@@ -151,7 +151,7 @@ static void *smp_write_config_table(void *v)
 	/* enable int */
 	/* why here? must get the BAR and PCI command bit 1 set before enable it ....*/
 	{
-		device_t dev;
+		struct device * dev;
 		dev = dev_find_device(0x1166, 0x0205, 0);
 		if(dev) {
 			uint32_t dword;
diff --git a/src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c b/src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c
index 099c41a..6561c94 100644
--- a/src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c
+++ b/src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c
@@ -71,7 +71,7 @@ void get_bus_conf(void)
 
 	unsigned apicid_base;
 
-	device_t dev;
+	struct device *dev;
 	int i;
 	struct mb_sysconf_t *m;
 
diff --git a/src/mainboard/hp/dl165_g6_fam10/mptable.c b/src/mainboard/hp/dl165_g6_fam10/mptable.c
index 86f2cc6..175cfe5 100644
--- a/src/mainboard/hp/dl165_g6_fam10/mptable.c
+++ b/src/mainboard/hp/dl165_g6_fam10/mptable.c
@@ -59,7 +59,7 @@ static void *smp_write_config_table(void *v)
 
 	/*I/O APICs:   APIC ID Version State           Address*/
 	{
-		device_t dev = 0;
+		struct device * dev = 0;
 		int i;
 		struct resource *res;
 		for(i=0; i<3; i++) {
@@ -87,7 +87,7 @@ static void *smp_write_config_table(void *v)
 	outb(0x0e, 0x4d1);
 
 	{
-		device_t dev;
+		struct device * dev;
 		dev = dev_find_device(0x1166, 0x0205, 0);
 		if(dev) {
 			uint32_t dword;
@@ -103,7 +103,7 @@ static void *smp_write_config_table(void *v)
 
 	// hide XIOAPIC PCI configuration space
 	{
-		device_t dev;
+		struct device * dev;
 		dev = dev_find_device(0x1166, 0x205, 0);
 		if (dev) {
 			uint32_t dword;
@@ -130,7 +130,7 @@ static void *smp_write_config_table(void *v)
 	/* enable int */
 	/* why here? must get the BAR and PCI command bit 1 set before enable it ....*/
 	{
-		device_t dev;
+		struct device * dev;
 		dev = dev_find_device(0x1166, 0x0205, 0);
 		if(dev) {
 			uint32_t dword;
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c b/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c
index f858455..3384a9f 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c
@@ -41,7 +41,7 @@ static void pavilion_cold_boot_init(void)
 	pavilion_m6_1035dx_ec_init();
 }
 
-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/hp/pavilion_m6_1035dx/mptable.c b/src/mainboard/hp/pavilion_m6_1035dx/mptable.c
index f47b9d9..d12e759 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/mptable.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/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/ibase/mb899/mainboard.c b/src/mainboard/ibase/mb899/mainboard.c
index a2a10a1..ba6a09e 100644
--- a/src/mainboard/ibase/mb899/mainboard.c
+++ b/src/mainboard/ibase/mb899/mainboard.c
@@ -31,7 +31,7 @@
 // mainboard_enable is executed as first thing after
 // enumerate_buses().
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS, GMA_INT15_PANEL_FIT_DEFAULT, GMA_INT15_BOOT_DISPLAY_DEFAULT, 3);
 	hwm_setup();
diff --git a/src/mainboard/ibm/e325/mptable.c b/src/mainboard/ibm/e325/mptable.c
index 6eb6390..50f8031 100644
--- a/src/mainboard/ibm/e325/mptable.c
+++ b/src/mainboard/ibm/e325/mptable.c
@@ -22,7 +22,7 @@ static void *smp_write_config_table(void *v)
 	smp_write_processors(mc);
 
 	{
-		device_t dev;
+		struct device * dev;
 
 		/* 8111 */
 		dev = dev_find_slot(1, PCI_DEVFN(0x03,0));
@@ -60,7 +60,7 @@ static void *smp_write_config_table(void *v)
 	/* Legacy IOAPIC #2 */
 	smp_write_ioapic(mc, 2, 0x11, IO_APIC_ADDR);
 	{
-		device_t dev;
+		struct device * dev;
 		struct resource *res;
 		/* 8131-1 apic #3 */
 		dev = dev_find_slot(1, PCI_DEVFN(0x01,1));
diff --git a/src/mainboard/ibm/e326/mptable.c b/src/mainboard/ibm/e326/mptable.c
index f271166..d85e609 100644
--- a/src/mainboard/ibm/e326/mptable.c
+++ b/src/mainboard/ibm/e326/mptable.c
@@ -22,7 +22,7 @@ static void *smp_write_config_table(void *v)
 	smp_write_processors(mc);
 
 	{
-		device_t dev;
+		struct device * dev;
 
 		/* 8111 */
 		dev = dev_find_slot(1, PCI_DEVFN(0x03,0));
@@ -59,7 +59,7 @@ static void *smp_write_config_table(void *v)
 	/* Legacy IOAPIC #2 */
 	smp_write_ioapic(mc, 2, 0x11, IO_APIC_ADDR);
 	{
-		device_t dev;
+		struct device * dev;
 		struct resource *res;
 		/* 8131-1 apic #3 */
 		dev = dev_find_slot(1, PCI_DEVFN(0x01,1));
diff --git a/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c b/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c
index 47342fb..414b6e7 100644
--- a/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c
+++ b/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c
@@ -63,7 +63,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/iei/kino-780am2-fam10/mainboard.c b/src/mainboard/iei/kino-780am2-fam10/mainboard.c
index 43ff9c1..9d67e2b 100644
--- a/src/mainboard/iei/kino-780am2-fam10/mainboard.c
+++ b/src/mainboard/iei/kino-780am2-fam10/mainboard.c
@@ -53,7 +53,7 @@ u8 is_dev3_present(void)
 * enable the dedicated function in kino 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 Kino Enable. dev=0x%p\n", dev);
 
diff --git a/src/mainboard/iei/kino-780am2-fam10/mptable.c b/src/mainboard/iei/kino-780am2-fam10/mptable.c
index 11426c2..759ab30 100644
--- a/src/mainboard/iei/kino-780am2-fam10/mptable.c
+++ b/src/mainboard/iei/kino-780am2-fam10/mptable.c
@@ -50,7 +50,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/intel/baskingridge/mainboard.c b/src/mainboard/intel/baskingridge/mainboard.c
index a6839fc..be142aa 100644
--- a/src/mainboard/intel/baskingridge/mainboard.c
+++ b/src/mainboard/intel/baskingridge/mainboard.c
@@ -44,7 +44,7 @@ void mainboard_suspend_resume(void)
 // mainboard_enable is executed as first thing after
 // enumerate_buses().
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_EDP, GMA_INT15_PANEL_FIT_CENTERING, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
 }
diff --git a/src/mainboard/intel/bayleybay_fsp/mainboard.c b/src/mainboard/intel/bayleybay_fsp/mainboard.c
index feae6ef..d32ca91 100644
--- a/src/mainboard/intel/bayleybay_fsp/mainboard.c
+++ b/src/mainboard/intel/bayleybay_fsp/mainboard.c
@@ -38,7 +38,7 @@
  * mainboard_enable is executed as first thing after enumerate_buses().
  * This is the earliest point to add customization.
  */
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 
 }
diff --git a/src/mainboard/intel/cougar_canyon2/mainboard.c b/src/mainboard/intel/cougar_canyon2/mainboard.c
index 0ea03d3..f0062d5 100644
--- a/src/mainboard/intel/cougar_canyon2/mainboard.c
+++ b/src/mainboard/intel/cougar_canyon2/mainboard.c
@@ -46,7 +46,7 @@ void mainboard_suspend_resume(void)
 // mainboard_enable is executed as first thing after
 // enumerate_buses().
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_EDP, GMA_INT15_PANEL_FIT_CENTERING, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
 }
diff --git a/src/mainboard/intel/eagleheights/mptable.c b/src/mainboard/intel/eagleheights/mptable.c
index 809feec..78dfb62 100644
--- a/src/mainboard/intel/eagleheights/mptable.c
+++ b/src/mainboard/intel/eagleheights/mptable.c
@@ -65,7 +65,7 @@ static void *smp_write_config_table(void *v)
 	unsigned char bus_pcie_a, bus_pcie_a1, bus_pcie_b;
 	int bus_isa, i;
 	uint32_t pin, route;
-	device_t dev;
+	struct device * dev;
 	struct resource *res;
 	unsigned long rcba;
 
diff --git a/src/mainboard/intel/emeraldlake2/mainboard.c b/src/mainboard/intel/emeraldlake2/mainboard.c
index 347ce8a..1f92309 100644
--- a/src/mainboard/intel/emeraldlake2/mainboard.c
+++ b/src/mainboard/intel/emeraldlake2/mainboard.c
@@ -44,7 +44,7 @@ void mainboard_suspend_resume(void)
 // mainboard_enable is executed as first thing after
 // enumerate_buses().
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_EDP, GMA_INT15_PANEL_FIT_CENTERING, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
 }
diff --git a/src/mainboard/intel/jarrell/mptable.c b/src/mainboard/intel/jarrell/mptable.c
index 21664ce..6dcf7d7 100644
--- a/src/mainboard/intel/jarrell/mptable.c
+++ b/src/mainboard/intel/jarrell/mptable.c
@@ -24,7 +24,7 @@ static void *smp_write_config_table(void *v)
 	smp_write_processors(mc);
 
 	{
-		device_t dev;
+		struct device * dev;
 
 		/* ich5r */
 		dev = dev_find_slot(0, PCI_DEVFN(0x1e,0));
@@ -91,7 +91,7 @@ static void *smp_write_config_table(void *v)
 	smp_write_ioapic(mc, 8, 0x20, IO_APIC_ADDR);
 	{
 		struct resource *res;
-		device_t dev;
+		struct device * dev;
 		/* pxhd apic 3 */
 		dev = dev_find_slot(1, PCI_DEVFN(0x00,1));
 		if (dev) {
diff --git a/src/mainboard/intel/minnowmax/mainboard.c b/src/mainboard/intel/minnowmax/mainboard.c
index 3da1e23..ce9872a 100644
--- a/src/mainboard/intel/minnowmax/mainboard.c
+++ b/src/mainboard/intel/minnowmax/mainboard.c
@@ -25,7 +25,7 @@
  * mainboard_enable is executed as first thing after enumerate_buses().
  * This is the earliest point to add customization.
  */
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 }
 
diff --git a/src/mainboard/intel/mohonpeak/mainboard.c b/src/mainboard/intel/mohonpeak/mainboard.c
index 7559fc2..387931d 100644
--- a/src/mainboard/intel/mohonpeak/mainboard.c
+++ b/src/mainboard/intel/mohonpeak/mainboard.c
@@ -24,7 +24,7 @@
  * mainboard_enable is executed as first thing after enumerate_buses().
  * This is the earliest point to add customization.
  */
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 
 }
diff --git a/src/mainboard/intel/truxton/mptable.c b/src/mainboard/intel/truxton/mptable.c
index 9ad6ea6..2c7eb92 100644
--- a/src/mainboard/intel/truxton/mptable.c
+++ b/src/mainboard/intel/truxton/mptable.c
@@ -31,7 +31,7 @@ static void *smp_write_config_table(void *v)
 	u8 bus_pea0 = 0;
 	u8 bus_pea1 = 0;
 	u8 bus_aioc;
-	device_t dev;
+	struct device * dev;
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
diff --git a/src/mainboard/intel/wtm2/mainboard.c b/src/mainboard/intel/wtm2/mainboard.c
index a6839fc..be142aa 100644
--- a/src/mainboard/intel/wtm2/mainboard.c
+++ b/src/mainboard/intel/wtm2/mainboard.c
@@ -44,7 +44,7 @@ void mainboard_suspend_resume(void)
 // mainboard_enable is executed as first thing after
 // enumerate_buses().
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_EDP, GMA_INT15_PANEL_FIT_CENTERING, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
 }
diff --git a/src/mainboard/intel/xe7501devkit/mptable.c b/src/mainboard/intel/xe7501devkit/mptable.c
index cc7eda5..65e4bcc 100644
--- a/src/mainboard/intel/xe7501devkit/mptable.c
+++ b/src/mainboard/intel/xe7501devkit/mptable.c
@@ -19,7 +19,7 @@ static int bus_isa;
 
 static void xe7501devkit_register_ioapics(struct mp_config_table *mc)
 {
-	device_t dev;
+	struct device * dev;
 	struct resource *res;
 
 	// TODO: Gack. This is REALLY ugly.
diff --git a/src/mainboard/iwave/iWRainbowG6/mainboard.c b/src/mainboard/iwave/iWRainbowG6/mainboard.c
index dfc6636..457c88f 100644
--- a/src/mainboard/iwave/iWRainbowG6/mainboard.c
+++ b/src/mainboard/iwave/iWRainbowG6/mainboard.c
@@ -22,7 +22,7 @@
 #include <console/console.h>
 
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 }
 
diff --git a/src/mainboard/iwave/iWRainbowG6/mptable.c b/src/mainboard/iwave/iWRainbowG6/mptable.c
index 87de022..da83738 100644
--- a/src/mainboard/iwave/iWRainbowG6/mptable.c
+++ b/src/mainboard/iwave/iWRainbowG6/mptable.c
@@ -36,7 +36,7 @@ void *smp_write_config_table(void *v)
 
 	smp_write_ioapic(mc, 2, 0x20, IO_APIC_ADDR);
 	{
-		device_t dev;
+		struct device * dev;
 		struct resource *res;
 		dev = dev_find_slot(1, PCI_DEVFN(0x1e,0));
 		if (dev) {
diff --git a/src/mainboard/iwill/dk8_htx/get_bus_conf.c b/src/mainboard/iwill/dk8_htx/get_bus_conf.c
index 8868f46..be033f5 100644
--- a/src/mainboard/iwill/dk8_htx/get_bus_conf.c
+++ b/src/mainboard/iwill/dk8_htx/get_bus_conf.c
@@ -48,7 +48,7 @@ static unsigned get_hcid(unsigned i)
 
 	unsigned devn = sysconf.hcdn[i] & 0xff;
 
-	device_t dev;
+	struct device *dev;
 
 	dev = dev_find_slot(busn, PCI_DEVFN(devn, 0));
 
@@ -76,7 +76,7 @@ void get_bus_conf(void)
 
 	unsigned apicid_base;
 
-	device_t dev;
+	struct device *dev;
 	int i, j;
 	struct mb_sysconf_t *m;
 
diff --git a/src/mainboard/iwill/dk8_htx/mainboard.c b/src/mainboard/iwill/dk8_htx/mainboard.c
index 0202b50..909e5a9 100644
--- a/src/mainboard/iwill/dk8_htx/mainboard.c
+++ b/src/mainboard/iwill/dk8_htx/mainboard.c
@@ -7,7 +7,7 @@
 #include <cpu/amd/amdk8_sysconf.h>
 #include "mainboard.h"
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
 }
diff --git a/src/mainboard/iwill/dk8_htx/mptable.c b/src/mainboard/iwill/dk8_htx/mptable.c
index ff6e582..416cd17 100644
--- a/src/mainboard/iwill/dk8_htx/mptable.c
+++ b/src/mainboard/iwill/dk8_htx/mptable.c
@@ -31,7 +31,7 @@ static void *smp_write_config_table(void *v)
 /*I/O APICs:	APIC ID	Version	State		Address*/
 	smp_write_ioapic(mc, m->apicid_8111, 0x11, IO_APIC_ADDR); //8111
         {
-                device_t dev;
+                struct device * dev;
 		struct resource *res;
                 dev = dev_find_slot(m->bus_8132_0, PCI_DEVFN(m->sbdn3, 1));
                 if (dev) {
@@ -126,7 +126,7 @@ static void *smp_write_config_table(void *v)
         for(i=1; i< sysconf.hc_possible_num; i++) {
                 if(!(sysconf.pci1234[i] & 0x1) ) continue;
                 int ii;
-                device_t dev;
+                struct device * dev;
                 struct resource *res;
                 switch(sysconf.hcid[i]) {
                 case 1:
diff --git a/src/mainboard/iwill/dk8s2/mptable.c b/src/mainboard/iwill/dk8s2/mptable.c
index c7bb33d..622b412 100644
--- a/src/mainboard/iwill/dk8s2/mptable.c
+++ b/src/mainboard/iwill/dk8s2/mptable.c
@@ -20,7 +20,7 @@ static void *smp_write_config_table(void *v)
 	smp_write_processors(mc);
 
 	{
-		device_t dev;
+		struct device * dev;
 
 		/* 8111 */
 		dev = dev_find_slot(1, PCI_DEVFN(0x03,0));
@@ -56,7 +56,7 @@ static void *smp_write_config_table(void *v)
 	/* IOAPIC handling */
 	smp_write_ioapic(mc, 2, 0x11, IO_APIC_ADDR);
 	{
-		device_t dev;
+		struct device * dev;
 		struct resource *res;
 		/* 8131 apic 3 */
 		dev = dev_find_slot(1, PCI_DEVFN(0x01,1));
diff --git a/src/mainboard/iwill/dk8x/mptable.c b/src/mainboard/iwill/dk8x/mptable.c
index c7bb33d..622b412 100644
--- a/src/mainboard/iwill/dk8x/mptable.c
+++ b/src/mainboard/iwill/dk8x/mptable.c
@@ -20,7 +20,7 @@ static void *smp_write_config_table(void *v)
 	smp_write_processors(mc);
 
 	{
-		device_t dev;
+		struct device * dev;
 
 		/* 8111 */
 		dev = dev_find_slot(1, PCI_DEVFN(0x03,0));
@@ -56,7 +56,7 @@ static void *smp_write_config_table(void *v)
 	/* IOAPIC handling */
 	smp_write_ioapic(mc, 2, 0x11, IO_APIC_ADDR);
 	{
-		device_t dev;
+		struct device * dev;
 		struct resource *res;
 		/* 8131 apic 3 */
 		dev = dev_find_slot(1, PCI_DEVFN(0x01,1));
diff --git a/src/mainboard/jetway/nf81-t56n-lf/mainboard.c b/src/mainboard/jetway/nf81-t56n-lf/mainboard.c
index d67e072..92c8d70 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/mainboard.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/mainboard.c
@@ -153,7 +153,7 @@ void set_pcie_dereset(void)
 /**********************************************
  * Enable the dedicated functions of the board.
  **********************************************/
-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/jetway/nf81-t56n-lf/mptable.c b/src/mainboard/jetway/nf81-t56n-lf/mptable.c
index 4390605..2c9606a 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/mptable.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/mptable.c
@@ -116,7 +116,7 @@ static void *smp_write_config_table(void *v)
 	PCI_INT(0x2, 0x0, 0x0, intr_data_ptr[PIRQ_E]);	/* Use INTE */
 
 	/* 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/jetway/pa78vm5/get_bus_conf.c b/src/mainboard/jetway/pa78vm5/get_bus_conf.c
index 47342fb..414b6e7 100644
--- a/src/mainboard/jetway/pa78vm5/get_bus_conf.c
+++ b/src/mainboard/jetway/pa78vm5/get_bus_conf.c
@@ -63,7 +63,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/jetway/pa78vm5/mainboard.c b/src/mainboard/jetway/pa78vm5/mainboard.c
index 373ebb5..6da52fc 100644
--- a/src/mainboard/jetway/pa78vm5/mainboard.c
+++ b/src/mainboard/jetway/pa78vm5/mainboard.c
@@ -39,7 +39,7 @@ u8 is_dev3_present(void);
 void set_pcie_dereset()
 {
 	u16 word;
-	device_t sm_dev;
+	struct device * sm_dev;
 	/* GPIO 6 reset PCIe slot, GPIO 4 reset GFX PCIe */
 	sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
 
@@ -52,7 +52,7 @@ void set_pcie_dereset()
 void set_pcie_reset()
 {
 	u16 word;
-	device_t sm_dev;
+	struct device * sm_dev;
 	/* GPIO 6 reset PCIe slot, GPIO 4 reset GFX PCIe */
 	sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
 
@@ -72,7 +72,7 @@ static void get_ide_dma66(void)
 {
 	u8 byte;
 	/*u32 sm_dev, ide_dev; */
-	device_t sm_dev, ide_dev;
+	struct device * sm_dev, ide_dev;
 
 	sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
 
@@ -100,7 +100,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 PA78VM5 Enable. dev=0x%p\n", dev);
 
diff --git a/src/mainboard/jetway/pa78vm5/mptable.c b/src/mainboard/jetway/pa78vm5/mptable.c
index 7cabdf1..0c7130b 100644
--- a/src/mainboard/jetway/pa78vm5/mptable.c
+++ b/src/mainboard/jetway/pa78vm5/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;
 		u32 dword;
 		u8 byte;
 
diff --git a/src/mainboard/kontron/986lcd-m/mainboard.c b/src/mainboard/kontron/986lcd-m/mainboard.c
index afca796..0ae64b5 100644
--- a/src/mainboard/kontron/986lcd-m/mainboard.c
+++ b/src/mainboard/kontron/986lcd-m/mainboard.c
@@ -164,7 +164,7 @@ static void hwm_setup(void)
 // mainboard_enable is executed as first thing after
 // enumerate_buses().
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS, GMA_INT15_PANEL_FIT_DEFAULT, GMA_INT15_BOOT_DISPLAY_DEFAULT, 3);
 	hwm_setup();
diff --git a/src/mainboard/kontron/kt690/get_bus_conf.c b/src/mainboard/kontron/kt690/get_bus_conf.c
index 084e2b1..c959280 100644
--- a/src/mainboard/kontron/kt690/get_bus_conf.c
+++ b/src/mainboard/kontron/kt690/get_bus_conf.c
@@ -63,7 +63,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/kontron/kt690/mainboard.c b/src/mainboard/kontron/kt690/mainboard.c
index 717c399..a88a2c8 100644
--- a/src/mainboard/kontron/kt690/mainboard.c
+++ b/src/mainboard/kontron/kt690/mainboard.c
@@ -119,7 +119,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 */
@@ -180,7 +180,7 @@ static void set_thermal_config(void)
 * enable the dedicated function in dbm690t board.
 * This function called early than rs690_enable.
 *************************************************/
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	printk(BIOS_INFO, "Mainboard KT690 Enable. dev=0x%p\n", dev);
 
diff --git a/src/mainboard/kontron/kt690/mptable.c b/src/mainboard/kontron/kt690/mptable.c
index 8b86b02..840a93a 100644
--- a/src/mainboard/kontron/kt690/mptable.c
+++ b/src/mainboard/kontron/kt690/mptable.c
@@ -50,7 +50,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/kontron/ktqm77/mainboard.c b/src/mainboard/kontron/ktqm77/mainboard.c
index 715ec56..6f6c2d8 100644
--- a/src/mainboard/kontron/ktqm77/mainboard.c
+++ b/src/mainboard/kontron/ktqm77/mainboard.c
@@ -172,7 +172,7 @@ static int int15_handler(void)
 // mainboard_enable is executed as first thing after
 // enumerate_buses().
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 #if CONFIG_PCI_OPTION_ROM_RUN_YABEL || CONFIG_PCI_OPTION_ROM_RUN_REALMODE
 	/* Install custom int15 handler for VGA OPROM */
@@ -181,7 +181,7 @@ static void mainboard_enable(device_t dev)
 
 	unsigned disable = 0;
 	if ((get_option(&disable, "ethernet1") == CB_SUCCESS) && disable) {
-		device_t nic = dev_find_slot(0, PCI_DEVFN(0x1c, 2));
+		struct device * nic = dev_find_slot(0, PCI_DEVFN(0x1c, 2));
 		if (nic) {
 			printk(BIOS_DEBUG, "DISABLE FIRST NIC!\n");
 			nic->enabled = 0;
@@ -189,7 +189,7 @@ static void mainboard_enable(device_t dev)
 	}
 	disable = 0;
 	if ((get_option(&disable, "ethernet2") == CB_SUCCESS) && disable) {
-		device_t nic = dev_find_slot(0, PCI_DEVFN(0x1c, 3));
+		struct device * nic = dev_find_slot(0, PCI_DEVFN(0x1c, 3));
 		if (nic) {
 			printk(BIOS_DEBUG, "DISABLE SECOND NIC!\n");
 			nic->enabled = 0;
diff --git a/src/mainboard/lenovo/t520/mainboard.c b/src/mainboard/lenovo/t520/mainboard.c
index 387bbe0..ddd6d22 100644
--- a/src/mainboard/lenovo/t520/mainboard.c
+++ b/src/mainboard/lenovo/t520/mainboard.c
@@ -46,7 +46,7 @@ void mainboard_suspend_resume(void)
 
 
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	RCBA32(0x38c8) = 0x00002005;
 	RCBA32(0x38c4) = 0x00802005;
@@ -65,7 +65,7 @@ static void mainboard_init(device_t dev)
 
 /* mainboard_enable is executed as first thing after
 enumerate_buses(). */
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->init = mainboard_init;
 	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS, GMA_INT15_PANEL_FIT_DEFAULT, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
diff --git a/src/mainboard/lenovo/t530/mainboard.c b/src/mainboard/lenovo/t530/mainboard.c
index f8c9dae..922b424 100644
--- a/src/mainboard/lenovo/t530/mainboard.c
+++ b/src/mainboard/lenovo/t530/mainboard.c
@@ -46,7 +46,7 @@ void mainboard_suspend_resume(void)
 
 
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	RCBA32(0x38c8) = 0x00002005;
 	RCBA32(0x38c4) = 0x00802005;
@@ -69,7 +69,7 @@ static void mainboard_init(device_t dev)
 // mainboard_enable is executed as first thing after
 // enumerate_buses().
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->init = mainboard_init;
 
diff --git a/src/mainboard/lenovo/t60/mainboard.c b/src/mainboard/lenovo/t60/mainboard.c
index 79b3da8..d960b11 100644
--- a/src/mainboard/lenovo/t60/mainboard.c
+++ b/src/mainboard/lenovo/t60/mainboard.c
@@ -61,10 +61,11 @@ const char *smbios_mainboard_bios_version(void)
 		return "CBET4000 " COREBOOT_VERSION;
 }
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	struct southbridge_intel_i82801gx_config *config;
-	device_t dev0, idedev;
+	struct device * dev0;
+	struct device * idedev;
 
 	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS, GMA_INT15_PANEL_FIT_DEFAULT, PANEL, 3);
 
@@ -95,7 +96,7 @@ static void mainboard_init(device_t dev)
 	ec_write(0x0c, inb(0x164c) & 8 ? 0x89 : 0x09);
 }
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->init = mainboard_init;
 }
diff --git a/src/mainboard/lenovo/x200/mainboard.c b/src/mainboard/lenovo/x200/mainboard.c
index 0054064..c79b552 100644
--- a/src/mainboard/lenovo/x200/mainboard.c
+++ b/src/mainboard/lenovo/x200/mainboard.c
@@ -45,7 +45,7 @@ const char *smbios_mainboard_bios_version(void)
 		return "CBET4000 " COREBOOT_VERSION;
 }
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	/* This sneaked in here, because X200 SuperIO chip isn't really
 	   connected to anything and hence we don't init it.
@@ -53,7 +53,7 @@ static void mainboard_init(device_t dev)
 	pc_keyboard_init();
 }
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS, GMA_INT15_PANEL_FIT_CENTERING, GMA_INT15_BOOT_DISPLAY_DEFAULT, 2);
 
diff --git a/src/mainboard/lenovo/x201/mainboard.c b/src/mainboard/lenovo/x201/mainboard.c
index 5b76be2..f61bb9a 100644
--- a/src/mainboard/lenovo/x201/mainboard.c
+++ b/src/mainboard/lenovo/x201/mainboard.c
@@ -71,7 +71,7 @@ const char *smbios_mainboard_bios_version(void)
 
 
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	printk(BIOS_SPEW, "starting SPI configuration\n");
 
@@ -117,9 +117,9 @@ static void fill_ssdt(void)
 	drivers_lenovo_serial_ports_ssdt_generate("\\_SB.PCI0.LPCB", 0);
 }
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
-	device_t dev0;
+	struct device * dev0;
 	u16 pmbase;
 
 	dev->ops->init = mainboard_init;
diff --git a/src/mainboard/lenovo/x220/mainboard.c b/src/mainboard/lenovo/x220/mainboard.c
index 00e7991..c86825e 100644
--- a/src/mainboard/lenovo/x220/mainboard.c
+++ b/src/mainboard/lenovo/x220/mainboard.c
@@ -49,7 +49,7 @@ const char *smbios_mainboard_bios_version(void)
 		return "CBET4000 " COREBOOT_VERSION;
 }
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	RCBA32(0x38c8) = 0x00002005;
 	RCBA32(0x38c4) = 0x00802005;
@@ -72,7 +72,7 @@ static void mainboard_init(device_t dev)
 // mainboard_enable is executed as first thing after
 // enumerate_buses().
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->init = mainboard_init;
 
diff --git a/src/mainboard/lenovo/x230/mainboard.c b/src/mainboard/lenovo/x230/mainboard.c
index a060015..28d7344 100644
--- a/src/mainboard/lenovo/x230/mainboard.c
+++ b/src/mainboard/lenovo/x230/mainboard.c
@@ -50,7 +50,7 @@ const char *smbios_mainboard_bios_version(void)
 		return "CBET4000 " COREBOOT_VERSION;
 }
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	RCBA32(0x38c8) = 0x00002005;
 	RCBA32(0x38c4) = 0x00802005;
@@ -73,7 +73,7 @@ static void mainboard_init(device_t dev)
 // mainboard_enable is executed as first thing after
 // enumerate_buses().
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->init = mainboard_init;
 
diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c
index 1d29c71..9f0cda4 100644
--- a/src/mainboard/lenovo/x60/mainboard.c
+++ b/src/mainboard/lenovo/x60/mainboard.c
@@ -56,9 +56,11 @@ int get_cst_entries(acpi_cstate_t **entries)
 	return ARRAY_SIZE(cst_entries);
 }
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
-	device_t dev0, idedev, sdhci_dev;
+	struct device * dev0;
+	struct device * idedev;
+	struct device * sdhci_dev;
 
 	ec_clr_bit(0x03, 2);
 
@@ -115,7 +117,7 @@ static void fill_ssdt(void)
 	drivers_lenovo_serial_ports_ssdt_generate("\\_SB.PCI0.LPCB", 1);
 }
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->init = mainboard_init;
 	dev->ops->acpi_fill_ssdt_generator = fill_ssdt;
diff --git a/src/mainboard/lippert/frontrunner-af/mainboard.c b/src/mainboard/lippert/frontrunner-af/mainboard.c
index ee538c3..983df2c 100644
--- a/src/mainboard/lippert/frontrunner-af/mainboard.c
+++ b/src/mainboard/lippert/frontrunner-af/mainboard.c
@@ -163,7 +163,7 @@ void set_pcie_dereset(void)
 /**********************************************
  * Enable the dedicated functions of the board.
  **********************************************/
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
 	dev->ops->init = init;
diff --git a/src/mainboard/lippert/frontrunner-af/mptable.c b/src/mainboard/lippert/frontrunner-af/mptable.c
index 078601e..6d91730 100644
--- a/src/mainboard/lippert/frontrunner-af/mptable.c
+++ b/src/mainboard/lippert/frontrunner-af/mptable.c
@@ -104,7 +104,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/lippert/toucan-af/mainboard.c b/src/mainboard/lippert/toucan-af/mainboard.c
index 9e44a21..28ac9ba 100644
--- a/src/mainboard/lippert/toucan-af/mainboard.c
+++ b/src/mainboard/lippert/toucan-af/mainboard.c
@@ -130,7 +130,7 @@ void set_pcie_dereset(void)
 /**********************************************
  * Enable the dedicated functions of the board.
  **********************************************/
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
 	dev->ops->init = init;
diff --git a/src/mainboard/lippert/toucan-af/mptable.c b/src/mainboard/lippert/toucan-af/mptable.c
index 078601e..6d91730 100644
--- a/src/mainboard/lippert/toucan-af/mptable.c
+++ b/src/mainboard/lippert/toucan-af/mptable.c
@@ -104,7 +104,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/msi/ms7135/get_bus_conf.c b/src/mainboard/msi/ms7135/get_bus_conf.c
index e364892..cb2bd5d 100644
--- a/src/mainboard/msi/ms7135/get_bus_conf.c
+++ b/src/mainboard/msi/ms7135/get_bus_conf.c
@@ -55,7 +55,7 @@ void get_bus_conf(void)
 {
 	unsigned apicid_base;
 
-	device_t dev;
+	struct device *dev;
 	unsigned sbdn;
 	int i;
 
diff --git a/src/mainboard/msi/ms7135/mptable.c b/src/mainboard/msi/ms7135/mptable.c
index b43a516..0c7032f 100644
--- a/src/mainboard/msi/ms7135/mptable.c
+++ b/src/mainboard/msi/ms7135/mptable.c
@@ -50,7 +50,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;
 		u32 dword;
 
diff --git a/src/mainboard/msi/ms7260/get_bus_conf.c b/src/mainboard/msi/ms7260/get_bus_conf.c
index 34d3834..97b2b70 100644
--- a/src/mainboard/msi/ms7260/get_bus_conf.c
+++ b/src/mainboard/msi/ms7260/get_bus_conf.c
@@ -69,7 +69,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/msi/ms7260/mainboard.c b/src/mainboard/msi/ms7260/mainboard.c
index 492693a..d4e111f 100644
--- a/src/mainboard/msi/ms7260/mainboard.c
+++ b/src/mainboard/msi/ms7260/mainboard.c
@@ -23,7 +23,7 @@
 #if 0
 
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 }
 #endif
diff --git a/src/mainboard/msi/ms7260/mptable.c b/src/mainboard/msi/ms7260/mptable.c
index ea003a8..a200b70 100644
--- a/src/mainboard/msi/ms7260/mptable.c
+++ b/src/mainboard/msi/ms7260/mptable.c
@@ -48,7 +48,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/msi/ms9185/get_bus_conf.c b/src/mainboard/msi/ms9185/get_bus_conf.c
index 3a70d83..86afc47 100644
--- a/src/mainboard/msi/ms9185/get_bus_conf.c
+++ b/src/mainboard/msi/ms9185/get_bus_conf.c
@@ -68,7 +68,7 @@ void get_bus_conf(void)
 
 	unsigned apicid_base;
 
-	device_t dev;
+	struct device *dev;
 	int i;
 	struct mb_sysconf_t *m;
 
diff --git a/src/mainboard/msi/ms9185/mptable.c b/src/mainboard/msi/ms9185/mptable.c
index b30ab73..fc00858 100644
--- a/src/mainboard/msi/ms9185/mptable.c
+++ b/src/mainboard/msi/ms9185/mptable.c
@@ -56,7 +56,7 @@ static void *smp_write_config_table(void *v)
 
 /*I/O APICs:   APIC ID Version State           Address*/
         {
-		device_t dev = 0;
+		struct device * dev = 0;
                struct resource *res;
                for(i=0; i<3; i++) {
                        dev = dev_find_device(0x1166, 0x0235, dev);
@@ -92,7 +92,7 @@ static void *smp_write_config_table(void *v)
         /* enable int */
         /* why here? must get the BAR and PCI command bit 1 set before enable it ....*/
         {
-                device_t dev;
+                struct device * dev;
                 dev = dev_find_device(0x1166, 0x0205, 0);
                 if(dev) {
                         uint32_t dword;
diff --git a/src/mainboard/msi/ms9282/get_bus_conf.c b/src/mainboard/msi/ms9282/get_bus_conf.c
index 195ddc4..776fabb 100644
--- a/src/mainboard/msi/ms9282/get_bus_conf.c
+++ b/src/mainboard/msi/ms9282/get_bus_conf.c
@@ -70,7 +70,7 @@ void get_bus_conf(void)
 	unsigned apicid_base;
 	struct mb_sysconf_t *m;
 
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if (get_bus_conf_done == 1)
diff --git a/src/mainboard/msi/ms9282/mainboard.c b/src/mainboard/msi/ms9282/mainboard.c
index c7e459a..54cdc3b 100644
--- a/src/mainboard/msi/ms9282/mainboard.c
+++ b/src/mainboard/msi/ms9282/mainboard.c
@@ -26,7 +26,7 @@
 #include <device/pci_ops.h>
 
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 }
 
diff --git a/src/mainboard/msi/ms9282/mptable.c b/src/mainboard/msi/ms9282/mptable.c
index 1764cf3..432e702 100644
--- a/src/mainboard/msi/ms9282/mptable.c
+++ b/src/mainboard/msi/ms9282/mptable.c
@@ -52,7 +52,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/msi/ms9652_fam10/get_bus_conf.c b/src/mainboard/msi/ms9652_fam10/get_bus_conf.c
index 36ae12c..4ec04f5 100644
--- a/src/mainboard/msi/ms9652_fam10/get_bus_conf.c
+++ b/src/mainboard/msi/ms9652_fam10/get_bus_conf.c
@@ -71,7 +71,7 @@ void get_bus_conf(void)
 	unsigned apicid_base;
 	struct mb_sysconf_t *m;
 
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	printk(BIOS_SPEW, "get_bus_conf()\n");
diff --git a/src/mainboard/msi/ms9652_fam10/mainboard.c b/src/mainboard/msi/ms9652_fam10/mainboard.c
index 96760d6..7fc97f0 100644
--- a/src/mainboard/msi/ms9652_fam10/mainboard.c
+++ b/src/mainboard/msi/ms9652_fam10/mainboard.c
@@ -26,7 +26,7 @@
 #include <device/pci_ops.h>
 
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 }
 
diff --git a/src/mainboard/msi/ms9652_fam10/mptable.c b/src/mainboard/msi/ms9652_fam10/mptable.c
index 09a25f2..1b9b349 100644
--- a/src/mainboard/msi/ms9652_fam10/mptable.c
+++ b/src/mainboard/msi/ms9652_fam10/mptable.c
@@ -49,7 +49,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/newisys/khepri/mptable.c b/src/mainboard/newisys/khepri/mptable.c
index 1d7c79e..ede913f 100644
--- a/src/mainboard/newisys/khepri/mptable.c
+++ b/src/mainboard/newisys/khepri/mptable.c
@@ -20,7 +20,7 @@ static void *smp_write_config_table(void *v)
 	smp_write_processors(mc);
 
 	{
-		device_t dev;
+		struct device * dev;
 
 		/* 8111 */
 		dev = dev_find_slot(1, PCI_DEVFN(0x03,0));
@@ -57,7 +57,7 @@ static void *smp_write_config_table(void *v)
 
 	smp_write_ioapic(mc, 2, 0x11, IO_APIC_ADDR);
 	{
-		device_t dev;
+		struct device * dev;
 		struct resource *res;
 		/* 8131 apic 3 */
 		dev = dev_find_slot(1, PCI_DEVFN(0x01,1));
diff --git a/src/mainboard/nvidia/l1_2pvv/get_bus_conf.c b/src/mainboard/nvidia/l1_2pvv/get_bus_conf.c
index 125b564..b77a355 100644
--- a/src/mainboard/nvidia/l1_2pvv/get_bus_conf.c
+++ b/src/mainboard/nvidia/l1_2pvv/get_bus_conf.c
@@ -73,7 +73,7 @@ static unsigned get_hcid(unsigned i)
 
 	unsigned devn = sysconf.hcdn[i] & 0xff;
 
-	device_t dev;
+	struct device *dev;
 
 	dev = dev_find_slot(busn, PCI_DEVFN(devn,0));
 
diff --git a/src/mainboard/nvidia/l1_2pvv/mainboard.c b/src/mainboard/nvidia/l1_2pvv/mainboard.c
index 291d4f7..a668696 100644
--- a/src/mainboard/nvidia/l1_2pvv/mainboard.c
+++ b/src/mainboard/nvidia/l1_2pvv/mainboard.c
@@ -26,7 +26,7 @@
 #include <device/pci_ops.h>
 
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 }
 
diff --git a/src/mainboard/nvidia/l1_2pvv/mptable.c b/src/mainboard/nvidia/l1_2pvv/mptable.c
index e991efd..5cdad5b 100644
--- a/src/mainboard/nvidia/l1_2pvv/mptable.c
+++ b/src/mainboard/nvidia/l1_2pvv/mptable.c
@@ -49,7 +49,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;
 
@@ -117,7 +117,7 @@ static void *smp_write_config_table(void *v)
 
 //Slot PCIE
 	for (j = 2; j < 8; j++) {
-		device_t dev;
+		struct device * dev;
 		dev = dev_find_slot(m->bus_mcp55, PCI_DEVFN(sbdn + 0x0a + j - 2 , 0));
 		if (!dev || !dev->enabled)
 			continue;
@@ -128,7 +128,7 @@ static void *smp_write_config_table(void *v)
 
 //Slot PCI 32
 	{
-		device_t dev;
+		struct device * dev;
 		dev = dev_find_slot(m->bus_mcp55, PCI_DEVFN(sbdn + 6 , 0));
 		if (dev && dev->enabled) {
 			for (i = 0; i < 4; i++)
@@ -148,7 +148,7 @@ static void *smp_write_config_table(void *v)
 
 	//Slot  PCIE
 		for (j = 2; j < 8; j++) {
-			device_t dev;
+			struct device * dev;
 			dev = dev_find_slot(m->bus_mcp55b, PCI_DEVFN(m->sbdnb + 0x0a + j - 2 , 0));
 			if (!dev || !dev->enabled)
 				continue;
diff --git a/src/mainboard/packardbell/ms2290/mainboard.c b/src/mainboard/packardbell/ms2290/mainboard.c
index c14e9b7..c5b51e0 100644
--- a/src/mainboard/packardbell/ms2290/mainboard.c
+++ b/src/mainboard/packardbell/ms2290/mainboard.c
@@ -58,7 +58,7 @@ int get_cst_entries(acpi_cstate_t ** entries)
 
 
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	u16 pmbase;
 
diff --git a/src/mainboard/rca/rm4100/mainboard.c b/src/mainboard/rca/rm4100/mainboard.c
index 2e3191b..421c916 100644
--- a/src/mainboard/rca/rm4100/mainboard.c
+++ b/src/mainboard/rca/rm4100/mainboard.c
@@ -20,12 +20,12 @@
 
 #include <device/device.h>
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	// TODO Switch parport LEDs again
 }
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	// TODO Switch parport LEDs
 	dev->ops->init = mainboard_init;
diff --git a/src/mainboard/roda/rk886ex/mainboard.c b/src/mainboard/roda/rk886ex/mainboard.c
index 4c7fffa..5421d13 100644
--- a/src/mainboard/roda/rk886ex/mainboard.c
+++ b/src/mainboard/roda/rk886ex/mainboard.c
@@ -63,14 +63,14 @@ static void dump_runtime_registers(void)
 }
 #endif
 
-static void mainboard_final(device_t dev)
+static void mainboard_final(struct device * dev)
 {
 	/* Enable Dummy DCC ON# for DVI */
 	printk(BIOS_DEBUG, "Laptop handling...\n");
 	outb(inb(0x60f) & ~(1 << 5), 0x60f);
 }
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	/* Configure the MultiKey controller */
 	// m3885_configure_multikey();
diff --git a/src/mainboard/roda/rk9/mainboard.c b/src/mainboard/roda/rk9/mainboard.c
index acf8023..39ade3f 100644
--- a/src/mainboard/roda/rk9/mainboard.c
+++ b/src/mainboard/roda/rk9/mainboard.c
@@ -44,7 +44,7 @@ static void ec_setup(void)
 	send_ec_command(0xad); /* Set_Thml_Value */
 }
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	ec_setup();
 	/* LCD panel type is SIO GPIO40-43.
diff --git a/src/mainboard/samsung/lumpy/mainboard.c b/src/mainboard/samsung/lumpy/mainboard.c
index 3bdd4d9..d53bf9e 100644
--- a/src/mainboard/samsung/lumpy/mainboard.c
+++ b/src/mainboard/samsung/lumpy/mainboard.c
@@ -46,9 +46,7 @@ void mainboard_suspend_resume(void)
 	send_ec_command(EC_ACPI_ENABLE);
 }
 
-
-
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	/* Initialize the Embedded Controller */
 	lumpy_ec_init();
@@ -80,7 +78,7 @@ static int lumpy_smbios_type41_irq(int *handle, unsigned long *current,
 }
 
 
-static int lumpy_onboard_smbios_data(device_t dev, int *handle,
+static int lumpy_onboard_smbios_data(struct device * dev, int *handle,
 				     unsigned long *current)
 {
 	int len = 0;
@@ -101,7 +99,7 @@ static int lumpy_onboard_smbios_data(device_t dev, int *handle,
 // mainboard_enable is executed as first thing after
 // enumerate_buses().
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->init = mainboard_init;
 	dev->ops->get_smbios_data = lumpy_onboard_smbios_data;
diff --git a/src/mainboard/samsung/stumpy/mainboard.c b/src/mainboard/samsung/stumpy/mainboard.c
index 347ce8a..1f92309 100644
--- a/src/mainboard/samsung/stumpy/mainboard.c
+++ b/src/mainboard/samsung/stumpy/mainboard.c
@@ -44,7 +44,7 @@ void mainboard_suspend_resume(void)
 // mainboard_enable is executed as first thing after
 // enumerate_buses().
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_EDP, GMA_INT15_PANEL_FIT_CENTERING, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
 }
diff --git a/src/mainboard/siemens/sitemp_g1p1/get_bus_conf.c b/src/mainboard/siemens/sitemp_g1p1/get_bus_conf.c
index 084e2b1..c959280 100644
--- a/src/mainboard/siemens/sitemp_g1p1/get_bus_conf.c
+++ b/src/mainboard/siemens/sitemp_g1p1/get_bus_conf.c
@@ -63,7 +63,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/siemens/sitemp_g1p1/mainboard.c b/src/mainboard/siemens/sitemp_g1p1/mainboard.c
index 77be0af..219527a 100644
--- a/src/mainboard/siemens/sitemp_g1p1/mainboard.c
+++ b/src/mainboard/siemens/sitemp_g1p1/mainboard.c
@@ -389,7 +389,7 @@ static void pm_init( void )
 {
 	u16 word;
 	u8 byte;
-	device_t sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
+	struct device * sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
 
 	/* set SB600 GPIO 64 to GPIO with pull-up */
 	byte = pm2_ioread(0x42);
@@ -432,7 +432,7 @@ static void set_thermal_config(void)
 {
 	u8 byte, byte2;
 	u8 cpu_pwm_conf, case_pwm_conf;
-	device_t sm_dev;
+	struct device * sm_dev;
 	struct fan_control cpu_fan_control, case_fan_control;
 	const char *name = NULL;
 
@@ -614,8 +614,8 @@ static void patch_mmio_nonposted( void )
 	resource_t rbase, rend;
 	u32 base, limit;
 	struct resource *resource;
-	device_t dev;
-	device_t k8_f1 = dev_find_slot(0, PCI_DEVFN(0x18,1));
+	struct device * dev;
+	struct device * k8_f1 = dev_find_slot(0, PCI_DEVFN(0x18,1));
 
 	printk(BIOS_DEBUG,"%s ...\n", __func__);
 
@@ -668,7 +668,7 @@ struct {
 
 unsigned int plx_present = 0;
 
-static void update_subsystemid( device_t dev )
+static void update_subsystemid(struct device * dev)
 {
 	int i;
 
@@ -680,7 +680,7 @@ static void update_subsystemid( device_t dev )
 	}
 	printk(BIOS_INFO, "%s [%x/%x]\n", dev_name(dev), dev->subsystem_vendor, dev->subsystem_device );
 	for( i=0; slot[i].bus < 255; i++) {
-		device_t d;
+		struct device * d;
 		d = dev_find_slot(slot[i].bus,slot[i].devfn);
 		if( d ) {
 			printk(BIOS_DEBUG,"%s subsystem <- %x/%x\n", dev_path(d), dev->subsystem_vendor, dev->subsystem_device);
@@ -695,10 +695,11 @@ static void update_subsystemid( device_t dev )
  * @param
  */
 
-static void detect_hw_variant( device_t dev )
+static void detect_hw_variant(struct device * dev)
 {
 
-	device_t nb_dev =0, dev2 = 0;
+	struct device * nb_dev = NULL;
+	struct device * dev2 = NULL;
 	struct southbridge_amd_rs690_config *cfg;
 	u32 lc_state, id = 0;
 
@@ -807,7 +808,7 @@ static void smm_lock( void )
  * @param the root device
  */
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 #if CONFIG_PCI_OPTION_ROM_RUN_REALMODE
 	INT15_function_extensions int15_func;
@@ -833,7 +834,7 @@ static void mainboard_init(device_t dev)
 * enable the dedicated function in sina board.
 * This function called early than rs690_enable.
 *************************************************/
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 
 	printk(BIOS_INFO, "%s %s[%x/%x] %s\n",
diff --git a/src/mainboard/siemens/sitemp_g1p1/mptable.c b/src/mainboard/siemens/sitemp_g1p1/mptable.c
index de5151d..194b5ba 100644
--- a/src/mainboard/siemens/sitemp_g1p1/mptable.c
+++ b/src/mainboard/siemens/sitemp_g1p1/mptable.c
@@ -49,7 +49,7 @@ static void *smp_write_config_table(void *v)
 	mptable_write_buses(mc, NULL, &isa_bus);
 	/* I/O APICs:   APIC ID Version State   Address */
 	{
-		device_t dev;
+		struct device * dev;
 
 		dev = dev_find_slot(bus_sb600[0], PCI_DEVFN(sbdn_sb600 + 0x14, 0));
 		if (dev) {
diff --git a/src/mainboard/sunw/ultra40/get_bus_conf.c b/src/mainboard/sunw/ultra40/get_bus_conf.c
index f57719a..f716158 100644
--- a/src/mainboard/sunw/ultra40/get_bus_conf.c
+++ b/src/mainboard/sunw/ultra40/get_bus_conf.c
@@ -67,7 +67,7 @@ void get_bus_conf(void)
 
 	unsigned apicid_base;
 
-	device_t dev;
+	struct device *dev;
 
 	if (get_bus_conf_done == 1)
 		return;		//do it only once
diff --git a/src/mainboard/sunw/ultra40/mptable.c b/src/mainboard/sunw/ultra40/mptable.c
index 1ba1dcf..6259278 100644
--- a/src/mainboard/sunw/ultra40/mptable.c
+++ b/src/mainboard/sunw/ultra40/mptable.c
@@ -49,7 +49,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/supermicro/h8dme/get_bus_conf.c b/src/mainboard/supermicro/h8dme/get_bus_conf.c
index 0279f8f..8b5ec69 100644
--- a/src/mainboard/supermicro/h8dme/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8dme/get_bus_conf.c
@@ -71,7 +71,7 @@ void get_bus_conf(void)
 	unsigned apicid_base;
 	unsigned sbdn;
 
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if (get_bus_conf_done == 1)
diff --git a/src/mainboard/supermicro/h8dme/mptable.c b/src/mainboard/supermicro/h8dme/mptable.c
index 17067ed..d53b498 100644
--- a/src/mainboard/supermicro/h8dme/mptable.c
+++ b/src/mainboard/supermicro/h8dme/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;
 		uint32_t dword;
 
diff --git a/src/mainboard/supermicro/h8dmr/get_bus_conf.c b/src/mainboard/supermicro/h8dmr/get_bus_conf.c
index 0279f8f..8b5ec69 100644
--- a/src/mainboard/supermicro/h8dmr/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8dmr/get_bus_conf.c
@@ -71,7 +71,7 @@ void get_bus_conf(void)
 	unsigned apicid_base;
 	unsigned sbdn;
 
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if (get_bus_conf_done == 1)
diff --git a/src/mainboard/supermicro/h8dmr/mptable.c b/src/mainboard/supermicro/h8dmr/mptable.c
index 11db23f..5a24259 100644
--- a/src/mainboard/supermicro/h8dmr/mptable.c
+++ b/src/mainboard/supermicro/h8dmr/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;
 		uint32_t dword;
 
diff --git a/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c b/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c
index a1de06c..71eb756 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c
@@ -72,7 +72,7 @@ void get_bus_conf(void)
 	unsigned apicid_base;
 	struct mb_sysconf_t *m;
 
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if(get_bus_conf_done==1) return; //do it only once
diff --git a/src/mainboard/supermicro/h8dmr_fam10/mptable.c b/src/mainboard/supermicro/h8dmr_fam10/mptable.c
index 4e2d48c..5c88156 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/mptable.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/mptable.c
@@ -48,7 +48,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/supermicro/h8qgi/mainboard.c b/src/mainboard/supermicro/h8qgi/mainboard.c
index 8f12e22..cdce2f9 100644
--- a/src/mainboard/supermicro/h8qgi/mainboard.c
+++ b/src/mainboard/supermicro/h8qgi/mainboard.c
@@ -65,7 +65,7 @@ void set_pcie_dereset(void *nbconfig)
 /*************************************************
  * enable the dedicated function in h8qgi board.
  *************************************************/
-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/supermicro/h8qgi/mptable.c b/src/mainboard/supermicro/h8qgi/mptable.c
index 5ec4a35..230cacc 100644
--- a/src/mainboard/supermicro/h8qgi/mptable.c
+++ b/src/mainboard/supermicro/h8qgi/mptable.c
@@ -34,7 +34,7 @@ static void *smp_write_config_table(void *v)
 	int bus_isa;
 	u32 apicid_sp5100;
 	u32 apicid_sr5650;
-	device_t dev;
+	struct device * dev;
 	u32 dword;
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
diff --git a/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c b/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c
index 50e2b44..7a80f74 100644
--- a/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c
@@ -74,7 +74,7 @@ void get_bus_conf(void)
 	unsigned apicid_base;
 	struct mb_sysconf_t *m;
 
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if(get_bus_conf_done==1) return; //do it only once
diff --git a/src/mainboard/supermicro/h8qme_fam10/mptable.c b/src/mainboard/supermicro/h8qme_fam10/mptable.c
index 4fbb4c8..79f8a5e 100644
--- a/src/mainboard/supermicro/h8qme_fam10/mptable.c
+++ b/src/mainboard/supermicro/h8qme_fam10/mptable.c
@@ -50,7 +50,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/supermicro/h8scm/mainboard.c b/src/mainboard/supermicro/h8scm/mainboard.c
index 23b1d72..de1dead 100644
--- a/src/mainboard/supermicro/h8scm/mainboard.c
+++ b/src/mainboard/supermicro/h8scm/mainboard.c
@@ -67,7 +67,7 @@ void set_pcie_dereset(void *nbconfig)
 /*************************************************
  * enable the dedicated function in h8scm board.
  *************************************************/
-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/supermicro/h8scm/mptable.c b/src/mainboard/supermicro/h8scm/mptable.c
index 5ec4a35..230cacc 100644
--- a/src/mainboard/supermicro/h8scm/mptable.c
+++ b/src/mainboard/supermicro/h8scm/mptable.c
@@ -34,7 +34,7 @@ static void *smp_write_config_table(void *v)
 	int bus_isa;
 	u32 apicid_sp5100;
 	u32 apicid_sr5650;
-	device_t dev;
+	struct device * dev;
 	u32 dword;
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
diff --git a/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c b/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
index 0560180..fc3a446 100644
--- a/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
@@ -65,7 +65,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/supermicro/h8scm_fam10/mainboard.c b/src/mainboard/supermicro/h8scm_fam10/mainboard.c
index 18e1e8c..4908dcb 100644
--- a/src/mainboard/supermicro/h8scm_fam10/mainboard.c
+++ b/src/mainboard/supermicro/h8scm_fam10/mainboard.c
@@ -49,7 +49,7 @@ u8 is_dev3_present(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);
@@ -58,7 +58,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);
@@ -69,7 +69,7 @@ void set_pcie_dereset(void)
 * enable the dedicated function in h8scm board.
 * This function called early than sr5650_enable.
 *************************************************/
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	printk(BIOS_INFO, "Mainboard H8SCM Enable. dev=0x%p\n", dev);
 
diff --git a/src/mainboard/supermicro/h8scm_fam10/mptable.c b/src/mainboard/supermicro/h8scm_fam10/mptable.c
index 84593fc..864cdd1 100644
--- a/src/mainboard/supermicro/h8scm_fam10/mptable.c
+++ b/src/mainboard/supermicro/h8scm_fam10/mptable.c
@@ -55,7 +55,7 @@ static void *smp_write_config_table(void *v)
 	mptable_write_buses(mc, NULL, &bus_isa);
 	/* I/O APICs:   APIC ID Version State   Address */
 	{
-		device_t dev;
+		struct device * dev;
 		u32 dword;
 		u8 byte;
 
diff --git a/src/mainboard/supermicro/x6dai_g/mptable.c b/src/mainboard/supermicro/x6dai_g/mptable.c
index 0efae77..4185a54 100644
--- a/src/mainboard/supermicro/x6dai_g/mptable.c
+++ b/src/mainboard/supermicro/x6dai_g/mptable.c
@@ -18,7 +18,7 @@ static void *smp_write_config_table(void *v)
 	smp_write_processors(mc);
 
 	{
-		device_t dev;
+		struct device * dev;
 
 		/* southbridge */
 		dev = dev_find_slot(0, PCI_DEVFN(0x1e,0));
diff --git a/src/mainboard/supermicro/x6dhe_g/mptable.c b/src/mainboard/supermicro/x6dhe_g/mptable.c
index ab73fc7..18fe954 100644
--- a/src/mainboard/supermicro/x6dhe_g/mptable.c
+++ b/src/mainboard/supermicro/x6dhe_g/mptable.c
@@ -21,7 +21,7 @@ static void *smp_write_config_table(void *v)
 	smp_write_processors(mc);
 
 	{
-		device_t dev;
+		struct device * dev;
 
 		/* esb6300_2 */
 		dev = dev_find_slot(0, PCI_DEVFN(0x1c,0));
@@ -65,7 +65,7 @@ static void *smp_write_config_table(void *v)
 	smp_write_ioapic(mc, 3, 0x20, IO_APIC_ADDR + 0x10000);
 	{
 	    	struct resource *res;
-		device_t dev;
+		struct device * dev;
 		/* PXHd apic 4 */
 		dev = dev_find_slot(1, PCI_DEVFN(0x00,1));
 		if (dev) {
diff --git a/src/mainboard/supermicro/x6dhe_g2/mptable.c b/src/mainboard/supermicro/x6dhe_g2/mptable.c
index a2b8c8d..c4d690e 100644
--- a/src/mainboard/supermicro/x6dhe_g2/mptable.c
+++ b/src/mainboard/supermicro/x6dhe_g2/mptable.c
@@ -21,7 +21,7 @@ static void *smp_write_config_table(void *v)
 	smp_write_processors(mc);
 
 	{
-		device_t dev;
+		struct device * dev;
 
 		/* esb6300_2 */
 		dev = dev_find_slot(0, PCI_DEVFN(0x1c,0));
@@ -65,7 +65,7 @@ static void *smp_write_config_table(void *v)
 	smp_write_ioapic(mc, 3, 0x20, IO_APIC_ADDR + 0x10000);
 	{
 	    	struct resource *res;
-		device_t dev;
+		struct device * dev;
 		/* PXHd apic 4 */
 		dev = dev_find_slot(1, PCI_DEVFN(0x00,1));
 		if (dev) {
diff --git a/src/mainboard/supermicro/x6dhr_ig/mptable.c b/src/mainboard/supermicro/x6dhr_ig/mptable.c
index f9165d6..935ae8c 100644
--- a/src/mainboard/supermicro/x6dhr_ig/mptable.c
+++ b/src/mainboard/supermicro/x6dhr_ig/mptable.c
@@ -22,7 +22,7 @@ static void *smp_write_config_table(void *v)
 	smp_write_processors(mc);
 
 	{
-		device_t dev;
+		struct device * dev;
 
 		/* ich5r */
 		dev = dev_find_slot(0, PCI_DEVFN(0x1e,0));
@@ -89,7 +89,7 @@ static void *smp_write_config_table(void *v)
 	smp_write_ioapic(mc, 2, 0x20, IO_APIC_ADDR);
 	{
 		struct resource *res;
-		device_t dev;
+		struct device * dev;
 		/* pxhd apic 3 */
 		dev = dev_find_slot(2, PCI_DEVFN(0x00,1));
 		if (dev) {
diff --git a/src/mainboard/supermicro/x6dhr_ig2/mptable.c b/src/mainboard/supermicro/x6dhr_ig2/mptable.c
index b5ba6b1..56aec2e 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/mptable.c
+++ b/src/mainboard/supermicro/x6dhr_ig2/mptable.c
@@ -22,7 +22,7 @@ static void *smp_write_config_table(void *v)
 	smp_write_processors(mc);
 
 	{
-		device_t dev;
+		struct device * dev;
 
 		/* ich5r */
 		dev = dev_find_slot(0, PCI_DEVFN(0x1e,0));
@@ -89,7 +89,7 @@ static void *smp_write_config_table(void *v)
 	smp_write_ioapic(mc, 2, 0x20, IO_APIC_ADDR);
 	{
 		struct resource *res;
-		device_t dev;
+		struct device * dev;
 		/* pxhd apic 3 */
 		dev = dev_find_slot(1, PCI_DEVFN(0x00,1));
 		if (dev) {
diff --git a/src/mainboard/supermicro/x7db8/mainboard.c b/src/mainboard/supermicro/x7db8/mainboard.c
index 1d666c9..cf0c044 100644
--- a/src/mainboard/supermicro/x7db8/mainboard.c
+++ b/src/mainboard/supermicro/x7db8/mainboard.c
@@ -27,7 +27,7 @@
 #include <device/pci_ops.h>
 #include <arch/io.h>
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 }
 
diff --git a/src/mainboard/technexion/tim5690/get_bus_conf.c b/src/mainboard/technexion/tim5690/get_bus_conf.c
index 084e2b1..c959280 100644
--- a/src/mainboard/technexion/tim5690/get_bus_conf.c
+++ b/src/mainboard/technexion/tim5690/get_bus_conf.c
@@ -63,7 +63,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/technexion/tim5690/mainboard.c b/src/mainboard/technexion/tim5690/mainboard.c
index 3423e51..da4ed9a 100644
--- a/src/mainboard/technexion/tim5690/mainboard.c
+++ b/src/mainboard/technexion/tim5690/mainboard.c
@@ -117,7 +117,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 */
@@ -222,7 +222,7 @@ static void lcd_panel_id(rs690_vbios_regs *vbios_regs, u8 num_id)
 * enable the dedicated function in tim5690 board.
 * This function called early than rs690_enable.
 *************************************************/
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	u16 gpio_base = IT8712F_SIMPLE_IO_BASE;
 #if CONFIG_VGA_ROM_RUN
diff --git a/src/mainboard/technexion/tim5690/mptable.c b/src/mainboard/technexion/tim5690/mptable.c
index 8b86b02..840a93a 100644
--- a/src/mainboard/technexion/tim5690/mptable.c
+++ b/src/mainboard/technexion/tim5690/mptable.c
@@ -50,7 +50,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/technexion/tim8690/get_bus_conf.c b/src/mainboard/technexion/tim8690/get_bus_conf.c
index 084e2b1..c959280 100644
--- a/src/mainboard/technexion/tim8690/get_bus_conf.c
+++ b/src/mainboard/technexion/tim8690/get_bus_conf.c
@@ -63,7 +63,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/technexion/tim8690/mainboard.c b/src/mainboard/technexion/tim8690/mainboard.c
index 6010eb1..14811bb 100644
--- a/src/mainboard/technexion/tim8690/mainboard.c
+++ b/src/mainboard/technexion/tim8690/mainboard.c
@@ -53,7 +53,7 @@ static void enable_onboard_nic(void)
 {
 
 	u8 byte;
-	device_t sm_dev;
+	struct device * sm_dev;
 
 	printk(BIOS_INFO, "enable_onboard_nic.\n");
 
@@ -79,7 +79,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 */
@@ -140,7 +140,7 @@ static void set_thermal_config(void)
 * enable the dedicated function in tim8690 board.
 * This function called early than rs690_enable.
 *************************************************/
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	printk(BIOS_INFO, "Mainboard tim8690 Enable. dev=0x%p\n", dev);
 
diff --git a/src/mainboard/technexion/tim8690/mptable.c b/src/mainboard/technexion/tim8690/mptable.c
index 8b86b02..840a93a 100644
--- a/src/mainboard/technexion/tim8690/mptable.c
+++ b/src/mainboard/technexion/tim8690/mptable.c
@@ -50,7 +50,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/thomson/ip1000/mainboard.c b/src/mainboard/thomson/ip1000/mainboard.c
index 7267696..9bd4f53 100644
--- a/src/mainboard/thomson/ip1000/mainboard.c
+++ b/src/mainboard/thomson/ip1000/mainboard.c
@@ -84,13 +84,13 @@ static void flash_gpios(void)
 	}
 }
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device * dev)
 {
 	parport_gpios();
 	flash_gpios();
 }
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->init = mainboard_init;
 	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS, GMA_INT15_PANEL_FIT_DEFAULT, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
diff --git a/src/mainboard/tyan/s2735/mptable.c b/src/mainboard/tyan/s2735/mptable.c
index 9073728..9f65205 100644
--- a/src/mainboard/tyan/s2735/mptable.c
+++ b/src/mainboard/tyan/s2735/mptable.c
@@ -19,7 +19,7 @@ static void *smp_write_config_table(void *v)
 /*I/O APICs:	APIC ID	Version	State		Address*/
 	smp_write_ioapic(mc, 8, 0x20, IO_APIC_ADDR);
 	{
-                device_t dev;
+                struct device * dev;
                 struct resource *res;
 		dev = dev_find_slot(1, PCI_DEVFN(0x1e,0));
 		if (dev) {
diff --git a/src/mainboard/tyan/s2850/mptable.c b/src/mainboard/tyan/s2850/mptable.c
index 371d9a3..3145e32 100644
--- a/src/mainboard/tyan/s2850/mptable.c
+++ b/src/mainboard/tyan/s2850/mptable.c
@@ -10,7 +10,7 @@
 
 static unsigned node_link_to_bus(unsigned node, unsigned link)
 {
-        device_t dev;
+        struct device * dev;
         unsigned reg;
 
         dev = dev_find_slot(0, PCI_DEVFN(0x18, 1));
@@ -57,7 +57,7 @@ static void *smp_write_config_table(void *v)
 
         smp_write_processors(mc);
         {
-                device_t dev;
+                struct device * dev;
 
                 /* HT chain 0 */
                 bus_chain_0 = node_link_to_bus(0, 0);
diff --git a/src/mainboard/tyan/s2875/mptable.c b/src/mainboard/tyan/s2875/mptable.c
index 90299a7..798ea64 100644
--- a/src/mainboard/tyan/s2875/mptable.c
+++ b/src/mainboard/tyan/s2875/mptable.c
@@ -10,7 +10,7 @@
 
 static unsigned node_link_to_bus(unsigned node, unsigned link)
 {
-        device_t dev;
+        struct device * dev;
         unsigned reg;
 
         dev = dev_find_slot(0, PCI_DEVFN(0x18, 1));
@@ -59,7 +59,7 @@ static void *smp_write_config_table(void *v)
         smp_write_processors(mc);
 
         {
-                device_t dev;
+                struct device * dev;
 
                 /* HT chain 0 */
                 bus_chain_0 = node_link_to_bus(0, 0);
diff --git a/src/mainboard/tyan/s2880/mptable.c b/src/mainboard/tyan/s2880/mptable.c
index 32fc639..cbefcdb 100644
--- a/src/mainboard/tyan/s2880/mptable.c
+++ b/src/mainboard/tyan/s2880/mptable.c
@@ -10,7 +10,7 @@
 
 static unsigned node_link_to_bus(unsigned node, unsigned link)
 {
-        device_t dev;
+        struct device * dev;
         unsigned reg;
 
         dev = dev_find_slot(0, PCI_DEVFN(0x18, 1));
@@ -62,7 +62,7 @@ static void *smp_write_config_table(void *v)
         smp_write_processors(mc);
 
         {
-                device_t dev;
+                struct device * dev;
 
                 /* HT chain 0 */
                 bus_chain_0 = node_link_to_bus(0, 0);
@@ -120,7 +120,7 @@ static void *smp_write_config_table(void *v)
 	smp_write_ioapic(mc, apicid_8111, 0x11, IO_APIC_ADDR);
         {
 
-                device_t dev;
+                struct device * dev;
                 struct resource *res;
                 dev = dev_find_slot(bus_chain_0, PCI_DEVFN(0x1,1));
                 if (dev) {
diff --git a/src/mainboard/tyan/s2881/get_bus_conf.c b/src/mainboard/tyan/s2881/get_bus_conf.c
index 332e578..b2177a4 100644
--- a/src/mainboard/tyan/s2881/get_bus_conf.c
+++ b/src/mainboard/tyan/s2881/get_bus_conf.c
@@ -53,7 +53,7 @@ void get_bus_conf(void)
 
 	unsigned apicid_base;
 
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if (get_bus_conf_done == 1)
diff --git a/src/mainboard/tyan/s2881/mptable.c b/src/mainboard/tyan/s2881/mptable.c
index 7df5e87..d28a104 100644
--- a/src/mainboard/tyan/s2881/mptable.c
+++ b/src/mainboard/tyan/s2881/mptable.c
@@ -35,7 +35,7 @@ static void *smp_write_config_table(void *v)
 /*I/O APICs:	APIC ID	Version	State		Address*/
 	smp_write_ioapic(mc, apicid_8111, 0x11, IO_APIC_ADDR);
         {
-                device_t dev;
+                struct device * dev;
                 struct resource *res;
                 dev = dev_find_slot(bus_8131_0, PCI_DEVFN(sbdn3,1));
                 if (dev) {
diff --git a/src/mainboard/tyan/s2882/mptable.c b/src/mainboard/tyan/s2882/mptable.c
index 6c07965..b06b49c 100644
--- a/src/mainboard/tyan/s2882/mptable.c
+++ b/src/mainboard/tyan/s2882/mptable.c
@@ -11,7 +11,7 @@
 
 static unsigned node_link_to_bus(unsigned node, unsigned link)
 {
-        device_t dev;
+        struct device * dev;
         unsigned reg;
 
         dev = dev_find_slot(0, PCI_DEVFN(0x18, 1));
@@ -62,7 +62,7 @@ static void *smp_write_config_table(void *v)
 
         smp_write_processors(mc);
         {
-                device_t dev;
+                struct device * dev;
 
                 /* HT chain 0 */
                 bus_chain_0 = node_link_to_bus(0, 0);
@@ -118,7 +118,7 @@ static void *smp_write_config_table(void *v)
 
 	smp_write_ioapic(mc, apicid_8111, 0x11, IO_APIC_ADDR);
         {
-                device_t dev;
+                struct device * dev;
                 struct resource *res;
                 dev = dev_find_slot(bus_chain_0, PCI_DEVFN(0x1,1));
                 if (dev) {
diff --git a/src/mainboard/tyan/s2885/get_bus_conf.c b/src/mainboard/tyan/s2885/get_bus_conf.c
index 88706c0..dfd62b8 100644
--- a/src/mainboard/tyan/s2885/get_bus_conf.c
+++ b/src/mainboard/tyan/s2885/get_bus_conf.c
@@ -56,7 +56,7 @@ void get_bus_conf(void)
 
 	unsigned apicid_base;
 
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if (get_bus_conf_done == 1)
diff --git a/src/mainboard/tyan/s2885/mptable.c b/src/mainboard/tyan/s2885/mptable.c
index 26081c7..6413230 100644
--- a/src/mainboard/tyan/s2885/mptable.c
+++ b/src/mainboard/tyan/s2885/mptable.c
@@ -38,7 +38,7 @@ static void *smp_write_config_table(void *v)
 /*I/O APICs:	APIC ID	Version	State		Address*/
 	smp_write_ioapic(mc, apicid_8111, 0x11, IO_APIC_ADDR); //8111
         {
-                device_t dev;
+                struct device * dev;
 		struct resource *res;
                 dev = dev_find_slot(bus_8131_0, PCI_DEVFN(sbdn3,1));
                 if (dev) {
diff --git a/src/mainboard/tyan/s2891/get_bus_conf.c b/src/mainboard/tyan/s2891/get_bus_conf.c
index e94c608..5ff3e3b 100644
--- a/src/mainboard/tyan/s2891/get_bus_conf.c
+++ b/src/mainboard/tyan/s2891/get_bus_conf.c
@@ -60,7 +60,7 @@ void get_bus_conf(void)
 	unsigned apicid_base;
 	unsigned sbdn;
 
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if (get_bus_conf_done == 1)
diff --git a/src/mainboard/tyan/s2891/mainboard.c b/src/mainboard/tyan/s2891/mainboard.c
index 9a8dd90..5f261c6 100644
--- a/src/mainboard/tyan/s2891/mainboard.c
+++ b/src/mainboard/tyan/s2891/mainboard.c
@@ -10,7 +10,7 @@ static void mainboard_acpi_fill_ssdt_generator(void) {
 	amd_generate_powernow(0, 0, 0);
 }
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->acpi_fill_ssdt_generator = mainboard_acpi_fill_ssdt_generator;
 }
diff --git a/src/mainboard/tyan/s2891/mptable.c b/src/mainboard/tyan/s2891/mptable.c
index cb49434..f52a07b 100644
--- a/src/mainboard/tyan/s2891/mptable.c
+++ b/src/mainboard/tyan/s2891/mptable.c
@@ -39,7 +39,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/tyan/s2892/get_bus_conf.c b/src/mainboard/tyan/s2892/get_bus_conf.c
index 0ead854..e59cd33 100644
--- a/src/mainboard/tyan/s2892/get_bus_conf.c
+++ b/src/mainboard/tyan/s2892/get_bus_conf.c
@@ -58,7 +58,7 @@ void get_bus_conf(void)
 	unsigned apicid_base;
 	unsigned sbdn;
 
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if (get_bus_conf_done == 1)
diff --git a/src/mainboard/tyan/s2892/mainboard.c b/src/mainboard/tyan/s2892/mainboard.c
index 9a8dd90..5f261c6 100644
--- a/src/mainboard/tyan/s2892/mainboard.c
+++ b/src/mainboard/tyan/s2892/mainboard.c
@@ -10,7 +10,7 @@ static void mainboard_acpi_fill_ssdt_generator(void) {
 	amd_generate_powernow(0, 0, 0);
 }
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->acpi_fill_ssdt_generator = mainboard_acpi_fill_ssdt_generator;
 }
diff --git a/src/mainboard/tyan/s2892/mptable.c b/src/mainboard/tyan/s2892/mptable.c
index 882ac69..d3dc505 100644
--- a/src/mainboard/tyan/s2892/mptable.c
+++ b/src/mainboard/tyan/s2892/mptable.c
@@ -39,7 +39,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/tyan/s2895/get_bus_conf.c b/src/mainboard/tyan/s2895/get_bus_conf.c
index 11b1bc2..c6d9a08 100644
--- a/src/mainboard/tyan/s2895/get_bus_conf.c
+++ b/src/mainboard/tyan/s2895/get_bus_conf.c
@@ -66,7 +66,7 @@ void get_bus_conf(void)
 	unsigned apicid_base;
 	unsigned sbdn;
 
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if (get_bus_conf_done == 1)
diff --git a/src/mainboard/tyan/s2895/mainboard.c b/src/mainboard/tyan/s2895/mainboard.c
index 604df51..85f5556 100644
--- a/src/mainboard/tyan/s2895/mainboard.c
+++ b/src/mainboard/tyan/s2895/mainboard.c
@@ -12,7 +12,7 @@ static void mainboard_acpi_fill_ssdt_generator(void) {
 	amd_generate_powernow(0, 0, 0);
 }
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->acpi_fill_ssdt_generator = mainboard_acpi_fill_ssdt_generator;
 }
diff --git a/src/mainboard/tyan/s2895/mptable.c b/src/mainboard/tyan/s2895/mptable.c
index 20fa92c..3c4242f 100644
--- a/src/mainboard/tyan/s2895/mptable.c
+++ b/src/mainboard/tyan/s2895/mptable.c
@@ -47,7 +47,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/tyan/s2912/get_bus_conf.c b/src/mainboard/tyan/s2912/get_bus_conf.c
index 7727c4b..fb38d32 100644
--- a/src/mainboard/tyan/s2912/get_bus_conf.c
+++ b/src/mainboard/tyan/s2912/get_bus_conf.c
@@ -70,7 +70,7 @@ void get_bus_conf(void)
 	unsigned apicid_base;
 	struct mb_sysconf_t *m;
 
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if(get_bus_conf_done==1) return; //do it only once
diff --git a/src/mainboard/tyan/s2912/mptable.c b/src/mainboard/tyan/s2912/mptable.c
index 133ce43..8620cd4 100644
--- a/src/mainboard/tyan/s2912/mptable.c
+++ b/src/mainboard/tyan/s2912/mptable.c
@@ -48,7 +48,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/tyan/s2912_fam10/get_bus_conf.c b/src/mainboard/tyan/s2912_fam10/get_bus_conf.c
index 0a3a9d8..6a9e2e9 100644
--- a/src/mainboard/tyan/s2912_fam10/get_bus_conf.c
+++ b/src/mainboard/tyan/s2912_fam10/get_bus_conf.c
@@ -71,7 +71,7 @@ void get_bus_conf(void)
 	unsigned apicid_base;
 	struct mb_sysconf_t *m;
 
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if(get_bus_conf_done==1) return; //do it only once
diff --git a/src/mainboard/tyan/s2912_fam10/mptable.c b/src/mainboard/tyan/s2912_fam10/mptable.c
index e15387d..0b7ce31 100644
--- a/src/mainboard/tyan/s2912_fam10/mptable.c
+++ b/src/mainboard/tyan/s2912_fam10/mptable.c
@@ -48,7 +48,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/tyan/s4880/mptable.c b/src/mainboard/tyan/s4880/mptable.c
index dcc0fd8..3ec04bb 100644
--- a/src/mainboard/tyan/s4880/mptable.c
+++ b/src/mainboard/tyan/s4880/mptable.c
@@ -10,7 +10,7 @@
 
 static unsigned node_link_to_bus(unsigned node, unsigned link)
 {
-        device_t dev;
+        struct device * dev;
         unsigned reg;
 
         dev = dev_find_slot(0, PCI_DEVFN(0x18, 1));
@@ -62,7 +62,7 @@ static void *smp_write_config_table(void *v)
         smp_write_processors(mc);
 
         {
-                device_t dev;
+                struct device * dev;
 
                 /* HT chain 0 */
                 bus_chain_0 = node_link_to_bus(0, 2);
@@ -120,7 +120,7 @@ static void *smp_write_config_table(void *v)
 
 	smp_write_ioapic(mc, apicid_8111, 0x11, IO_APIC_ADDR);
         {
-                device_t dev;
+                struct device * dev;
                 struct resource *res;
                 dev = dev_find_slot(bus_chain_0, PCI_DEVFN(0x1,1));
                 if (dev) {
diff --git a/src/mainboard/tyan/s4882/mptable.c b/src/mainboard/tyan/s4882/mptable.c
index 350b55c..3d22fd9 100644
--- a/src/mainboard/tyan/s4882/mptable.c
+++ b/src/mainboard/tyan/s4882/mptable.c
@@ -10,7 +10,7 @@
 
 static unsigned node_link_to_bus(unsigned node, unsigned link)
 {
-        device_t dev;
+        struct device * dev;
         unsigned reg;
 
         dev = dev_find_slot(0, PCI_DEVFN(0x18, 1));
@@ -62,7 +62,7 @@ static void *smp_write_config_table(void *v)
         smp_write_processors(mc);
 
         {
-                device_t dev;
+                struct device * dev;
 
                 /* HT chain 0 */
                 bus_chain_0 = node_link_to_bus(0, 1);
@@ -119,7 +119,7 @@ static void *smp_write_config_table(void *v)
         apicid_8131_2 = apicid_base+2;
 	smp_write_ioapic(mc, apicid_8111, 0x11, IO_APIC_ADDR);
         {
-                device_t dev;
+                struct device * dev;
                 struct resource *res;
                 dev = dev_find_slot(bus_chain_0, PCI_DEVFN(0x1,1));
                 if (dev) {
diff --git a/src/mainboard/tyan/s8226/mainboard.c b/src/mainboard/tyan/s8226/mainboard.c
index 9e8160a..6f094cb 100644
--- a/src/mainboard/tyan/s8226/mainboard.c
+++ b/src/mainboard/tyan/s8226/mainboard.c
@@ -67,7 +67,7 @@ void set_pcie_dereset(void *nbconfig)
 /*************************************************
  * enable the dedicated function in s8226 board.
  *************************************************/
-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/tyan/s8226/mptable.c b/src/mainboard/tyan/s8226/mptable.c
index 5ec4a35..230cacc 100644
--- a/src/mainboard/tyan/s8226/mptable.c
+++ b/src/mainboard/tyan/s8226/mptable.c
@@ -34,7 +34,7 @@ static void *smp_write_config_table(void *v)
 	int bus_isa;
 	u32 apicid_sp5100;
 	u32 apicid_sr5650;
-	device_t dev;
+	struct device * dev;
 	u32 dword;
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
diff --git a/src/mainboard/via/epia-m850/mainboard.c b/src/mainboard/via/epia-m850/mainboard.c
index dbe682c..146c21b 100644
--- a/src/mainboard/via/epia-m850/mainboard.c
+++ b/src/mainboard/via/epia-m850/mainboard.c
@@ -95,7 +95,7 @@ static int vx900_int15_handler(void)
 }
 #endif
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	(void)dev;
 
diff --git a/src/mainboard/winent/mb6047/get_bus_conf.c b/src/mainboard/winent/mb6047/get_bus_conf.c
index 5b96b05..1c7e1da 100644
--- a/src/mainboard/winent/mb6047/get_bus_conf.c
+++ b/src/mainboard/winent/mb6047/get_bus_conf.c
@@ -35,7 +35,7 @@ void get_bus_conf(void)
 	unsigned apicid_base;
 	unsigned sbdn;
 
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if (get_bus_conf_done == 1)
diff --git a/src/mainboard/winent/mb6047/mainboard.c b/src/mainboard/winent/mb6047/mainboard.c
index 9a8dd90..5f261c6 100644
--- a/src/mainboard/winent/mb6047/mainboard.c
+++ b/src/mainboard/winent/mb6047/mainboard.c
@@ -10,7 +10,7 @@ static void mainboard_acpi_fill_ssdt_generator(void) {
 	amd_generate_powernow(0, 0, 0);
 }
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device * dev)
 {
 	dev->ops->acpi_fill_ssdt_generator = mainboard_acpi_fill_ssdt_generator;
 }
diff --git a/src/mainboard/winent/mb6047/mptable.c b/src/mainboard/winent/mb6047/mptable.c
index 26e79ca..afbb8b9 100644
--- a/src/mainboard/winent/mb6047/mptable.c
+++ b/src/mainboard/winent/mb6047/mptable.c
@@ -33,7 +33,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;
 



More information about the coreboot-gerrit mailing list