usb: typec: tcpci: use GENMASK() for TCPC_MSG_HDR_INFO_REV

Convert field TCPC_MSG_HDR_INFO_REV from register TCPC_MSG_HDR_INFO to
using GENMASK() and FIELD_PREP() so as to keep using a similar approach
for all fields.

Signed-off-by: André Draszik <andre.draszik@linaro.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20240710-tcpc-cleanup-v1-6-0ec1f41f4263@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c
index 9477ee813fa5dfcea12046a80bc914adba9d5998..929d0b7c64ca1bdef2214d7e785565e55a856b78 100644 (file)
--- a/drivers/usb/typec/tcpm/tcpci.c
+++ b/drivers/usb/typec/tcpm/tcpci.c
@@ -456,7 +456,7 @@ static int tcpci_set_roles(struct tcpc_dev *tcpc, bool attached,
        unsigned int reg;
        int ret;
 
-       reg = PD_REV20 << TCPC_MSG_HDR_INFO_REV_SHIFT;
+       reg = FIELD_PREP(TCPC_MSG_HDR_INFO_REV, PD_REV20);
        if (role == TYPEC_SOURCE)
                reg |= TCPC_MSG_HDR_INFO_PWR_ROLE;
        if (data == TYPEC_HOST)

diff --git a/include/linux/usb/tcpci.h b/include/linux/usb/tcpci.h
index 80652d4f722ecc7b3f30652e86938139366c7058..3cd61e9f73b32369d307ca1ecc8e0800053960e8 100644 (file)
--- a/include/linux/usb/tcpci.h
+++ b/include/linux/usb/tcpci.h
@@ -129,9 +129,8 @@
 
 #define TCPC_MSG_HDR_INFO              0x2e
 #define TCPC_MSG_HDR_INFO_DATA_ROLE    BIT(3)
+#define TCPC_MSG_HDR_INFO_REV          GENMASK(2, 1)
 #define TCPC_MSG_HDR_INFO_PWR_ROLE     BIT(0)
-#define TCPC_MSG_HDR_INFO_REV_SHIFT    1
-#define TCPC_MSG_HDR_INFO_REV_MASK     0x3
 
 #define TCPC_RX_DETECT                 0x2f
 #define TCPC_RX_DETECT_HARD_RESET      BIT(5)