GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nb/x4x: Get rid of device_t 

Use of `device_t` has been abandoned in ramstage.

Change-Id: Ib3e708a7fa9f0a78dc704a502a2f01ee0fe209ae
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/23655
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Elyes HAOUAS 2018-02-08 14:59:03 +01:00 committed by Patrick Georgi
parent 658a9348f0
commit fea02e1439
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/northbridge/intel/x4x/acpi.c
View File

@ -30,7 +30,7 @@
unsigned long acpi_fill_mcfg(unsigned long current) unsigned long acpi_fill_mcfg(unsigned long current)
{ {
device_t dev; struct device *dev;
u32 pciexbar = 0; u32 pciexbar = 0;
u32 length = 0; u32 length = 0;
@ -44,7 +44,7 @@ unsigned long acpi_fill_mcfg(unsigned long current)
return current; return current;
} }
unsigned long northbridge_write_acpi_tables(device_t device, unsigned long northbridge_write_acpi_tables(struct device *device,
unsigned long start, unsigned long start,
struct acpi_rsdp *rsdp) struct acpi_rsdp *rsdp)
{ {

6
src/northbridge/intel/x4x/gma.c
View File

@ -430,7 +430,7 @@ static void gma_func0_disable(struct device *dev)
pci_write_config16(dev_host, D0F0_GGC, ggc); pci_write_config16(dev_host, D0F0_GGC, ggc);
} }
static void gma_set_subsystem(device_t dev, unsigned int vendor, static void gma_set_subsystem(struct device *dev, unsigned int vendor,
unsigned int device) unsigned int device)
{ {
if (!vendor || !device) { if (!vendor || !device) {
@ -446,14 +446,14 @@ static void gma_set_subsystem(device_t dev, unsigned int vendor,
const struct i915_gpu_controller_info * const struct i915_gpu_controller_info *
intel_gma_get_controller_info(void) intel_gma_get_controller_info(void)
{ {
device_t dev = dev_find_slot(0, PCI_DEVFN(0x2, 0)); struct device *dev = dev_find_slot(0, PCI_DEVFN(0x2, 0));
if (!dev) if (!dev)
return NULL; return NULL;
struct northbridge_intel_x4x_config *chip = dev->chip_info; struct northbridge_intel_x4x_config *chip = dev->chip_info;
return &chip->gfx; return &chip->gfx;
} }
static void gma_ssdt(device_t device) static void gma_ssdt(struct device *device)
{ {
const struct i915_gpu_controller_info *gfx = intel_gma_get_controller_info(); const struct i915_gpu_controller_info *gfx = intel_gma_get_controller_info();
if (!gfx) if (!gfx)

10
src/northbridge/intel/x4x/northbridge.c
View File

@ -31,7 +31,7 @@
static const int legacy_hole_base_k = 0xa0000 / 1024; static const int legacy_hole_base_k = 0xa0000 / 1024;
static void mch_domain_read_resources(device_t dev) static void mch_domain_read_resources(struct device *dev)
{ {
u8 index, reg8; u8 index, reg8;
u64 tom, touud; u64 tom, touud;
@ -136,7 +136,7 @@ static void mch_domain_read_resources(device_t dev)
} }
} }
static void mch_domain_set_resources(device_t dev) static void mch_domain_set_resources(struct device *dev)
{ {
struct resource *res; struct resource *res;
@ -146,7 +146,7 @@ static void mch_domain_set_resources(device_t dev)
assign_resources(dev->link_list); assign_resources(dev->link_list);
} }
static void mch_domain_init(device_t dev) static void mch_domain_init(struct device *dev)
{ {
u32 reg32; u32 reg32;
@ -167,7 +167,7 @@ static struct device_operations pci_domain_ops = {
}; };
static void cpu_bus_init(device_t dev) static void cpu_bus_init(struct device *dev)
{ {
initialize_cpus(dev->link_list); initialize_cpus(dev->link_list);
} }
@ -180,7 +180,7 @@ static struct device_operations cpu_bus_ops = {
}; };
static void enable_dev(device_t dev) static void enable_dev(struct device *dev)
{ {
/* Set the operations if it is a special bus type */ /* Set the operations if it is a special bus type */
if (dev->path.type == DEVICE_PATH_DOMAIN) if (dev->path.type == DEVICE_PATH_DOMAIN)

3
src/northbridge/intel/x4x/x4x.h
View File

@ -385,7 +385,8 @@ extern const struct dll_setting default_ddr3_1333_dq[2][TOTAL_BYTELANES];
struct acpi_rsdp; struct acpi_rsdp;
#ifndef __SIMPLE_DEVICE__ #ifndef __SIMPLE_DEVICE__
unsigned long northbridge_write_acpi_tables(device_t device, unsigned long start, struct acpi_rsdp *rsdp); unsigned long northbridge_write_acpi_tables(struct device *device,
unsigned long start, struct acpi_rsdp *rsdp);
#endif /* __SIMPLE_DEVICE__ */ #endif /* __SIMPLE_DEVICE__ */
#endif #endif
#endif /* __NORTHBRIDGE_INTEL_X4X_H__ */ #endif /* __NORTHBRIDGE_INTEL_X4X_H__ */