summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngel Pons <th3fanbus@gmail.com>2021-11-03 13:13:00 +0100
committerFelix Held <felix-coreboot@felixheld.de>2021-11-04 17:32:36 +0000
commit536d36a7480c70acefb45c7f31db29489f4776e8 (patch)
treeee077a270c53216864d3e6e7bfc9813283b09545
parentf32ae10f0d62e646cc196f8eb2bb841f60cbe9d6 (diff)
nb/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: I617fea8a09049e9a87130640835ea6c3e2faec60 Signed-off-by: Angel Pons <th3fanbus@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/58906 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
-rw-r--r--src/northbridge/intel/gm45/gma.c2
-rw-r--r--src/northbridge/intel/haswell/gma.c2
-rw-r--r--src/northbridge/intel/haswell/minihd.c2
-rw-r--r--src/northbridge/intel/ironlake/gma.c4
-rw-r--r--src/northbridge/intel/sandybridge/gma.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
index 178149d119..77bbe3f553 100644
--- a/src/northbridge/intel/gm45/gma.c
+++ b/src/northbridge/intel/gm45/gma.c
@@ -151,7 +151,7 @@ static void gma_func0_init(struct device *dev)
intel_gma_init_igd_opregion();
- gtt_res = find_resource(dev, PCI_BASE_ADDRESS_0);
+ gtt_res = probe_resource(dev, PCI_BASE_ADDRESS_0);
if (gtt_res == NULL)
return;
mmio = res2mmio(gtt_res, 0, 0);
diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c
index ccabb8cfa3..212b395a78 100644
--- a/src/northbridge/intel/haswell/gma.c
+++ b/src/northbridge/intel/haswell/gma.c
@@ -178,7 +178,7 @@ static void gma_pm_init_pre_vbios(struct device *dev)
{
printk(BIOS_DEBUG, "GT Power Management Init\n");
- gtt_res = find_resource(dev, PCI_BASE_ADDRESS_0);
+ gtt_res = probe_resource(dev, PCI_BASE_ADDRESS_0);
if (!gtt_res || !gtt_res->base)
return;
diff --git a/src/northbridge/intel/haswell/minihd.c b/src/northbridge/intel/haswell/minihd.c
index 1bfbfe5ca0..6896464d5c 100644
--- a/src/northbridge/intel/haswell/minihd.c
+++ b/src/northbridge/intel/haswell/minihd.c
@@ -51,7 +51,7 @@ static void minihd_init(struct device *dev)
int codec_mask, i;
/* Find base address */
- res = find_resource(dev, PCI_BASE_ADDRESS_0);
+ res = probe_resource(dev, PCI_BASE_ADDRESS_0);
if (!res)
return;
diff --git a/src/northbridge/intel/ironlake/gma.c b/src/northbridge/intel/ironlake/gma.c
index 7d08f3130d..a0325d12eb 100644
--- a/src/northbridge/intel/ironlake/gma.c
+++ b/src/northbridge/intel/ironlake/gma.c
@@ -140,7 +140,7 @@ static void gma_func0_init(struct device *dev)
if (!CONFIG(NO_GFX_INIT))
pci_or_config16(dev, PCI_COMMAND, PCI_COMMAND_MASTER);
- gtt_res = find_resource(dev, PCI_BASE_ADDRESS_0);
+ gtt_res = probe_resource(dev, PCI_BASE_ADDRESS_0);
if (!gtt_res || !gtt_res->base)
return;
@@ -171,7 +171,7 @@ static void gma_read_resources(struct device *dev)
struct resource *res;
/* Set the graphics memory to write combining. */
- res = find_resource(dev, PCI_BASE_ADDRESS_2);
+ res = probe_resource(dev, PCI_BASE_ADDRESS_2);
if (res == NULL) {
printk(BIOS_DEBUG, "gma: memory resource not found.\n");
return;
diff --git a/src/northbridge/intel/sandybridge/gma.c b/src/northbridge/intel/sandybridge/gma.c
index 38adbceae5..9d01533e71 100644
--- a/src/northbridge/intel/sandybridge/gma.c
+++ b/src/northbridge/intel/sandybridge/gma.c
@@ -308,7 +308,7 @@ static void gma_pm_init_pre_vbios(struct device *dev)
printk(BIOS_DEBUG, "GT Power Management Init\n");
- gtt_res = find_resource(dev, PCI_BASE_ADDRESS_0);
+ gtt_res = probe_resource(dev, PCI_BASE_ADDRESS_0);
if (!gtt_res || !gtt_res->base)
return;