From 56f172d9c07743379b36a0d6ce22951549bc2546 Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Fri, 4 May 2018 20:41:40 +0200 Subject: mb/hp: Get rid of device_t Use of device_t has been abandoned in ramstage. Change-Id: Ib9c0d0a85a9e38cdb1bdbcfa055e597f19cf3d5c Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/26087 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Rudolph --- src/mainboard/hp/2570p/mainboard.c | 2 +- src/mainboard/hp/2760p/mainboard.c | 2 +- src/mainboard/hp/8460p/mainboard.c | 2 +- src/mainboard/hp/8470p/mainboard.c | 2 +- src/mainboard/hp/abm/mainboard.c | 2 +- src/mainboard/hp/abm/mptable.c | 2 +- src/mainboard/hp/dl145_g1/acpi_tables.c | 2 +- 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/folio_9470m/mainboard.c | 2 +- src/mainboard/hp/pavilion_m6_1035dx/mainboard.c | 2 +- src/mainboard/hp/pavilion_m6_1035dx/mptable.c | 2 +- src/mainboard/hp/revolve_810_g1/mainboard.c | 2 +- 17 files changed, 23 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/mainboard/hp/2570p/mainboard.c b/src/mainboard/hp/2570p/mainboard.c index b5fdecc2b1..effba5ea6e 100644 --- a/src/mainboard/hp/2570p/mainboard.c +++ b/src/mainboard/hp/2570p/mainboard.c @@ -16,7 +16,7 @@ #include #include -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, diff --git a/src/mainboard/hp/2760p/mainboard.c b/src/mainboard/hp/2760p/mainboard.c index b5fdecc2b1..effba5ea6e 100644 --- a/src/mainboard/hp/2760p/mainboard.c +++ b/src/mainboard/hp/2760p/mainboard.c @@ -16,7 +16,7 @@ #include #include -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, diff --git a/src/mainboard/hp/8460p/mainboard.c b/src/mainboard/hp/8460p/mainboard.c index b5fdecc2b1..effba5ea6e 100644 --- a/src/mainboard/hp/8460p/mainboard.c +++ b/src/mainboard/hp/8460p/mainboard.c @@ -16,7 +16,7 @@ #include #include -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, diff --git a/src/mainboard/hp/8470p/mainboard.c b/src/mainboard/hp/8470p/mainboard.c index b5fdecc2b1..effba5ea6e 100644 --- a/src/mainboard/hp/8470p/mainboard.c +++ b/src/mainboard/hp/8470p/mainboard.c @@ -16,7 +16,7 @@ #include #include -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, diff --git a/src/mainboard/hp/abm/mainboard.c b/src/mainboard/hp/abm/mainboard.c index 09fbf37c80..aaa899b55d 100644 --- a/src/mainboard/hp/abm/mainboard.c +++ b/src/mainboard/hp/abm/mainboard.c @@ -92,7 +92,7 @@ static void pirq_setup(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/hp/abm/mptable.c b/src/mainboard/hp/abm/mptable.c index 6869519490..cf987cacd7 100644 --- a/src/mainboard/hp/abm/mptable.c +++ b/src/mainboard/hp/abm/mptable.c @@ -178,7 +178,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/hp/dl145_g1/acpi_tables.c b/src/mainboard/hp/dl145_g1/acpi_tables.c index ca6cea0ff4..a464678036 100644 --- a/src/mainboard/hp/dl145_g1/acpi_tables.c +++ b/src/mainboard/hp/dl145_g1/acpi_tables.c @@ -40,7 +40,7 @@ unsigned long acpi_fill_madt(unsigned long current) /* Write all 8131 IOAPICs */ { - device_t dev; + struct device *dev; struct resource *res; dev = dev_find_slot(m->bus_8131_0, PCI_DEVFN((sysconf.hcdn[0]&0xff), 1)); if (dev) { diff --git a/src/mainboard/hp/dl145_g1/get_bus_conf.c b/src/mainboard/hp/dl145_g1/get_bus_conf.c index 7a9e3b54cd..ef768245ad 100644 --- a/src/mainboard/hp/dl145_g1/get_bus_conf.c +++ b/src/mainboard/hp/dl145_g1/get_bus_conf.c @@ -49,7 +49,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/hp/dl145_g1/mptable.c b/src/mainboard/hp/dl145_g1/mptable.c index 1a9132e46c..80ad79d7a0 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, VIO_APIC_VADDR); { - 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 15a74669d3..fc9c104a6c 100644 --- a/src/mainboard/hp/dl145_g3/get_bus_conf.c +++ b/src/mainboard/hp/dl145_g3/get_bus_conf.c @@ -64,7 +64,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 4e33f9b3d8..a6cdfb83d0 100644 --- a/src/mainboard/hp/dl145_g3/mptable.c +++ b/src/mainboard/hp/dl145_g3/mptable.c @@ -54,7 +54,7 @@ static void *smp_write_config_table(void *v) /*I/O APICs: APIC ID Version State Address*/ { - device_t dev = 0; + struct device *dev = NULL; 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; @@ -148,7 +148,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 84c7c9ba06..b29fb2c51e 100644 --- a/src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c +++ b/src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c @@ -65,7 +65,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 6a27d9746b..b65f12ca8c 100644 --- a/src/mainboard/hp/dl165_g6_fam10/mptable.c +++ b/src/mainboard/hp/dl165_g6_fam10/mptable.c @@ -55,7 +55,7 @@ static void *smp_write_config_table(void *v) /*I/O APICs: APIC ID Version State Address*/ { - device_t dev = 0; + struct device *dev = NULL; int i; struct resource *res; for (i = 0; i < 3; i++) { @@ -84,7 +84,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; @@ -100,7 +100,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; @@ -127,7 +127,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/folio_9470m/mainboard.c b/src/mainboard/hp/folio_9470m/mainboard.c index 437a7ca691..058701e33a 100644 --- a/src/mainboard/hp/folio_9470m/mainboard.c +++ b/src/mainboard/hp/folio_9470m/mainboard.c @@ -16,7 +16,7 @@ #include #include -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, diff --git a/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c b/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c index de84dbed46..d7f0771463 100644 --- a/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c +++ b/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c @@ -30,7 +30,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 39af326b5f..a78c82e1fb 100644 --- a/src/mainboard/hp/pavilion_m6_1035dx/mptable.c +++ b/src/mainboard/hp/pavilion_m6_1035dx/mptable.c @@ -145,7 +145,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/hp/revolve_810_g1/mainboard.c b/src/mainboard/hp/revolve_810_g1/mainboard.c index e9228c1e6b..48ffce5211 100644 --- a/src/mainboard/hp/revolve_810_g1/mainboard.c +++ b/src/mainboard/hp/revolve_810_g1/mainboard.c @@ -16,7 +16,7 @@ #include #include -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, -- cgit v1.2.3