diff options
| author | Elyes HAOUAS <ehaouas@noos.fr> | 2018-06-10 23:36:44 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-06-14 09:29:31 +0000 |
| commit | c8a649c08f92d4d2255626da4e1cd7a6d71469e7 (patch) | |
| tree | 14a899738d09b37030585aca3b59344595208e36 /src/soc/intel/braswell | |
| parent | 846b4941fee842bc359fa2b611cf0c3fc4f158b2 (diff) | |
src: Use of device_t is deprecated
Change-Id: I9cebfc5c77187bd81094031c43ff6df094908417
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/27010
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/soc/intel/braswell')
| -rw-r--r-- | src/soc/intel/braswell/pmutil.c | 8 | ||||
| -rw-r--r-- | src/soc/intel/braswell/smihandler.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/braswell/spi.c | 5 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/soc/intel/braswell/pmutil.c b/src/soc/intel/braswell/pmutil.c index 18e655c1b3..5f078dfbcf 100644 --- a/src/soc/intel/braswell/pmutil.c +++ b/src/soc/intel/braswell/pmutil.c @@ -27,9 +27,9 @@ #if defined(__SIMPLE_DEVICE__) -static const device_t pcu_dev = PCI_DEV(0, PCU_DEV, 0); +static const pci_devfn_t pcu_dev = PCI_DEV(0, PCU_DEV, 0); -static inline device_t get_pcu_dev(void) +static inline pci_devfn_t get_pcu_dev(void) { return pcu_dev; } @@ -38,8 +38,8 @@ static inline device_t get_pcu_dev(void) #include <device/device.h> #include <device/pci.h> -static device_t pcu_dev; -static device_t get_pcu_dev(void) +static struct device *pcu_dev; +static struct device *get_pcu_dev(void) { if (pcu_dev == NULL) pcu_dev = dev_find_slot(0, PCI_DEVFN(PCU_DEV, 0)); diff --git a/src/soc/intel/braswell/smihandler.c b/src/soc/intel/braswell/smihandler.c index 0f5c7c98c3..edbb766109 100644 --- a/src/soc/intel/braswell/smihandler.c +++ b/src/soc/intel/braswell/smihandler.c @@ -70,7 +70,7 @@ static void busmaster_disable_on_bus(int bus) for (slot = 0; slot < 0x20; slot++) { for (func = 0; func < 8; func++) { u32 reg32; - device_t dev = PCI_DEV(bus, slot, func); + pci_devfn_t dev = PCI_DEV(bus, slot, func); val = pci_read_config32(dev, PCI_VENDOR_ID); diff --git a/src/soc/intel/braswell/spi.c b/src/soc/intel/braswell/spi.c index b9e1627d15..f2d178d11a 100644 --- a/src/soc/intel/braswell/spi.c +++ b/src/soc/intel/braswell/spi.c @@ -233,13 +233,12 @@ static void read_reg(void *src, void *value, uint32_t size) static ich9_spi_regs *spi_regs(void) { - device_t dev; uint32_t sbase; #if ENV_SMM - dev = PCI_DEV(0, LPC_DEV, LPC_FUNC); + pci_devfn_t dev = PCI_DEV(0, LPC_DEV, LPC_FUNC); #else - dev = dev_find_slot(0, PCI_DEVFN(LPC_DEV, LPC_FUNC)); + struct device *dev = dev_find_slot(0, PCI_DEVFN(LPC_DEV, LPC_FUNC)); #endif if (!dev) { printk(BIOS_ERR, "%s: PCI device not found", __func__); |