From 855b8983319f24835e72669469669f270fffa1db Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Sat, 13 Nov 2021 17:56:20 +1100 Subject: pcidev: Move pci_card_find() from internal to canonical place Also rename to `pcidev_card_find()` in fitting with pcidev.c helpers. BUG=b:220950271 TEST=```sudo ./flashrom -p internal -r /tmp/bios Found Programmer flash chip "Opaque flash chip" (16384 kB, Programmer-specific) mapped at physical address 0x0000000000000000. Reading flash... done. ``` Change-Id: I026bfbecba114411728d4ad1ed8969b469fa7d2d Signed-off-by: Edward O'Callaghan Reviewed-on: https://review.coreboot.org/c/flashrom/+/59279 Tested-by: build bot (Jenkins) Reviewed-by: Thomas Heijligen Reviewed-by: Nikolai Artemiev Reviewed-by: Anastasia Klimchuk --- board_enable.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'board_enable.c') diff --git a/board_enable.c b/board_enable.c index 0ac522e5..22db4928 100644 --- a/board_enable.c +++ b/board_enable.c @@ -2645,17 +2645,17 @@ static const struct board_match *board_match_pci_ids(enum board_match_phase phas if (board->phase != phase) continue; - if (!pci_card_find(board->first_vendor, board->first_device, - board->first_card_vendor, - board->first_card_device)) + if (!pcidev_card_find(board->first_vendor, board->first_device, + board->first_card_vendor, + board->first_card_device)) continue; if (board->second_vendor) { if (board->second_card_vendor) { - if (!pci_card_find(board->second_vendor, - board->second_device, - board->second_card_vendor, - board->second_card_device)) + if (!pcidev_card_find(board->second_vendor, + board->second_device, + board->second_card_vendor, + board->second_card_device)) continue; } else { if (!pci_dev_find(board->second_vendor, -- cgit v1.2.3