summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Hurst <shurst@google.com>2019-12-19 07:52:25 -0800
committerCommit Bot <commit-bot@chromium.org>2019-12-23 15:07:36 +0000
commit69572dcea71d4da3eb1c091d5f6c3b5dec77df7e (patch)
tree05352275435956c6e2842faf3ae6489ea10f5eb1
parente4b0cfefb5239da458efea5de50154a74ff74b6f (diff)
downloadchrome-ec-69572dcea71d4da3eb1c091d5f6c3b5dec77df7e.tar.gz
TCPMv2: Remove unnecessary macro around the pd_usb_billboard_deferred function
Conflicting macro logic caused the body of the pd_usb_billboard_deferred function to be empty. To fix this, the macro surrounding the function was removed. BUG=b:144238476 BRANCH=none TEST=make -j buildall Change-Id: I0a1d04a86784d2afe4ac3138c3f35358315569ae Signed-off-by: Sam Hurst <shurst@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1976001 Reviewed-by: Jett Rink <jettrink@chromium.org> Reviewed-by: Keith Short <keithshort@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1979586 Tested-by: Tim Wawrzynczak <twawrzynczak@chromium.org> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org> Commit-Queue: Tim Wawrzynczak <twawrzynczak@chromium.org>
-rw-r--r--common/usbc/usb_pe_drp_sm.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/common/usbc/usb_pe_drp_sm.c b/common/usbc/usb_pe_drp_sm.c
index 1ffbe68e0b..748b940284 100644
--- a/common/usbc/usb_pe_drp_sm.c
+++ b/common/usbc/usb_pe_drp_sm.c
@@ -4587,7 +4587,6 @@ void pd_set_vbus_discharge(int port, int enable)
}
/* VDM utility functions */
-#ifdef CONFIG_USB_PD_ALT_MODE_DFP
static void pd_usb_billboard_deferred(void)
{
#if defined(CONFIG_USB_PD_ALT_MODE) && !defined(CONFIG_USB_PD_ALT_MODE_DFP) \
@@ -4839,7 +4838,7 @@ static void dfp_consume_attention(int port, uint32_t *payload)
if (modep->fx->attention)
modep->fx->attention(port, payload);
}
-#endif
+
/*
* This algorithm defaults to choosing higher pin config over lower ones in
* order to prefer multi-function if desired.