From 5595a20f393387e28adea87c65d650a2de227fca Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Sat, 17 Apr 2021 12:28:53 +0200 Subject: [PATCH] soc/intel/braswell/pmutil.c: Define __SIMPLE_DEVICE__ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I2caa9cbb812e17f041c15654aef756e41fb71398 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/52459 Tested-by: build bot (Jenkins) Reviewed-by: Tim Wawrzynczak Reviewed-by: Michael Niewöhner Reviewed-by: Frans Hendriks --- src/soc/intel/braswell/pmutil.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/src/soc/intel/braswell/pmutil.c b/src/soc/intel/braswell/pmutil.c index 4497166c6b..a880183b82 100644 --- a/src/soc/intel/braswell/pmutil.c +++ b/src/soc/intel/braswell/pmutil.c @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#define __SIMPLE_DEVICE__ + #include #include #include @@ -16,29 +18,9 @@ #include #include -#if defined(__SIMPLE_DEVICE__) - -static const pci_devfn_t pcu_dev = PCI_DEV(0, PCU_DEV, 0); - -static inline pci_devfn_t get_pcu_dev(void) -{ - return pcu_dev; -} - -#else /* __SIMPLE_DEVICE__ */ - -static struct device *pcu_dev; -static struct device *get_pcu_dev(void) -{ - if (pcu_dev == NULL) - pcu_dev = pcidev_on_root(PCU_DEV, 0); - return pcu_dev; -} -#endif /* __SIMPLE_DEVICE__ */ - uint16_t get_pmbase(void) { - return pci_read_config16(get_pcu_dev(), ABASE) & 0xfff8; + return pci_read_config16(PCI_DEV(0, PCU_DEV, 0), ABASE) & 0xfff8; } static void print_num_status_bits(int num_bits, uint32_t status, const char *const bit_names[])