Commit aecb1e45 authored by Badhri Jagan Sridharan's avatar Badhri Jagan Sridharan Committed by Greg Kroah-Hartman
Browse files

usb: typec: tcpci: Refactor tcpc_presenting_cc1_rd macro 

Defining one macro instead of two for tcpc_presenting_*_rd.
This is a follow up of the comment left by Heikki Krogerus.

https://patchwork.kernel.org/project/linux-usb/patch/


20210304070931.1947316-1-badhri@google.com/

Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarBadhri Jagan Sridharan <badhri@google.com>
Link: https://lore.kernel.org/r/20210310223536.3471243-1-badhri@google.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 60a35ba9

drivers/usb/typec/tcpm/tcpci.c

+5 −9
Original line number Diff line number Diff line
@@ -24,14 +24,10 @@ 
#define	AUTO_DISCHARGE_PD_HEADROOM_MV		850

#define	AUTO_DISCHARGE_PPS_HEADROOM_MV		1250



#define tcpc_presenting_cc1_rd(reg) \

#define tcpc_presenting_rd(reg, cc) \

	(!(TCPC_ROLE_CTRL_DRP & (reg)) && \

	 (((reg) & (TCPC_ROLE_CTRL_CC1_MASK << TCPC_ROLE_CTRL_CC1_SHIFT)) == \

	  (TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC1_SHIFT)))

#define tcpc_presenting_cc2_rd(reg) \

	(!(TCPC_ROLE_CTRL_DRP & (reg)) && \

	 (((reg) & (TCPC_ROLE_CTRL_CC2_MASK << TCPC_ROLE_CTRL_CC2_SHIFT)) == \

	  (TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC2_SHIFT)))

	 (((reg) & (TCPC_ROLE_CTRL_## cc ##_MASK << TCPC_ROLE_CTRL_## cc ##_SHIFT)) == \

	  (TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_## cc ##_SHIFT)))



struct tcpci {

	struct device *dev;
@@ -201,11 +197,11 @@ static int tcpci_get_cc(struct tcpc_dev *tcpc, 
	*cc1 = tcpci_to_typec_cc((reg >> TCPC_CC_STATUS_CC1_SHIFT) &

				 TCPC_CC_STATUS_CC1_MASK,

				 reg & TCPC_CC_STATUS_TERM ||

				 tcpc_presenting_cc1_rd(role_control));

				 tcpc_presenting_rd(role_control, CC1));

	*cc2 = tcpci_to_typec_cc((reg >> TCPC_CC_STATUS_CC2_SHIFT) &

				 TCPC_CC_STATUS_CC2_MASK,

				 reg & TCPC_CC_STATUS_TERM ||

				 tcpc_presenting_cc2_rd(role_control));

				 tcpc_presenting_rd(role_control, CC2));



	return 0;

}