diff options
| author | Paul Fagerburg <pfagerburg@google.com> | 2020-07-27 15:52:15 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-07-28 22:59:41 +0000 |
| commit | 6efabc79d3519baa56ba1c065035a491fc6918ec (patch) | |
| tree | 9981d7bbdc897ef485226c8f13000c4a2ef83403 /common/usbc | |
| parent | 63498074bd3a77b28d2a96ef43aeceed51aa2bde (diff) | |
| download | chrome-ec-6efabc79d3519baa56ba1c065035a491fc6918ec.tar.gz | |
ec: change usage of whitelist/blacklist
Google is working to change its source code to use more inclusive
language. To that end, replace the terms "whitelist", "blacklist",
and similar with inclusive alternatives.
BUG=b:162262297
BRANCH=None
TEST=`grep -Eirl "(white|black)[ _\-]*list" .`
The only results are in "private/nordic_keyboard/sdk8.0.0"
which is not our code.
Signed-off-by: Paul Fagerburg <pfagerburg@google.com>
Change-Id: Ie5210b98e1096c22d0e9284c101a42820bd3d79d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2321549
Tested-by: Paul Fagerburg <pfagerburg@chromium.org>
Reviewed-by: Jett Rink <jettrink@chromium.org>
Commit-Queue: Paul Fagerburg <pfagerburg@chromium.org>
Diffstat (limited to 'common/usbc')
| -rw-r--r-- | common/usbc/usb_pe_drp_sm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/usbc/usb_pe_drp_sm.c b/common/usbc/usb_pe_drp_sm.c index 6d39e2ad89..7aac1a58a7 100644 --- a/common/usbc/usb_pe_drp_sm.c +++ b/common/usbc/usb_pe_drp_sm.c @@ -1249,12 +1249,12 @@ static void pe_update_pdo_flags(int port, uint32_t pdo) { #ifdef CONFIG_CHARGE_MANAGER #ifdef CONFIG_USB_PD_ALT_MODE_DFP - int charge_whitelisted = + int charge_allowlisted = (pd_get_power_role(port) == PD_ROLE_SINK && pd_charge_from_device(pd_get_identity_vid(port), pd_get_identity_pid(port))); #else - const int charge_whitelisted = 0; + const int charge_allowlisted = 0; #endif #endif @@ -1287,10 +1287,10 @@ static void pe_update_pdo_flags(int port, uint32_t pdo) * Treat device as a dedicated charger (meaning we should charge * from it) if it does not support power swap, or if it is unconstrained * power, or if we are a sink and the device identity matches a - * charging white-list. + * charging allow-list. */ if (!(pdo & PDO_FIXED_DUAL_ROLE) || (pdo & PDO_FIXED_UNCONSTRAINED) || - charge_whitelisted) { + charge_allowlisted) { PE_CLR_FLAG(port, PE_FLAGS_PORT_PARTNER_IS_DUALROLE); charge_manager_update_dualrole(port, CAP_DEDICATED); } else { |