summaryrefslogtreecommitdiff
path: root/Kernel/Bus/USB
diff options
context:
space:
mode:
authorLiav A <liavalb@gmail.com>2021-09-23 11:05:00 +0300
committerAndreas Kling <kling@serenityos.org>2021-09-29 11:24:33 +0200
commit9d9d57056ea1a9a9ce599d69309d0d78b8c27b8b (patch)
treedff74950e7856e8d55e1ae767d85834766d280db /Kernel/Bus/USB
parenta411a44fda3ba713e139331d4c29ea32f70c99d8 (diff)
downloadserenity-9d9d57056ea1a9a9ce599d69309d0d78b8c27b8b.zip
Kernel/PCI: Remove Address from enumeration callback
If we need that address, we can always get it from the DeviceIdentifier.
Diffstat (limited to 'Kernel/Bus/USB')
-rw-r--r--Kernel/Bus/USB/USBManagement.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Kernel/Bus/USB/USBManagement.cpp b/Kernel/Bus/USB/USBManagement.cpp
index 144d4c806c..5b815eab9e 100644
--- a/Kernel/Bus/USB/USBManagement.cpp
+++ b/Kernel/Bus/USB/USBManagement.cpp
@@ -27,7 +27,7 @@ UNMAP_AFTER_INIT void USBManagement::enumerate_controllers()
if (kernel_command_line().disable_usb())
return;
- PCI::enumerate([this](PCI::Address const& address, PCI::DeviceIdentifier const& device_identifier) {
+ PCI::enumerate([this](PCI::DeviceIdentifier const& device_identifier) {
if (!(device_identifier.class_code().value() == 0xc && device_identifier.subclass_code().value() == 0x3))
return;
if (device_identifier.prog_if().value() == 0x0) {
@@ -41,21 +41,21 @@ UNMAP_AFTER_INIT void USBManagement::enumerate_controllers()
}
if (device_identifier.prog_if().value() == 0x10) {
- dmesgln("USBManagement: OHCI controller found at {} is not currently supported.", address);
+ dmesgln("USBManagement: OHCI controller found at {} is not currently supported.", device_identifier.address());
return;
}
if (device_identifier.prog_if().value() == 0x20) {
- dmesgln("USBManagement: EHCI controller found at {} is not currently supported.", address);
+ dmesgln("USBManagement: EHCI controller found at {} is not currently supported.", device_identifier.address());
return;
}
if (device_identifier.prog_if().value() == 0x30) {
- dmesgln("USBManagement: xHCI controller found at {} is not currently supported.", address);
+ dmesgln("USBManagement: xHCI controller found at {} is not currently supported.", device_identifier.address());
return;
}
- dmesgln("USBManagement: Unknown/unsupported controller at {} with programming interface 0x{:02x}", address, device_identifier.prog_if().value());
+ dmesgln("USBManagement: Unknown/unsupported controller at {} with programming interface 0x{:02x}", device_identifier.address(), device_identifier.prog_if().value());
});
}