GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

device/pci: Add NULL check for PCI driver's .ops 

Add a NULL check and only skip setting the default operations
if `.ops` was set by a driver. It's fairly unlikely that some-
body adds a driver and forgets the `.ops` pointer. So this is
mostly to increase readability: Nobody should have to wonder
if we're missing a NULL-check.

The condition is moved out of the loop to reduce indentation
levels. Alternatively, we could jusk skip drivers that don't
have `.ops` set (i.e. continue the loop).

Change-Id: I5dcc05ebb092fb9c4be929c81ea2b05a10b1311b
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46297
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Nico Huber 2020-10-12 16:25:40 +02:00 committed by Patrick Georgi
parent d3d0fd7d5e
commit 7e3e1ea43f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/device/pci_device.c
View File

@ -954,13 +954,16 @@ static void set_pci_ops(struct device *dev)
if ((driver->vendor == dev->vendor) && if ((driver->vendor == dev->vendor) &&
device_id_match(driver, dev->device)) { device_id_match(driver, dev->device)) {
dev->ops = (struct device_operations *)driver->ops; dev->ops = (struct device_operations *)driver->ops;
printk(BIOS_SPEW, "%s [%04x/%04x] %sops\n", break;
dev_path(dev), driver->vendor, driver->device,
(driver->ops->scan_bus ? "bus " : ""));
return;
} }
} }
if (dev->ops) {
printk(BIOS_SPEW, "%s [%04x/%04x] %sops\n", dev_path(dev),
driver->vendor, driver->device, (driver->ops->scan_bus ? "bus " : ""));
return;
}
/* If I don't have a specific driver use the default operations. */ /* If I don't have a specific driver use the default operations. */
switch (dev->hdr_type & 0x7f) { /* Header type */ switch (dev->hdr_type & 0x7f) { /* Header type */
case PCI_HEADER_TYPE_NORMAL: case PCI_HEADER_TYPE_NORMAL: