summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElyes HAOUAS <ehaouas@noos.fr>2018-10-25 10:57:39 +0200
committerPatrick Georgi <pgeorgi@google.com>2018-11-05 08:57:57 +0000
commit54f942499b72efe301e7bee7b7d9daf6a1d8c8ea (patch)
treed5c48eeceaf59ac082c4132a6def95503446d8f7
parent2a1c4302d1e6a6d34084989a0ef7e57e6f5a29a4 (diff)
downloadcoreboot-54f942499b72efe301e7bee7b7d9daf6a1d8c8ea.tar.xz
sb/intel/lynxpoint: Remove irrelevant conditional statement
After a {break,return}, "else" is generally not needed. Change-Id: I6145424ef8ffe6854c18c1d885f579d37853a70c Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr> Reviewed-on: https://review.coreboot.org/29267 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/southbridge/intel/lynxpoint/me_9.x.c3
-rw-r--r--src/southbridge/intel/lynxpoint/usb_xhci.c23
2 files changed, 12 insertions, 14 deletions
diff --git a/src/southbridge/intel/lynxpoint/me_9.x.c b/src/southbridge/intel/lynxpoint/me_9.x.c
index 61684985a8..574a8308d6 100644
--- a/src/southbridge/intel/lynxpoint/me_9.x.c
+++ b/src/southbridge/intel/lynxpoint/me_9.x.c
@@ -650,10 +650,9 @@ static int me_icc_set_clock_enables(u32 mask)
if (mei_sendrecv_icc(&icc, &clk, sizeof(clk), NULL, 0) < 0) {
printk(BIOS_ERR, "ME: ICC SET CLOCK ENABLES message failed\n");
return -1;
- } else {
- printk(BIOS_INFO, "ME: ICC SET CLOCK ENABLES 0x%08x\n", mask);
}
+ printk(BIOS_INFO, "ME: ICC SET CLOCK ENABLES 0x%08x\n", mask);
return 0;
}
diff --git a/src/southbridge/intel/lynxpoint/usb_xhci.c b/src/southbridge/intel/lynxpoint/usb_xhci.c
index 28e6521598..41d99f6842 100644
--- a/src/southbridge/intel/lynxpoint/usb_xhci.c
+++ b/src/southbridge/intel/lynxpoint/usb_xhci.c
@@ -40,20 +40,19 @@ static int usb_xhci_port_count_usb3(device_t dev)
if (pch_is_lp()) {
/* LynxPoint-LP has 4 SS ports */
return 4;
- } else {
+ }
/* LynxPoint-H can have 0, 2, 4, or 6 SS ports */
- u8 *mem_base = usb_xhci_mem_base(dev);
- u32 fus = read32(mem_base + XHCI_USB3FUS);
- fus >>= XHCI_USB3FUS_SS_SHIFT;
- fus &= XHCI_USB3FUS_SS_MASK;
- switch (fus) {
- case 3: return 0;
- case 2: return 2;
- case 1: return 4;
- case 0: default: return 6;
- }
+ u8 *mem_base = usb_xhci_mem_base(dev);
+ u32 fus = read32(mem_base + XHCI_USB3FUS);
+ fus >>= XHCI_USB3FUS_SS_SHIFT;
+ fus &= XHCI_USB3FUS_SS_MASK;
+ switch (fus) {
+ case 3: return 0;
+ case 2: return 2;
+ case 1: return 4;
+ case 0:
+ default: return 6;
}
- return 0;
}
static void usb_xhci_reset_status_usb3(u8 *mem_base, int port)