From 457d3ef2dcb64a9b944c3c7cd5a72fbf0ac509de Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Fri, 4 May 2018 21:56:55 +0200 Subject: mb/sunw: Get rid of device_t Use of device_t has been abandoned in ramstage. Change-Id: I348a7ad368cf5b5a7837c45038a1659a581c518f Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/26096 Tested-by: build bot (Jenkins) Reviewed-by: Werner Zeh Reviewed-by: Jonathan A. Kollasch --- src/mainboard/sunw/ultra40/get_bus_conf.c | 2 +- src/mainboard/sunw/ultra40/mptable.c | 2 +- src/mainboard/sunw/ultra40m2/get_bus_conf.c | 2 +- src/mainboard/sunw/ultra40m2/mainboard.c | 4 ++-- src/mainboard/sunw/ultra40m2/mptable.c | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/mainboard/sunw/ultra40/get_bus_conf.c b/src/mainboard/sunw/ultra40/get_bus_conf.c index 4ed57467b4..e7096f31bf 100644 --- a/src/mainboard/sunw/ultra40/get_bus_conf.c +++ b/src/mainboard/sunw/ultra40/get_bus_conf.c @@ -65,7 +65,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 5e9c90be9a..b66b91d012 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/sunw/ultra40m2/get_bus_conf.c b/src/mainboard/sunw/ultra40m2/get_bus_conf.c index b57f957c60..2a10eeb7a8 100644 --- a/src/mainboard/sunw/ultra40m2/get_bus_conf.c +++ b/src/mainboard/sunw/ultra40m2/get_bus_conf.c @@ -67,7 +67,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/sunw/ultra40m2/mainboard.c b/src/mainboard/sunw/ultra40m2/mainboard.c index 072e8a1b79..750ae6c6ba 100644 --- a/src/mainboard/sunw/ultra40m2/mainboard.c +++ b/src/mainboard/sunw/ultra40m2/mainboard.c @@ -159,7 +159,7 @@ fail: printk(BIOS_WARNING, "failed to initialize EMC6D103\n"); } -static void mainboard_init(device_t dev) +static void mainboard_init(struct device *dev) { emc6d103_init(); dme1737_runtime_init(); @@ -168,7 +168,7 @@ static void mainboard_init(device_t dev) printk(BIOS_DEBUG, "%s done\n", __func__); } -static void mainboard_enable(device_t dev) +static void mainboard_enable(struct device *dev) { dev->ops->init = mainboard_init; } diff --git a/src/mainboard/sunw/ultra40m2/mptable.c b/src/mainboard/sunw/ultra40m2/mptable.c index 0493d38877..56266a5c2b 100644 --- a/src/mainboard/sunw/ultra40m2/mptable.c +++ b/src/mainboard/sunw/ultra40m2/mptable.c @@ -45,7 +45,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; @@ -115,7 +115,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; @@ -126,7 +126,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++) @@ -146,7 +146,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; -- cgit v1.2.3