[coreboot-gerrit] Change in coreboot[master]: mb/amd: Get rid of device_t
Patrick Georgi (Code Review)
gerrit at coreboot.org
Wed May 9 15:12:50 CEST 2018
Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/26072 )
Change subject: mb/amd: Get rid of device_t
......................................................................
mb/amd: Get rid of device_t
Use of device_t has been abandoned in ramstage.
Change-Id: I01270248bddf07df4c959f0c632e722728d0cd03
Signed-off-by: Elyes HAOUAS <ehaouas at noos.fr>
Reviewed-on: https://review.coreboot.org/26072
Tested-by: build bot (Jenkins) <no-reply at coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi at google.com>
---
M src/mainboard/amd/bettong/mainboard.c
M src/mainboard/amd/bettong/mptable.c
M src/mainboard/amd/bimini_fam10/get_bus_conf.c
M src/mainboard/amd/bimini_fam10/mainboard.c
M src/mainboard/amd/db-ft3b-lc/mainboard.c
M src/mainboard/amd/dbm690t/get_bus_conf.c
M src/mainboard/amd/dbm690t/mainboard.c
M src/mainboard/amd/dbm690t/mptable.c
M src/mainboard/amd/gardenia/mainboard.c
M src/mainboard/amd/gardenia/mptable.c
M src/mainboard/amd/inagua/mainboard.c
M src/mainboard/amd/inagua/mptable.c
M src/mainboard/amd/lamar/mainboard.c
M src/mainboard/amd/mahogany/get_bus_conf.c
M src/mainboard/amd/mahogany/mainboard.c
M src/mainboard/amd/mahogany/mptable.c
M src/mainboard/amd/mahogany_fam10/get_bus_conf.c
M src/mainboard/amd/mahogany_fam10/mainboard.c
M src/mainboard/amd/mahogany_fam10/mptable.c
M src/mainboard/amd/olivehill/mainboard.c
M src/mainboard/amd/olivehill/mptable.c
M src/mainboard/amd/olivehillplus/mainboard.c
M src/mainboard/amd/olivehillplus/mptable.c
M src/mainboard/amd/parmer/mainboard.c
M src/mainboard/amd/parmer/mptable.c
M src/mainboard/amd/persimmon/mainboard.c
M src/mainboard/amd/persimmon/mptable.c
M src/mainboard/amd/pistachio/get_bus_conf.c
M src/mainboard/amd/pistachio/mainboard.c
M src/mainboard/amd/pistachio/mptable.c
M src/mainboard/amd/serengeti_cheetah/acpi_tables.c
M src/mainboard/amd/serengeti_cheetah/get_bus_conf.c
M src/mainboard/amd/serengeti_cheetah/irq_tables.c
M src/mainboard/amd/serengeti_cheetah/mainboard.c
M src/mainboard/amd/serengeti_cheetah/mainboard.h
M src/mainboard/amd/serengeti_cheetah/mptable.c
M src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c
M src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c
M src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c
M src/mainboard/amd/serengeti_cheetah_fam10/mainboard.h
M src/mainboard/amd/serengeti_cheetah_fam10/mptable.c
M src/mainboard/amd/south_station/mainboard.c
M src/mainboard/amd/south_station/mptable.c
M src/mainboard/amd/thatcher/mainboard.c
M src/mainboard/amd/thatcher/mptable.c
M src/mainboard/amd/tilapia_fam10/get_bus_conf.c
M src/mainboard/amd/tilapia_fam10/mainboard.c
M src/mainboard/amd/tilapia_fam10/mptable.c
M src/mainboard/amd/torpedo/mainboard.c
M src/mainboard/amd/torpedo/mptable.c
M src/mainboard/amd/union_station/mainboard.c
M src/mainboard/amd/union_station/mptable.c
52 files changed, 70 insertions(+), 70 deletions(-)
Approvals:
build bot (Jenkins): Verified
Patrick Georgi: Looks good to me, approved
diff --git a/src/mainboard/amd/bettong/mainboard.c b/src/mainboard/amd/bettong/mainboard.c
index 11d6084..16fc47e 100644
--- a/src/mainboard/amd/bettong/mainboard.c
+++ b/src/mainboard/amd/bettong/mainboard.c
@@ -80,7 +80,7 @@
/*************************************************
* enable the dedicated function in bettong board.
*************************************************/
-static void bettong_enable(device_t dev)
+static void bettong_enable(struct device *dev)
{
printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
diff --git a/src/mainboard/amd/bettong/mptable.c b/src/mainboard/amd/bettong/mptable.c
index 6f79a54..c50c254 100644
--- a/src/mainboard/amd/bettong/mptable.c
+++ b/src/mainboard/amd/bettong/mptable.c
@@ -110,7 +110,7 @@
/* 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/bimini_fam10/get_bus_conf.c b/src/mainboard/amd/bimini_fam10/get_bus_conf.c
index 8545bb3..c5cfa8c 100644
--- a/src/mainboard/amd/bimini_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/bimini_fam10/get_bus_conf.c
@@ -58,7 +58,7 @@
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 d10f0db..aedd5af 100644
--- a/src/mainboard/amd/bimini_fam10/mainboard.c
+++ b/src/mainboard/amd/bimini_fam10/mainboard.c
@@ -81,7 +81,7 @@
* 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/db-ft3b-lc/mainboard.c b/src/mainboard/amd/db-ft3b-lc/mainboard.c
index c232f1f..991b243 100644
--- a/src/mainboard/amd/db-ft3b-lc/mainboard.c
+++ b/src/mainboard/amd/db-ft3b-lc/mainboard.c
@@ -114,7 +114,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/dbm690t/get_bus_conf.c b/src/mainboard/amd/dbm690t/get_bus_conf.c
index dc6833a..b1b7270 100644
--- a/src/mainboard/amd/dbm690t/get_bus_conf.c
+++ b/src/mainboard/amd/dbm690t/get_bus_conf.c
@@ -57,7 +57,7 @@
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 22170c0..e3dfbc5 100644
--- a/src/mainboard/amd/dbm690t/mainboard.c
+++ b/src/mainboard/amd/dbm690t/mainboard.c
@@ -115,7 +115,7 @@
{
u8 byte;
u16 word;
- device_t sm_dev;
+ struct device *sm_dev;
/* set ADT 7461 */
ADT7461_write_byte(0x0B, 0x50); /* Local Temperature Hight limit */
@@ -176,7 +176,7 @@
* 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 76ee056..af67c54 100644
--- a/src/mainboard/amd/dbm690t/mptable.c
+++ b/src/mainboard/amd/dbm690t/mptable.c
@@ -46,7 +46,7 @@
/* I/O APICs: APIC ID Version State Address */
{
- device_t dev;
+ struct device *dev;
u32 dword;
u8 byte;
diff --git a/src/mainboard/amd/gardenia/mainboard.c b/src/mainboard/amd/gardenia/mainboard.c
index 9853803..86dfed4 100644
--- a/src/mainboard/amd/gardenia/mainboard.c
+++ b/src/mainboard/amd/gardenia/mainboard.c
@@ -89,7 +89,7 @@
/*************************************************
* enable the dedicated function in gardenia board.
*************************************************/
-static void gardenia_enable(device_t dev)
+static void gardenia_enable(struct device *dev)
{
printk(BIOS_INFO, "Mainboard "
CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
diff --git a/src/mainboard/amd/gardenia/mptable.c b/src/mainboard/amd/gardenia/mptable.c
index e29b3e3..860bb5a 100644
--- a/src/mainboard/amd/gardenia/mptable.c
+++ b/src/mainboard/amd/gardenia/mptable.c
@@ -115,7 +115,7 @@
/* 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/inagua/mainboard.c b/src/mainboard/amd/inagua/mainboard.c
index 6dccd65..afe6c87 100644
--- a/src/mainboard/amd/inagua/mainboard.c
+++ b/src/mainboard/amd/inagua/mainboard.c
@@ -51,7 +51,7 @@
/**********************************************
* 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 50471ab..a1285a2 100644
--- a/src/mainboard/amd/inagua/mptable.c
+++ b/src/mainboard/amd/inagua/mptable.c
@@ -103,7 +103,7 @@
/* 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/lamar/mainboard.c b/src/mainboard/amd/lamar/mainboard.c
index 050dd14..94e680b 100644
--- a/src/mainboard/amd/lamar/mainboard.c
+++ b/src/mainboard/amd/lamar/mainboard.c
@@ -141,7 +141,7 @@
/*************************************************
* enable the dedicated function in lamar 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/mahogany/get_bus_conf.c b/src/mainboard/amd/mahogany/get_bus_conf.c
index f12c014..64b3ed7 100644
--- a/src/mainboard/amd/mahogany/get_bus_conf.c
+++ b/src/mainboard/amd/mahogany/get_bus_conf.c
@@ -57,7 +57,7 @@
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 09a38bd..91b2533 100644
--- a/src/mainboard/amd/mahogany/mainboard.c
+++ b/src/mainboard/amd/mahogany/mainboard.c
@@ -33,7 +33,7 @@
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));
@@ -46,7 +46,7 @@
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));
@@ -64,7 +64,7 @@
* 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 708ddbd..a5d6678 100644
--- a/src/mainboard/amd/mahogany/mptable.c
+++ b/src/mainboard/amd/mahogany/mptable.c
@@ -47,7 +47,7 @@
/* 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 8931d95..18cf0a8 100644
--- a/src/mainboard/amd/mahogany_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/mahogany_fam10/get_bus_conf.c
@@ -57,7 +57,7 @@
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 8c244d4..a327284 100644
--- a/src/mainboard/amd/mahogany_fam10/mainboard.c
+++ b/src/mainboard/amd/mahogany_fam10/mainboard.c
@@ -33,7 +33,7 @@
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));
@@ -46,7 +46,7 @@
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));
@@ -66,7 +66,7 @@
{
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));
@@ -94,7 +94,7 @@
* 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 3f9d7c7..379f04a 100644
--- a/src/mainboard/amd/mahogany_fam10/mptable.c
+++ b/src/mainboard/amd/mahogany_fam10/mptable.c
@@ -46,7 +46,7 @@
/* 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 a149ee5..65e838b 100644
--- a/src/mainboard/amd/olivehill/mainboard.c
+++ b/src/mainboard/amd/olivehill/mainboard.c
@@ -19,7 +19,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 fb8a7ce..89881f7 100644
--- a/src/mainboard/amd/olivehill/mptable.c
+++ b/src/mainboard/amd/olivehill/mptable.c
@@ -177,7 +177,7 @@
/* 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 89baaf0..1e8d723 100644
--- a/src/mainboard/amd/olivehillplus/mainboard.c
+++ b/src/mainboard/amd/olivehillplus/mainboard.c
@@ -25,7 +25,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 8b0ae30..32240a6 100644
--- a/src/mainboard/amd/olivehillplus/mptable.c
+++ b/src/mainboard/amd/olivehillplus/mptable.c
@@ -138,7 +138,7 @@
/* 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 59f7a81..0051d74 100644
--- a/src/mainboard/amd/parmer/mainboard.c
+++ b/src/mainboard/amd/parmer/mainboard.c
@@ -19,7 +19,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 60b1772..bbbeb62 100644
--- a/src/mainboard/amd/parmer/mptable.c
+++ b/src/mainboard/amd/parmer/mptable.c
@@ -138,7 +138,7 @@
/* 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 916d11d..c21e0ea 100644
--- a/src/mainboard/amd/persimmon/mainboard.c
+++ b/src/mainboard/amd/persimmon/mainboard.c
@@ -121,7 +121,7 @@
/**********************************************
* 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 4f533a4..ccf0958 100644
--- a/src/mainboard/amd/persimmon/mptable.c
+++ b/src/mainboard/amd/persimmon/mptable.c
@@ -108,7 +108,7 @@
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 dc6833a..b1b7270 100644
--- a/src/mainboard/amd/pistachio/get_bus_conf.c
+++ b/src/mainboard/amd/pistachio/get_bus_conf.c
@@ -57,7 +57,7 @@
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 6efd700..77fbcc1 100644
--- a/src/mainboard/amd/pistachio/mainboard.c
+++ b/src/mainboard/amd/pistachio/mainboard.c
@@ -72,7 +72,7 @@
u8 byte, byte2;
u16 word;
u32 dword;
- device_t sm_dev;
+ struct device *sm_dev;
/* set adt7475 */
ADT7475_write_byte(0x40, 0x04);
@@ -246,7 +246,7 @@
* 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 76ee056..af67c54 100644
--- a/src/mainboard/amd/pistachio/mptable.c
+++ b/src/mainboard/amd/pistachio/mptable.c
@@ -46,7 +46,7 @@
/* I/O APICs: APIC ID Version State Address */
{
- device_t dev;
+ struct device *dev;
u32 dword;
u8 byte;
diff --git a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
index d700e1d..97a612e 100644
--- a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
+++ b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
@@ -50,7 +50,7 @@
/* Write all 8131 IOAPICs */
{
- device_t dev;
+ struct device *dev;
struct resource *res;
dev = dev_find_slot(m->bus_8132_0, PCI_DEVFN((sysconf.hcdn[0]&0xff), 1));
if (dev) {
@@ -131,7 +131,7 @@
return current;
}
-unsigned long mainboard_write_acpi_tables(device_t dev, unsigned long start, acpi_rsdp_t *rsdp)
+unsigned long mainboard_write_acpi_tables(struct device *dev, unsigned long start, acpi_rsdp_t *rsdp)
{
unsigned long current;
acpi_header_t *ssdtx;
diff --git a/src/mainboard/amd/serengeti_cheetah/get_bus_conf.c b/src/mainboard/amd/serengeti_cheetah/get_bus_conf.c
index b7f55fd..dd0b43a 100644
--- a/src/mainboard/amd/serengeti_cheetah/get_bus_conf.c
+++ b/src/mainboard/amd/serengeti_cheetah/get_bus_conf.c
@@ -47,7 +47,7 @@
unsigned devn = sysconf.hcdn[i] & 0xff;
- device_t dev;
+ struct device *dev;
dev = dev_find_slot(busn, PCI_DEVFN(devn, 0));
@@ -75,7 +75,7 @@
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/irq_tables.c b/src/mainboard/amd/serengeti_cheetah/irq_tables.c
index 9e2e09b..331ce76 100644
--- a/src/mainboard/amd/serengeti_cheetah/irq_tables.c
+++ b/src/mainboard/amd/serengeti_cheetah/irq_tables.c
@@ -88,7 +88,7 @@
slot_num = 0;
{
- device_t dev;
+ struct device *dev;
dev =
dev_find_slot(m->bus_8111_0,
PCI_DEVFN(sysconf.sbdn + 1, 3));
diff --git a/src/mainboard/amd/serengeti_cheetah/mainboard.c b/src/mainboard/amd/serengeti_cheetah/mainboard.c
index 7f20b00..3c3234c 100644
--- a/src/mainboard/amd/serengeti_cheetah/mainboard.c
+++ b/src/mainboard/amd/serengeti_cheetah/mainboard.c
@@ -18,7 +18,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/mainboard.h b/src/mainboard/amd/serengeti_cheetah/mainboard.h
index 3fa3d16..2613374 100644
--- a/src/mainboard/amd/serengeti_cheetah/mainboard.h
+++ b/src/mainboard/amd/serengeti_cheetah/mainboard.h
@@ -11,4 +11,4 @@
* GNU General Public License for more details.
*/
-unsigned long mainboard_write_acpi_tables(device_t device, unsigned long start, acpi_rsdp_t *rsdp);
+unsigned long mainboard_write_acpi_tables(struct device *device, unsigned long start, acpi_rsdp_t *rsdp);
diff --git a/src/mainboard/amd/serengeti_cheetah/mptable.c b/src/mainboard/amd/serengeti_cheetah/mptable.c
index 9b05fc0..020e951 100644
--- a/src/mainboard/amd/serengeti_cheetah/mptable.c
+++ b/src/mainboard/amd/serengeti_cheetah/mptable.c
@@ -44,7 +44,7 @@
/* I/O APICs: APIC ID Version State Address*/
smp_write_ioapic(mc, m->apicid_8111, 0x11, VIO_APIC_VADDR); /* 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) {
@@ -125,7 +125,7 @@
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/acpi_tables.c b/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c
index 6911c36..e355aae 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c
@@ -42,7 +42,7 @@
/* Write all 8131 IOAPICs */
{
- device_t dev;
+ struct device *dev;
struct resource *res;
dev = dev_find_slot(m->bus_8132_0, PCI_DEVFN((sysconf.hcdn[0]&0xff), 1));
if (dev) {
@@ -119,7 +119,7 @@
return current;
}
-unsigned long mainboard_write_acpi_tables(device_t device,
+unsigned long mainboard_write_acpi_tables(struct device *device,
unsigned long current,
acpi_rsdp_t *rsdp)
{
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 fda2626..97a06ab 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c
@@ -67,7 +67,7 @@
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));
@@ -91,7 +91,7 @@
{
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/mainboard.c b/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c
index 7f20b00..3c3234c 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c
@@ -18,7 +18,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_fam10/mainboard.h b/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.h
index 3fa3d16..2613374 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.h
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.h
@@ -11,4 +11,4 @@
* GNU General Public License for more details.
*/
-unsigned long mainboard_write_acpi_tables(device_t device, unsigned long start, acpi_rsdp_t *rsdp);
+unsigned long mainboard_write_acpi_tables(struct device *device, unsigned long start, acpi_rsdp_t *rsdp);
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c b/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c
index 048e800..0927199 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c
@@ -46,7 +46,7 @@
/* I/O APICs: APIC ID Version State Address*/
smp_write_ioapic(mc, m->apicid_8111, 0x11, VIO_APIC_VADDR); /* 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 @@
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 b754312..d069838 100644
--- a/src/mainboard/amd/south_station/mainboard.c
+++ b/src/mainboard/amd/south_station/mainboard.c
@@ -49,7 +49,7 @@
/**********************************************
* 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 781230f..152b959 100644
--- a/src/mainboard/amd/south_station/mptable.c
+++ b/src/mainboard/amd/south_station/mptable.c
@@ -100,7 +100,7 @@
/* 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 27b9d99..ca62c2c 100644
--- a/src/mainboard/amd/thatcher/mainboard.c
+++ b/src/mainboard/amd/thatcher/mainboard.c
@@ -20,7 +20,7 @@
/*************************************************
* enable the dedicated function in thatcher board.
*************************************************/
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
msr_t msr;
diff --git a/src/mainboard/amd/thatcher/mptable.c b/src/mainboard/amd/thatcher/mptable.c
index 2c32244..355cff6 100644
--- a/src/mainboard/amd/thatcher/mptable.c
+++ b/src/mainboard/amd/thatcher/mptable.c
@@ -138,7 +138,7 @@
/* 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 8931d95..18cf0a8 100644
--- a/src/mainboard/amd/tilapia_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/tilapia_fam10/get_bus_conf.c
@@ -57,7 +57,7 @@
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 f3d67e4..28522a7 100644
--- a/src/mainboard/amd/tilapia_fam10/mainboard.c
+++ b/src/mainboard/amd/tilapia_fam10/mainboard.c
@@ -41,7 +41,7 @@
{
u8 byte;
u16 word;
- device_t sm_dev;
+ struct device *sm_dev;
/* set 0 to bit1 :disable GPM9 as SLP_S2 output */
/* set 0 to bit2 :disable GPM8 as AZ_RST output */
byte = pm_ioread(0x8d);
@@ -66,7 +66,7 @@
{
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 */
@@ -94,7 +94,7 @@
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));
@@ -124,7 +124,7 @@
{
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);
@@ -179,7 +179,7 @@
{
u8 byte;
u16 word;
- device_t sm_dev;
+ struct device *sm_dev;
/* set ADT 7461 */
ADT7461_write_byte(0x0B, 0x50); /* Local Temperature Hight limit */
@@ -229,7 +229,7 @@
* 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 3f9d7c7..379f04a 100644
--- a/src/mainboard/amd/tilapia_fam10/mptable.c
+++ b/src/mainboard/amd/tilapia_fam10/mptable.c
@@ -46,7 +46,7 @@
/* 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 f567db7..becfb25 100644
--- a/src/mainboard/amd/torpedo/mainboard.c
+++ b/src/mainboard/amd/torpedo/mainboard.c
@@ -23,7 +23,7 @@
/*************************************************
* 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 3f0e5b0..f06fb75 100644
--- a/src/mainboard/amd/torpedo/mptable.c
+++ b/src/mainboard/amd/torpedo/mptable.c
@@ -181,7 +181,7 @@
/* 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 6e206e7..8c71fd6 100644
--- a/src/mainboard/amd/union_station/mainboard.c
+++ b/src/mainboard/amd/union_station/mainboard.c
@@ -22,7 +22,7 @@
/**********************************************
* 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 781230f..152b959 100644
--- a/src/mainboard/amd/union_station/mptable.c
+++ b/src/mainboard/amd/union_station/mptable.c
@@ -100,7 +100,7 @@
/* 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. */
--
To view, visit https://review.coreboot.org/26072
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I01270248bddf07df4c959f0c632e722728d0cd03
Gerrit-Change-Number: 26072
Gerrit-PatchSet: 2
Gerrit-Owner: Elyes HAOUAS <ehaouas at noos.fr>
Gerrit-Reviewer: Patrick Georgi <pgeorgi at google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply at coreboot.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180509/a5361d51/attachment.html>
More information about the coreboot-gerrit
mailing list