cleanup: CONFIG_USB_PD_CUSTOM_VDM is not used

The pd_custom_vdm is called in common/usb_pd_protocol no matter you have this defined or not. No where else I see pd_vdm being used. So we should not have to deal with this CONFIG_USB_PD_CUSTOM_VDM. BUG=None BRANCH=None TEST=make buildall -j Change-Id: I4e8b710240ee27b12625d797e7824f29044e6462 Signed-off-by: Divya Sasidharan <divya.s.sasidharan@intel.com> Reviewed-on: https://chromium-review.googlesource.com/998520 Commit-Ready: Divya S Sasidharan <divya.s.sasidharan@intel.com> Tested-by: Divya S Sasidharan <divya.s.sasidharan@intel.com> Reviewed-by: Vijay P Hiremath <vijay.p.hiremath@intel.com> Reviewed-by: Jett Rink <jettrink@chromium.org>
author: Divya Sasidharan <divya.s.sasidharan@intel.com> 2018-04-05 10:55:24 -0700
committer: chrome-bot <chrome-bot@chromium.org> 2018-04-09 15:19:00 -0700
commit: 7e1ce92219a24dc35cb8eddad0da4180ddc8265f (patch)
tree: 1671d694cf363bf2a2c6cfae22f735df0f0dcef4
parent: 18096899bdd36a7bd8cc957e6d7aad9b9143e42d (diff)
download: chrome-ec-7e1ce92219a24dc35cb8eddad0da4180ddc8265f.tar.gz
31 files changed, 0 insertions, 39 deletions
diff --git a/board/chell/board.h b/board/chell/board.h
index b2eb1271f2..ada855b016 100644
--- a/board/chell/board.h
+++ b/board/chell/board.h
@@ -74,7 +74,6 @@
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
 #define CONFIG_USB_PD_COMM_LOCKED
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_DUAL_ROLE
 #define CONFIG_USB_PD_LOGGING
 #define CONFIG_USB_PD_PORT_COUNT 2
diff --git a/board/coffeecake/board.h b/board/coffeecake/board.h
index 4a72695936..3db2ea11b1 100644
--- a/board/coffeecake/board.h
+++ b/board/coffeecake/board.h
@@ -42,7 +42,6 @@
 #define CONFIG_USB_PD_HW_DEV_ID_BOARD_MAJOR USB_PD_HW_DEV_ID_HOHO
 #define CONFIG_USB_PD_HW_DEV_ID_BOARD_MINOR 2
 #define CONFIG_USB_PD_DUAL_ROLE
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_FLASH
 #define CONFIG_USB_PD_INTERNAL_COMP
 #define CONFIG_USB_PD_IDENTITY_HW_VERS 1
diff --git a/board/coral/board.h b/board/coral/board.h
index 2eeacbad11..208bacdfb8 100644
--- a/board/coral/board.h
+++ b/board/coral/board.h
@@ -81,7 +81,6 @@
 #define CONFIG_CMD_PD_CONTROL
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_DUAL_ROLE
 #define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE
 #define CONFIG_USB_PD_DISCHARGE_TCPC
diff --git a/board/dingdong/board.h b/board/dingdong/board.h
index dc134f6507..3636b3f34f 100644
--- a/board/dingdong/board.h
+++ b/board/dingdong/board.h
@@ -31,7 +31,6 @@
 #define CONFIG_USB_PD_HW_DEV_ID_BOARD_MAJOR USB_PD_HW_DEV_ID_DINGDONG
 #define CONFIG_USB_PD_HW_DEV_ID_BOARD_MINOR 2
 #define CONFIG_USB_PD_DUAL_ROLE
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_FLASH
 #define CONFIG_USB_PD_INTERNAL_COMP
 #define CONFIG_USB_PD_IDENTITY_HW_VERS 1
diff --git a/board/elm/board.h b/board/elm/board.h
index 41af08ee4e..f066dfc67c 100644
--- a/board/elm/board.h
+++ b/board/elm/board.h
@@ -88,7 +88,6 @@
 #define CONFIG_USB_POWER_DELIVERY
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_DUAL_ROLE
 
 #define CONFIG_USB_PD_LOGGING
diff --git a/board/eve/board.h b/board/eve/board.h
index b159e8a3e1..e8fa791505 100644
--- a/board/eve/board.h
+++ b/board/eve/board.h
@@ -156,7 +156,6 @@
 #define CONFIG_USB_CHARGER
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_DISCHARGE_TCPC
 #define CONFIG_USB_PD_DUAL_ROLE
 #define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE
diff --git a/board/fizz/board.h b/board/fizz/board.h
index 6e00fb092a..439870eb66 100644
--- a/board/fizz/board.h
+++ b/board/fizz/board.h
@@ -90,7 +90,6 @@
 #undef  CONFIG_USB_CHARGER		/* dnojiri: verify */
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_DISCHARGE_TCPC
 #define CONFIG_USB_PD_DUAL_ROLE
 #define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE
diff --git a/board/glados/board.h b/board/glados/board.h
index 507cbcd001..cec7d50abd 100644
--- a/board/glados/board.h
+++ b/board/glados/board.h
@@ -72,7 +72,6 @@
 #define CONFIG_USB_POWER_DELIVERY
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_DUAL_ROLE
 #define CONFIG_USB_PD_LOGGING
 #define CONFIG_USB_PD_PORT_COUNT 2
diff --git a/board/hoho/board.h b/board/hoho/board.h
index 748f777499..0698fe3f74 100644
--- a/board/hoho/board.h
+++ b/board/hoho/board.h
@@ -37,7 +37,6 @@
 #define CONFIG_USB_PD_HW_DEV_ID_BOARD_MAJOR USB_PD_HW_DEV_ID_HOHO
 #define CONFIG_USB_PD_HW_DEV_ID_BOARD_MINOR 2
 #define CONFIG_USB_PD_DUAL_ROLE
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_FLASH
 #define CONFIG_USB_PD_INTERNAL_COMP
 #define CONFIG_USB_PD_IDENTITY_HW_VERS 1
diff --git a/board/it83xx_evb/board.h b/board/it83xx_evb/board.h
index 4c4b0123f3..234d9fd5bc 100644
--- a/board/it83xx_evb/board.h
+++ b/board/it83xx_evb/board.h
@@ -36,7 +36,6 @@
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
 #define CONFIG_USB_PD_CHECK_MAX_REQUEST_ALLOWED
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_DUAL_ROLE
 #define CONFIG_USB_PD_PORT_COUNT    2
 #define CONFIG_USB_PD_TCPM_ITE83XX
diff --git a/board/kahlee/board.h b/board/kahlee/board.h
index e8eabc3447..224299768b 100644
--- a/board/kahlee/board.h
+++ b/board/kahlee/board.h
@@ -60,7 +60,6 @@
 #define CONFIG_CMD_PD_CONTROL
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_DUAL_ROLE
 #define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE
 #define CONFIG_USB_PD_DISCHARGE_TCPC
diff --git a/board/kevin/board.h b/board/kevin/board.h
index edd150bc7b..39c4c24f28 100644
--- a/board/kevin/board.h
+++ b/board/kevin/board.h
@@ -122,7 +122,6 @@
 #define CONFIG_USB_POWER_DELIVERY
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_DISCHARGE_GPIO
 #define CONFIG_USB_PD_DUAL_ROLE
 #define CONFIG_USB_PD_LOGGING
diff --git a/board/mchpevb1/board.h b/board/mchpevb1/board.h
index 9a5a6e580a..529bc5e35a 100644
--- a/board/mchpevb1/board.h
+++ b/board/mchpevb1/board.h
@@ -235,7 +235,6 @@
 #define CONFIG_USB_POWER_DELIVERY
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_DUAL_ROLE
 #define CONFIG_USB_PD_LOGGING
 #define CONFIG_USB_PD_PORT_COUNT 2
diff --git a/board/nami/board.h b/board/nami/board.h
index 8da4a78b32..7be262d8ae 100644
--- a/board/nami/board.h
+++ b/board/nami/board.h
@@ -144,7 +144,6 @@
 #define CONFIG_USB_CHARGER
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_DISCHARGE_TCPC
 #define CONFIG_USB_PD_DUAL_ROLE
 #define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE
diff --git a/board/nautilus/board.h b/board/nautilus/board.h
index de63c5a6cb..dace2d8480 100644
--- a/board/nautilus/board.h
+++ b/board/nautilus/board.h
@@ -138,7 +138,6 @@
 #define CONFIG_USB_CHARGER
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_DISCHARGE_TCPC
 #define CONFIG_USB_PD_DUAL_ROLE
 #define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE
diff --git a/board/oak/board.h b/board/oak/board.h
index 9828e4e9a0..f7324effe1 100644
--- a/board/oak/board.h
+++ b/board/oak/board.h
@@ -93,7 +93,6 @@
 #define CONFIG_USB_POWER_DELIVERY
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_DUAL_ROLE
 #define CONFIG_USB_PD_LOGGING
 #define CONFIG_USB_PD_PORT_COUNT 2
diff --git a/board/pdeval-stm32f072/board.h b/board/pdeval-stm32f072/board.h
index 9100ab1a94..7d25def826 100644
--- a/board/pdeval-stm32f072/board.h
+++ b/board/pdeval-stm32f072/board.h
@@ -24,7 +24,6 @@
 #define CONFIG_USB_POWER_DELIVERY
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_DUAL_ROLE
 #define CONFIG_USB_PD_PORT_COUNT 1
 #define CONFIG_USB_PD_TCPM_TCPCI
diff --git a/board/plankton/board.h b/board/plankton/board.h
index 590c6ef7f3..d42a76b0d6 100644
--- a/board/plankton/board.h
+++ b/board/plankton/board.h
@@ -20,7 +20,6 @@
 #define CONFIG_USB_POWER_DELIVERY
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_COMM_DISABLED
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_DUAL_ROLE
 #define CONFIG_USB_PD_DYNAMIC_SRC_CAP
 #define CONFIG_USB_PD_IDENTITY_HW_VERS 1
diff --git a/board/poppy/board.h b/board/poppy/board.h
index 724dc4d6b2..fbdf6e86e3 100644
--- a/board/poppy/board.h
+++ b/board/poppy/board.h
@@ -147,7 +147,6 @@
 #define CONFIG_USB_CHARGER
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_DISCHARGE_TCPC
 #define CONFIG_USB_PD_DUAL_ROLE
 #define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE
diff --git a/board/rainier/board.h b/board/rainier/board.h
index 8ef3ca745d..833352482d 100644
--- a/board/rainier/board.h
+++ b/board/rainier/board.h
@@ -87,7 +87,6 @@
 #define CONFIG_USB_POWER_DELIVERY
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_DISCHARGE_GPIO
 #define CONFIG_USB_PD_DUAL_ROLE
 #define CONFIG_USB_PD_PORT_COUNT 1
diff --git a/board/reef/board.h b/board/reef/board.h
index e4daa2491f..d9dfb78e92 100644
--- a/board/reef/board.h
+++ b/board/reef/board.h
@@ -79,7 +79,6 @@
 #define CONFIG_CMD_PD_CONTROL
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_DUAL_ROLE
 #define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE
 #define CONFIG_USB_PD_DISCHARGE_TCPC
diff --git a/board/reef_it8320/board.h b/board/reef_it8320/board.h
index d1af80fc6a..879130f4c3 100644
--- a/board/reef_it8320/board.h
+++ b/board/reef_it8320/board.h
@@ -69,7 +69,6 @@
 #define CONFIG_CMD_PD_CONTROL
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_DUAL_ROLE
 #define CONFIG_USB_PD_DISCHARGE_GPIO
 #define CONFIG_USB_PD_LOGGING
diff --git a/board/rowan/board.h b/board/rowan/board.h
index 07bdf64283..0477720fda 100644
--- a/board/rowan/board.h
+++ b/board/rowan/board.h
@@ -92,7 +92,6 @@
 #define CONFIG_USB_POWER_DELIVERY
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_DUAL_ROLE
 
 #define CONFIG_USB_PD_LOGGING
diff --git a/board/samus_pd/board.h b/board/samus_pd/board.h
index c8db6b054f..4df4038d02 100644
--- a/board/samus_pd/board.h
+++ b/board/samus_pd/board.h
@@ -56,7 +56,6 @@
 #define CONFIG_USB_PD_ALT_MODE_DFP
 #define CONFIG_USB_PD_CHECK_MAX_REQUEST_ALLOWED
 #define CONFIG_USB_PD_COMM_LOCKED
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_DUAL_ROLE
 #define CONFIG_USB_PD_TRY_SRC
 #define CONFIG_USB_PD_FLASH_ERASE_CHECK
diff --git a/board/scarlet/board.h b/board/scarlet/board.h
index a6f152840f..d7fe301b60 100644
--- a/board/scarlet/board.h
+++ b/board/scarlet/board.h
@@ -107,7 +107,6 @@
 #define CONFIG_USB_POWER_DELIVERY
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_DISCHARGE_GPIO
 #define CONFIG_USB_PD_DUAL_ROLE
 #define CONFIG_USB_PD_LOGGING
diff --git a/board/strago/board.h b/board/strago/board.h
index 7ca153ce07..b7faf53a12 100644
--- a/board/strago/board.h
+++ b/board/strago/board.h
@@ -38,7 +38,6 @@
 #define CONFIG_USB_POWER_DELIVERY
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_DUAL_ROLE
 #define CONFIG_USB_PD_PORT_COUNT 1
 #define CONFIG_USB_PD_TCPM_TCPCI
diff --git a/board/wheatley/board.h b/board/wheatley/board.h
index dd741c0fbc..1dbe7a2376 100644
--- a/board/wheatley/board.h
+++ b/board/wheatley/board.h
@@ -71,7 +71,6 @@
 #define CONFIG_USB_POWER_DELIVERY
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_DUAL_ROLE
 #define CONFIG_USB_PD_LOGGING
 #define CONFIG_USB_PD_PORT_COUNT 2
diff --git a/board/zinger/board.h b/board/zinger/board.h
index bad172948d..940eaf7a57 100644
--- a/board/zinger/board.h
+++ b/board/zinger/board.h
@@ -54,7 +54,6 @@
 #undef CONFIG_TASK_PROFILING
 #define CONFIG_USB_POWER_DELIVERY
 #define CONFIG_USB_PD_ALT_MODE
-#define CONFIG_USB_PD_CUSTOM_VDM
 #undef CONFIG_USB_PD_DUAL_ROLE
 #undef CONFIG_USB_PD_INTERNAL_COMP
 #define CONFIG_USB_PD_LOGGING
diff --git a/common/usb_pd_policy.c b/common/usb_pd_policy.c
index 01784e87ad..63e1b4811d 100644
--- a/common/usb_pd_policy.c
+++ b/common/usb_pd_policy.c
@@ -842,13 +842,6 @@ int pd_svdm(int port, int cnt, uint32_t *payload, uint32_t **rpayload)
 
 #endif /* CONFIG_USB_PD_ALT_MODE */
 
-#ifndef CONFIG_USB_PD_CUSTOM_VDM
-int pd_vdm(int port, int cnt, uint32_t *payload, uint32_t **rpayload)
-{
-	return 0;
-}
-#endif /* !CONFIG_USB_PD_CUSTOM_VDM */
-
 static void pd_usb_billboard_deferred(void)
 {
 #if defined(CONFIG_USB_PD_ALT_MODE) && !defined(CONFIG_USB_PD_ALT_MODE_DFP) \
diff --git a/include/config.h b/include/config.h
index 5ad8dd822f..76cc1646ca 100644
--- a/include/config.h
+++ b/include/config.h
@@ -2731,9 +2731,6 @@
  */
 #undef CONFIG_USB_PD_COMM_LOCKED
 
-/* Respond to custom vendor-defined messages over PD */
-#undef CONFIG_USB_PD_CUSTOM_VDM
-
 /* Default USB data role when a USB PD debug accessory is seen */
 #define CONFIG_USB_PD_DEBUG_DR PD_ROLE_DFP
 
diff --git a/test/test_config.h b/test/test_config.h
index 1239e3c394..57b2b413ce 100644
--- a/test/test_config.h
+++ b/test/test_config.h
@@ -175,7 +175,6 @@ int ncp15wb_calculate_temp(uint16_t adc);
 #if defined(TEST_USB_PD) || defined(TEST_USB_PD_GIVEBACK) || \
 	defined(TEST_USB_PD_REV30)
 #define CONFIG_USB_POWER_DELIVERY
-#define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_DUAL_ROLE
 #define CONFIG_USB_PD_PORT_COUNT 2
 #define CONFIG_USB_PD_TCPC
author	Divya Sasidharan <divya.s.sasidharan@intel.com>	2018-04-05 10:55:24 -0700
committer	chrome-bot <chrome-bot@chromium.org>	2018-04-09 15:19:00 -0700
commit	7e1ce92219a24dc35cb8eddad0da4180ddc8265f (patch)
tree	1671d694cf363bf2a2c6cfae22f735df0f0dcef4
parent	18096899bdd36a7bd8cc957e6d7aad9b9143e42d (diff)
download	chrome-ec-7e1ce92219a24dc35cb8eddad0da4180ddc8265f.tar.gz