summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYilun Lin <yllin@chromium.org>2019-10-09 13:53:39 +0800
committerCommit Bot <commit-bot@chromium.org>2019-10-09 19:42:39 +0000
commit871ab6099445068e2ed6d77663135d1d35f59e2a (patch)
tree38b523c48bafb1177829ed6521a8634e8ce0a68c
parentcb856036beaa8d2c552b4d71c0b9c0144ff53aec (diff)
downloadchrome-ec-871ab6099445068e2ed6d77663135d1d35f59e2a.tar.gz
usb_pd: drop duplicate func get_max_request_mv()
The function is added by chromium:1737899 and is duplicate of pd_get_max_voltage(). TEST=make buildall -j BUG=None BRANCH=firmware-kukui-12573.B Change-Id: Ida1f56d108573a1776dcec8460dd48439427d10d Signed-off-by: Yilun Lin <yllin@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1847513 Reviewed-by: Denis Brockus <dbrockus@chromium.org>
-rw-r--r--common/usb_pd_policy.c5
-rw-r--r--common/usb_pd_protocol.c2
-rw-r--r--include/usb_pd.h6
3 files changed, 1 insertions, 12 deletions
diff --git a/common/usb_pd_policy.c b/common/usb_pd_policy.c
index 3d9d76d0d3..d49e87e882 100644
--- a/common/usb_pd_policy.c
+++ b/common/usb_pd_policy.c
@@ -119,11 +119,6 @@ uint8_t pd_get_src_cap_cnt(int port)
return pd_src_cap_cnt[port];
}
-uint32_t get_max_request_mv(void)
-{
- return max_request_mv;
-}
-
void pd_process_source_cap(int port, int cnt, uint32_t *src_caps)
{
#ifdef CONFIG_CHARGE_MANAGER
diff --git a/common/usb_pd_protocol.c b/common/usb_pd_protocol.c
index f554630870..ae70ffb72b 100644
--- a/common/usb_pd_protocol.c
+++ b/common/usb_pd_protocol.c
@@ -1491,7 +1491,7 @@ static int pd_send_request_msg(int port, int always_send_request)
&rdo, &curr_limit, &supply_voltage,
charging && max_request_allowed ?
PD_REQUEST_MAX : PD_REQUEST_VSAFE5V,
- get_max_request_mv());
+ pd_get_max_voltage());
if (!always_send_request) {
/* Don't re-request the same voltage */
diff --git a/include/usb_pd.h b/include/usb_pd.h
index ca8b8e04ad..b29e39a4c7 100644
--- a/include/usb_pd.h
+++ b/include/usb_pd.h
@@ -2221,12 +2221,6 @@ const uint32_t * const pd_get_src_caps(int port);
uint8_t pd_get_src_cap_cnt(int port);
/**
- * Returns the maximum request voltage before receiving a source caps
- *
- */
-uint32_t get_max_request_mv(void);
-
-/**
* Return true if partner port is capable of communication over USB data
* lines.
*