summaryrefslogtreecommitdiff
path: root/src/drivers/usb
diff options
context:
space:
mode:
authorAngel Pons <th3fanbus@gmail.com>2020-07-08 14:08:41 +0200
committerAngel Pons <th3fanbus@gmail.com>2020-07-11 22:26:42 +0000
commita0a94d8c647af574374b718542bb932a76431376 (patch)
tree5dd6387697d8ee244ae7e5706cd7c72a92fc4405 /src/drivers/usb
parent54ff67c698c3437fc1e460b5907d82825917b51f (diff)
drivers/usb/ehci_debug.c: Drop preprocessor usage
There's no need to use ugly preprocessor here when regular C conditional statements will work just fine. Change-Id: I5abd445a335b43fb95e4df087d44e82c3f44349b Signed-off-by: Angel Pons <th3fanbus@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/43295 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Michael Niewöhner Reviewed-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Diffstat (limited to 'src/drivers/usb')
-rw-r--r--src/drivers/usb/ehci_debug.c30
1 files changed, 14 insertions, 16 deletions
diff --git a/src/drivers/usb/ehci_debug.c b/src/drivers/usb/ehci_debug.c
index 5af8e2edbb..e5841d7da0 100644
--- a/src/drivers/usb/ehci_debug.c
+++ b/src/drivers/usb/ehci_debug.c
@@ -584,23 +584,21 @@ err:
//return ret;
next_debug_port:
-#if CONFIG_USBDEBUG_DEFAULT_PORT == 0
- port_map_tried |= (1 << (debug_port - 1));
- new_debug_port = ((debug_port-1 + 1) % n_ports) + 1;
- if (port_map_tried != ((1 << n_ports) - 1)) {
- ehci_debug_select_port(new_debug_port);
- goto try_next_port;
- }
- if (--playtimes) {
- ehci_debug_select_port(new_debug_port);
- goto try_next_time;
+ if (CONFIG_USBDEBUG_DEFAULT_PORT == 0) {
+ port_map_tried |= (1 << (debug_port - 1));
+ new_debug_port = ((debug_port-1 + 1) % n_ports) + 1;
+ if (port_map_tried != ((1 << n_ports) - 1)) {
+ ehci_debug_select_port(new_debug_port);
+ goto try_next_port;
+ }
+ if (--playtimes) {
+ ehci_debug_select_port(new_debug_port);
+ goto try_next_time;
+ }
+ } else {
+ if (--playtimes)
+ goto try_next_time;
}
-#else
- if (0)
- goto try_next_port;
- if (--playtimes)
- goto try_next_time;
-#endif
return -10;
}