usb: typec: ucsi: Clean up UCSI_CABLE_PROP macros

[ Upstream commit 4d0a5a9915793377c0fe1a8d78de6bcd92cea963 ]

Clean up UCSI_CABLE_PROP macros by fixing a bitmask shifting error for
plug type and updating the modal support macro for consistent naming.

Fixes: 3cf657f07918 ("usb: typec: ucsi: Remove all bit-fields")
Cc: stable@vger.kernel.org
Reviewed-by: Benson Leung <bleung@chromium.org>
Reviewed-by: Prashant Malani <pmalani@chromium.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Jameson Thies <jthies@google.com>
Link: https://lore.kernel.org/r/20240305025804.1290919-2-jthies@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h
index cee666790907efeff19af8744f34452440068f7c..3dc3da8dbbdf8c9ed833d0b64a1a88e353dcf9a9 100644 (file)
--- a/drivers/usb/typec/ucsi/ucsi.h
+++ b/drivers/usb/typec/ucsi/ucsi.h
@@ -220,12 +220,12 @@ struct ucsi_cable_property {
 #define UCSI_CABLE_PROP_FLAG_VBUS_IN_CABLE     BIT(0)
 #define UCSI_CABLE_PROP_FLAG_ACTIVE_CABLE      BIT(1)
 #define UCSI_CABLE_PROP_FLAG_DIRECTIONALITY    BIT(2)
-#define UCSI_CABLE_PROP_FLAG_PLUG_TYPE(_f_)    ((_f_) & GENMASK(3, 0))
+#define UCSI_CABLE_PROP_FLAG_PLUG_TYPE(_f_)    (((_f_) & GENMASK(4, 3)) >> 3)
 #define   UCSI_CABLE_PROPERTY_PLUG_TYPE_A      0
 #define   UCSI_CABLE_PROPERTY_PLUG_TYPE_B      1
 #define   UCSI_CABLE_PROPERTY_PLUG_TYPE_C      2
 #define   UCSI_CABLE_PROPERTY_PLUG_OTHER       3
-#define UCSI_CABLE_PROP_MODE_SUPPORT           BIT(5)
+#define UCSI_CABLE_PROP_FLAG_MODE_SUPPORT      BIT(5)
        u8 latency;
 } __packed;