Commit e3acdac8 authored by Matt Domsch's avatar Matt Domsch

EDD: cleanups

print PCI info as %02x.%02x.%d
Don't warn about nonexistant SCSI devices if it's not a SCSI device
parent 004747de
...@@ -194,7 +194,7 @@ edd_show_host_bus(struct edd_device *edev, char *buf, size_t count, loff_t off) ...@@ -194,7 +194,7 @@ edd_show_host_bus(struct edd_device *edev, char *buf, size_t count, loff_t off)
} else if (!strncmp(info->params.host_bus_type, "PCIX", 4) || } else if (!strncmp(info->params.host_bus_type, "PCIX", 4) ||
!strncmp(info->params.host_bus_type, "PCI", 3)) { !strncmp(info->params.host_bus_type, "PCI", 3)) {
p += snprintf(p, left, p += snprintf(p, left,
"\t%02x:%02x.%01x channel: %u\n", "\t%02x:%02x.%d channel: %u\n",
info->params.interface_path.pci.bus, info->params.interface_path.pci.bus,
info->params.interface_path.pci.slot, info->params.interface_path.pci.slot,
info->params.interface_path.pci.function, info->params.interface_path.pci.function,
...@@ -354,7 +354,7 @@ edd_show_raw_data(struct edd_device *edev, char *buf, size_t count, loff_t off) ...@@ -354,7 +354,7 @@ edd_show_raw_data(struct edd_device *edev, char *buf, size_t count, loff_t off)
pci.function)); pci.function));
if (!pci_dev) { if (!pci_dev) {
p += snprintf(p, left, "Error: BIOS says this is a PCI device, but the OS doesn't know\n"); p += snprintf(p, left, "Error: BIOS says this is a PCI device, but the OS doesn't know\n");
p += snprintf(p, left, " about a PCI device at %02x:%02x.%01x\n", p += snprintf(p, left, " about a PCI device at %02x:%02x.%d\n",
info->params.interface_path.pci.bus, info->params.interface_path.pci.bus,
info->params.interface_path.pci.slot, info->params.interface_path.pci.slot,
info->params.interface_path.pci.function); info->params.interface_path.pci.function);
...@@ -365,7 +365,7 @@ edd_show_raw_data(struct edd_device *edev, char *buf, size_t count, loff_t off) ...@@ -365,7 +365,7 @@ edd_show_raw_data(struct edd_device *edev, char *buf, size_t count, loff_t off)
} }
} }
if (found_pci) { if (found_pci && !edd_dev_is_type(edev, "SCSI")) {
sd = edd_find_matching_scsi_device(edev); sd = edd_find_matching_scsi_device(edev);
if (!sd) { if (!sd) {
p += snprintf(p, left, "Error: BIOS says this is a SCSI device, but\n"); p += snprintf(p, left, "Error: BIOS says this is a SCSI device, but\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment