From c1bfbe03a2d379d6859734da445a8ab3fd292305 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Wed, 3 Nov 2021 13:18:53 +0100 Subject: soc/intel: Replace bad uses of `find_resource` The `find_resource` function will never return null (will die instead). In cases where the existing code already accounts for null pointers, it is better to use `probe_resource` instead, which returns a null pointer instead of dying. Change-Id: I2a57ea1c2f5b156afd0724829e5b1880246f351f Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/58907 Tested-by: build bot (Jenkins) Reviewed-by: Werner Zeh Reviewed-by: Tim Wawrzynczak --- src/soc/intel/common/block/graphics/graphics.c | 2 +- src/soc/intel/common/block/i2c/i2c.c | 2 +- src/soc/intel/common/block/smbus/smbus.c | 2 +- src/soc/intel/common/block/thermal/thermal.c | 2 +- src/soc/intel/common/block/xhci/xhci.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/soc/intel/common') diff --git a/src/soc/intel/common/block/graphics/graphics.c b/src/soc/intel/common/block/graphics/graphics.c index 8476b87b9e..e7e96ad934 100644 --- a/src/soc/intel/common/block/graphics/graphics.c +++ b/src/soc/intel/common/block/graphics/graphics.c @@ -100,7 +100,7 @@ static uintptr_t graphics_get_bar(struct device *dev, unsigned long index) { struct resource *gm_res; - gm_res = find_resource(dev, index); + gm_res = probe_resource(dev, index); if (!gm_res) return 0; diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c index 90670b6a4a..acc23abb0c 100644 --- a/src/soc/intel/common/block/i2c/i2c.c +++ b/src/soc/intel/common/block/i2c/i2c.c @@ -123,7 +123,7 @@ uintptr_t dw_i2c_base_address(unsigned int bus) return (uintptr_t)NULL; /* dev -> bar0 */ - res = find_resource(dev, PCI_BASE_ADDRESS_0); + res = probe_resource(dev, PCI_BASE_ADDRESS_0); if (res) return res->base; diff --git a/src/soc/intel/common/block/smbus/smbus.c b/src/soc/intel/common/block/smbus/smbus.c index d11abee6c6..4a46143558 100644 --- a/src/soc/intel/common/block/smbus/smbus.c +++ b/src/soc/intel/common/block/smbus/smbus.c @@ -46,7 +46,7 @@ static void pch_smbus_init(struct device *dev) ~((1 << 8) | (1 << 10) | (1 << 12) | (1 << 14)), 0); /* Set Receive Slave Address */ - res = find_resource(dev, PCI_BASE_ADDRESS_4); + res = probe_resource(dev, PCI_BASE_ADDRESS_4); if (res) smbus_set_slave_addr(res->base, SMBUS_SLAVE_ADDR); } diff --git a/src/soc/intel/common/block/thermal/thermal.c b/src/soc/intel/common/block/thermal/thermal.c index 13e5285abc..f88699531e 100644 --- a/src/soc/intel/common/block/thermal/thermal.c +++ b/src/soc/intel/common/block/thermal/thermal.c @@ -55,7 +55,7 @@ void pch_thermal_configuration(void) return; } - res = find_resource(dev, PCI_BASE_ADDRESS_0); + res = probe_resource(dev, PCI_BASE_ADDRESS_0); if (!res) { printk(BIOS_ERR, "ERROR: PCH thermal device not found!\n"); return; diff --git a/src/soc/intel/common/block/xhci/xhci.c b/src/soc/intel/common/block/xhci/xhci.c index 9adcbfa57f..5b19fc9e36 100644 --- a/src/soc/intel/common/block/xhci/xhci.c +++ b/src/soc/intel/common/block/xhci/xhci.c @@ -33,7 +33,7 @@ static bool is_usb_port_connected(const struct xhci_usb_info *info, return false; /* Calculate port status register address and read the status */ - res = find_resource(PCH_DEV_XHCI, PCI_BASE_ADDRESS_0); + res = probe_resource(PCH_DEV_XHCI, PCI_BASE_ADDRESS_0); /* If the memory BAR is not allocated for XHCI, leave the devices enabled */ if (!res) return true; -- cgit v1.2.3