| Message ID | 20240710-tcpc-cleanup-v1-6-0ec1f41f4263@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | aee4568f42e0d7526207a10944bb89bb45522b59 |
| Headers | show |
| Series | usb: typec: tcpci: few TCPCi & TCPCi-Maxim cleanups (mostly genmask()) | expand |
On Wed, Jul 10, 2024 at 11:36:13AM +0100, André Draszik wrote: > 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> > --- > drivers/usb/typec/tcpm/tcpci.c | 2 +- > include/linux/usb/tcpci.h | 3 +-- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c > index 5ad05a5bbbd1..ad5c9d5bf6a9 100644 > --- 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 80652d4f722e..3cd61e9f73b3 100644 > --- 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) > > -- > 2.45.2.803.g4e1b14247a-goog
diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c index 5ad05a5bbbd1..ad5c9d5bf6a9 100644 --- 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 80652d4f722e..3cd61e9f73b3 100644 --- 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)
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> --- drivers/usb/typec/tcpm/tcpci.c | 2 +- include/linux/usb/tcpci.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)