[SRU][R][PATCH 2/6] Revert "usb: typec: ucsi: Add duplicate detection to nvidia registration path"

[AceLan Kao]

From: "Chia-Lin Kao (AceLan)" <acelan.kao at canonical.com>

BugLink: https://bugs.launchpad.net/bugs/2162695

This reverts commit 7d150034c77fc9b700357b32bc3eccc2334b0c1f.

Signed-off-by: Chia-Lin Kao (AceLan) <acelan.kao at canonical.com>
---
 drivers/usb/typec/ucsi/ucsi.c | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index 793bbb7a7fcfc..2fe264c910598 100644
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -590,25 +590,19 @@ ucsi_register_altmodes_nvidia(struct ucsi_connector *con, u8 recipient)
 
 	/* now register altmodes */
 	for (i = 0; i < max_altmodes; i++) {
-		struct ucsi_altmode *altmode_array = multi_dp ? updated : orig;
-
-		if (!altmode_array[i].svid)
-			return 0;
-
-		/*
-		 * Check for duplicates in current array and already
-		 * registered altmodes. Skip if duplicate found.
-		 */
-		if (ucsi_altmode_is_duplicate(con, recipient, altmode_array, i,
-					      altmode_array[i].svid,
-					      altmode_array[i].mid, i))
-			continue;
-
 		memset(&desc, 0, sizeof(desc));
-		desc.svid = altmode_array[i].svid;
-		desc.vdo = altmode_array[i].mid;
+		if (multi_dp) {
+			desc.svid = updated[i].svid;
+			desc.vdo = updated[i].mid;
+		} else {
+			desc.svid = orig[i].svid;
+			desc.vdo = orig[i].mid;
+		}
 		desc.roles = TYPEC_PORT_DRD;
 
+		if (!desc.svid)
+			return 0;
+
 		ret = ucsi_register_altmode(con, &desc, recipient);
 		if (ret)
 			return ret;
-- 
2.53.0