diff options
author | Elyes HAOUAS <ehaouas@noos.fr> | 2018-05-04 20:19:02 +0200 |
---|---|---|
committer | Martin Roth <martinroth@google.com> | 2018-05-08 03:03:11 +0000 |
commit | 9981177cb8e06d5a00d22e1185a05aa38d217e33 (patch) | |
tree | 4e21a486ff2b4db0f6a841ccdc491022862509af | |
parent | 715a502c1784e7616fe2ff87232dfea3a0b1c076 (diff) |
mb/gigabyte: Get rid of device_t
Use of device_t has been abandoned in ramstage.
Change-Id: I37ba054022241c93c03e6c804e46f4e8a1c1143e
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/26084
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
-rw-r--r-- | src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c | 4 | ||||
-rw-r--r-- | src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c | 4 | ||||
-rw-r--r-- | src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c | 2 | ||||
-rw-r--r-- | src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c | 2 | ||||
-rw-r--r-- | src/mainboard/gigabyte/ga_2761gxdk/mptable.c | 2 | ||||
-rw-r--r-- | src/mainboard/gigabyte/m57sli/acpi_tables.c | 2 | ||||
-rw-r--r-- | src/mainboard/gigabyte/m57sli/get_bus_conf.c | 2 | ||||
-rw-r--r-- | src/mainboard/gigabyte/m57sli/mptable.c | 2 | ||||
-rw-r--r-- | src/mainboard/gigabyte/ma785gm/get_bus_conf.c | 2 | ||||
-rw-r--r-- | src/mainboard/gigabyte/ma785gm/mainboard.c | 8 | ||||
-rw-r--r-- | src/mainboard/gigabyte/ma785gm/mptable.c | 2 | ||||
-rw-r--r-- | src/mainboard/gigabyte/ma785gmt/get_bus_conf.c | 2 | ||||
-rw-r--r-- | src/mainboard/gigabyte/ma785gmt/mainboard.c | 12 | ||||
-rw-r--r-- | src/mainboard/gigabyte/ma785gmt/mptable.c | 2 | ||||
-rw-r--r-- | src/mainboard/gigabyte/ma78gm/get_bus_conf.c | 2 | ||||
-rw-r--r-- | src/mainboard/gigabyte/ma78gm/mainboard.c | 6 | ||||
-rw-r--r-- | src/mainboard/gigabyte/ma78gm/mptable.c | 2 |
17 files changed, 29 insertions, 29 deletions
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c b/src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c index 590e25f110..7bc353c035 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c +++ b/src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c @@ -33,7 +33,7 @@ #include <device/pci.h> #include <cbfs.h> -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/gigabyte/ga-b75m-d3v/mainboard.c b/src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c index 590e25f110..7bc353c035 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c +++ b/src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c @@ -33,7 +33,7 @@ #include <device/pci.h> #include <cbfs.h> -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/gigabyte/ga_2761gxdk/get_bus_conf.c b/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c index 53171c268d..75f6b9ffc0 100644 --- a/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c +++ b/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c @@ -63,7 +63,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/irq_tables.c b/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c index d1168a751e..d2bc1824be 100644 --- a/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c +++ b/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c @@ -109,7 +109,7 @@ unsigned long write_pirq_routing_table(unsigned long addr) printk(BIOS_INFO, "done.\n"); { - device_t dev; + struct device *dev; dev = dev_find_slot(0, PCI_DEVFN(2, 0)); if (dev) { /* initialize PCI interupts - these assignments depend diff --git a/src/mainboard/gigabyte/ga_2761gxdk/mptable.c b/src/mainboard/gigabyte/ga_2761gxdk/mptable.c index 991f24e800..ae59264cba 100644 --- a/src/mainboard/gigabyte/ga_2761gxdk/mptable.c +++ b/src/mainboard/gigabyte/ga_2761gxdk/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/gigabyte/m57sli/acpi_tables.c b/src/mainboard/gigabyte/m57sli/acpi_tables.c index 3188af398d..72b82f5f4d 100644 --- a/src/mainboard/gigabyte/m57sli/acpi_tables.c +++ b/src/mainboard/gigabyte/m57sli/acpi_tables.c @@ -38,7 +38,7 @@ unsigned long acpi_fill_madt(unsigned long current) unsigned sbdn; struct resource *res; - device_t dev; + struct device *dev; get_bus_conf(); sbdn = sysconf.sbdn; diff --git a/src/mainboard/gigabyte/m57sli/get_bus_conf.c b/src/mainboard/gigabyte/m57sli/get_bus_conf.c index 9d13b0c573..5ef79627b4 100644 --- a/src/mainboard/gigabyte/m57sli/get_bus_conf.c +++ b/src/mainboard/gigabyte/m57sli/get_bus_conf.c @@ -61,7 +61,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/mptable.c b/src/mainboard/gigabyte/m57sli/mptable.c index 019a7f5eab..e9ffe52b73 100644 --- a/src/mainboard/gigabyte/m57sli/mptable.c +++ b/src/mainboard/gigabyte/m57sli/mptable.c @@ -46,7 +46,7 @@ static void *smp_write_config_table(void *v) /*I/O APICs: APIC ID Version State Address*/ { - device_t dev; + struct device *dev; struct resource *res; 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 8931d95d7e..18cf0a841e 100644 --- a/src/mainboard/gigabyte/ma785gm/get_bus_conf.c +++ b/src/mainboard/gigabyte/ma785gm/get_bus_conf.c @@ -57,7 +57,7 @@ static u32 get_bus_conf_done = 0; void get_bus_conf(void) { u32 apicid_base; - device_t dev; + struct device *dev; int i; if (get_bus_conf_done == 1) diff --git a/src/mainboard/gigabyte/ma785gm/mainboard.c b/src/mainboard/gigabyte/ma785gm/mainboard.c index ac53c43086..a95686c797 100644 --- a/src/mainboard/gigabyte/ma785gm/mainboard.c +++ b/src/mainboard/gigabyte/ma785gm/mainboard.c @@ -31,7 +31,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); @@ -56,7 +56,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 */ @@ -94,7 +94,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); @@ -130,7 +130,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 3f9d7c7f94..379f04aef6 100644 --- a/src/mainboard/gigabyte/ma785gm/mptable.c +++ b/src/mainboard/gigabyte/ma785gm/mptable.c @@ -46,7 +46,7 @@ static void *smp_write_config_table(void *v) /* I/O APICs: APIC ID Version State Address */ { - device_t dev; + struct device *dev; u32 dword; u8 byte; diff --git a/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c b/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c index 8931d95d7e..18cf0a841e 100644 --- a/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c +++ b/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c @@ -57,7 +57,7 @@ static u32 get_bus_conf_done = 0; void get_bus_conf(void) { u32 apicid_base; - device_t dev; + struct device *dev; int i; if (get_bus_conf_done == 1) diff --git a/src/mainboard/gigabyte/ma785gmt/mainboard.c b/src/mainboard/gigabyte/ma785gmt/mainboard.c index 187c30eb8c..acc88fddda 100644 --- a/src/mainboard/gigabyte/ma785gmt/mainboard.c +++ b/src/mainboard/gigabyte/ma785gmt/mainboard.c @@ -41,7 +41,7 @@ void set_pcie_dereset() { u8 byte; u16 word; - device_t sm_dev; + struct device *sm_dev; /* set 0 to bit1 :disable GPM9 as SLP_S2 output */ /* set 0 to bit2 :disable GPM8 as AZ_RST output */ byte = pm_ioread(0x8d); @@ -66,7 +66,7 @@ void set_pcie_reset() { u8 byte; u16 word; - device_t sm_dev; + struct device *sm_dev; /* set 0 to bit1 :disable GPM9 as SLP_S2 output */ /* set 0 to bit2 :disable GPM8 as AZ_RST output */ @@ -94,7 +94,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)); @@ -124,7 +124,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); @@ -179,7 +179,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 */ @@ -240,7 +240,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 3f9d7c7f94..379f04aef6 100644 --- a/src/mainboard/gigabyte/ma785gmt/mptable.c +++ b/src/mainboard/gigabyte/ma785gmt/mptable.c @@ -46,7 +46,7 @@ static void *smp_write_config_table(void *v) /* I/O APICs: APIC ID Version State Address */ { - device_t dev; + struct device *dev; u32 dword; u8 byte; diff --git a/src/mainboard/gigabyte/ma78gm/get_bus_conf.c b/src/mainboard/gigabyte/ma78gm/get_bus_conf.c index 8931d95d7e..18cf0a841e 100644 --- a/src/mainboard/gigabyte/ma78gm/get_bus_conf.c +++ b/src/mainboard/gigabyte/ma78gm/get_bus_conf.c @@ -57,7 +57,7 @@ static u32 get_bus_conf_done = 0; void get_bus_conf(void) { u32 apicid_base; - device_t dev; + struct device *dev; int i; if (get_bus_conf_done == 1) diff --git a/src/mainboard/gigabyte/ma78gm/mainboard.c b/src/mainboard/gigabyte/ma78gm/mainboard.c index 505ba3ecca..cdfefbb6ee 100644 --- a/src/mainboard/gigabyte/ma78gm/mainboard.c +++ b/src/mainboard/gigabyte/ma78gm/mainboard.c @@ -34,7 +34,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)); @@ -47,7 +47,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)); @@ -67,7 +67,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 3f9d7c7f94..379f04aef6 100644 --- a/src/mainboard/gigabyte/ma78gm/mptable.c +++ b/src/mainboard/gigabyte/ma78gm/mptable.c @@ -46,7 +46,7 @@ static void *smp_write_config_table(void *v) /* I/O APICs: APIC ID Version State Address */ { - device_t dev; + struct device *dev; u32 dword; u8 byte; |