usb: typec: Use FIELD_MODIFY()

Use FIELD_MODIFY() to remove open-coded bit manipulation.
No functional change intended.

Signed-off-by: Hans Zhang <18255117159@163.com>
Link: https://patch.msgid.link/20260430163919.47372-7-18255117159@163.com
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 0148b8f50412b05e6514f46f372c08c77101ac0c..24c87dfa6b64f837050120aeee145357eaf209f4 100644 (file)
--- a/drivers/usb/typec/tcpm/tcpci.c
+++ b/drivers/usb/typec/tcpm/tcpci.c
@@ -141,13 +141,10 @@ static int tcpci_set_cc(struct tcpc_dev *tcpc, enum typec_cc_status cc)
        }
 
        if (vconn_pres) {
-               if (polarity == TYPEC_POLARITY_CC2) {
-                       reg &= ~TCPC_ROLE_CTRL_CC1;
-                       reg |= FIELD_PREP(TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_OPEN);
-               } else {
-                       reg &= ~TCPC_ROLE_CTRL_CC2;
-                       reg |= FIELD_PREP(TCPC_ROLE_CTRL_CC2, TCPC_ROLE_CTRL_CC_OPEN);
-               }
+               if (polarity == TYPEC_POLARITY_CC2)
+                       FIELD_MODIFY(TCPC_ROLE_CTRL_CC1, &reg, TCPC_ROLE_CTRL_CC_OPEN);
+               else
+                       FIELD_MODIFY(TCPC_ROLE_CTRL_CC2, &reg, TCPC_ROLE_CTRL_CC_OPEN);
        }
 
        ret = regmap_write(tcpci->regmap, TCPC_ROLE_CTRL, reg);