diff options
| author | Elyes HAOUAS <ehaouas@noos.fr> | 2018-12-05 10:56:30 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-12-20 22:16:24 +0000 |
| commit | 6f01f4307c993c60813ea332174ca23c2bc269e8 (patch) | |
| tree | 83d1710b9f70357426e7d2a03b7381e673750e61 /src/soc/intel/skylake | |
| parent | 096833fef4eb5616a95559bb2931dc5e8c0cf594 (diff) | |
soc/intel: Get rid of device_t
Use of device_t is deprecated.
Change-Id: Ic29891d78514db3b7eed48414a14e4ff579436c0
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/30004
Reviewed-by: David Guckian
Reviewed-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/intel/skylake')
| -rw-r--r-- | src/soc/intel/skylake/elog.c | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/src/soc/intel/skylake/elog.c b/src/soc/intel/skylake/elog.c index a2fa52ac1f..1fab92e2b0 100644 --- a/src/soc/intel/skylake/elog.c +++ b/src/soc/intel/skylake/elog.c @@ -159,7 +159,11 @@ static inline bool pch_xhci_usb3_update_wake_event(uintptr_t mmio_base) ELOG_WAKE_SOURCE_PME_XHCI_USB_3); } -static bool pch_xhci_update_wake_event(device_t dev) +#ifdef __SIMPLE_DEVICE__ +static bool pch_xhci_update_wake_event(pci_devfn_t dev) +#else +static bool pch_xhci_update_wake_event(struct device *dev) +#endif { uintptr_t mmio_base; bool event_found = false; @@ -175,15 +179,24 @@ static bool pch_xhci_update_wake_event(device_t dev) } struct pme_status_info { - device_t dev; +#ifdef __SIMPLE_DEVICE__ + pci_devfn_t dev; +#else + struct device *dev; +#endif uint8_t reg_offset; uint32_t elog_event; }; #define PME_STS_BIT (1 << 15) +#ifdef __SIMPLE_DEVICE__ static void pch_log_add_elog_event(const struct pme_status_info *info, - device_t dev) + pci_devfn_t dev) +#else +static void pch_log_add_elog_event(const struct pme_status_info *info, + struct device *dev) +#endif { /* * If wake source is XHCI, check for detailed wake source events on @@ -198,7 +211,11 @@ static void pch_log_add_elog_event(const struct pme_status_info *info, static void pch_log_pme_internal_wake_source(void) { size_t i; - device_t dev; +#ifdef __SIMPLE_DEVICE__ + pci_devfn_t dev; +#else + struct device *dev; +#endif uint16_t val; bool dev_found = false; @@ -243,7 +260,11 @@ static void pch_log_pme_internal_wake_source(void) static void pch_log_rp_wake_source(void) { size_t i; - device_t dev; +#ifdef __SIMPLE_DEVICE__ + pci_devfn_t dev; +#else + struct device *dev; +#endif uint32_t val; struct pme_status_info pme_status_info[] = { |