AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-17 07:36:50 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

usb: typec: tcpm: Start using struct typec_operations

Browse Source 
Supplying the operation callbacks as part of a struct
typec_operations instead of as part of struct
typec_capability during port registration.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20191104142435.29960-5-heikki.krogerus@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Heikki Krogerus 2019-11-04 17:24:21 +03:00 committed by Greg Kroah-Hartman
parent 46310e4dad
commit 00ec21e58d
1 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/usb/typec/tcpm/tcpm.c
View File

@ -390,12 +390,6 @@ static enum tcpm_state tcpm_default_state(struct tcpm_port *port)
return SRC_UNATTACHED;
}
static inline
struct tcpm_port *typec_cap_to_tcpm(const struct typec_capability *cap)
{
return container_of(cap, struct tcpm_port, typec_caps);
}
static bool tcpm_port_is_disconnected(struct tcpm_port *port)
{
return (!port->attached && port->cc1 == TYPEC_CC_OPEN &&
@ -3970,10 +3964,9 @@ void tcpm_pd_hard_reset(struct tcpm_port *port)
}
EXPORT_SYMBOL_GPL(tcpm_pd_hard_reset);
static int tcpm_dr_set(const struct typec_capability *cap,
enum typec_data_role data)
static int tcpm_dr_set(struct typec_port *p, enum typec_data_role data)
{
struct tcpm_port *port = typec_cap_to_tcpm(cap);
struct tcpm_port *port = typec_get_drvdata(p);
int ret;
mutex_lock(&port->swap_lock);
@ -4038,10 +4031,9 @@ static int tcpm_dr_set(const struct typec_capability *cap,
return ret;
}
static int tcpm_pr_set(const struct typec_capability *cap,
enum typec_role role)
static int tcpm_pr_set(struct typec_port *p, enum typec_role role)
{
struct tcpm_port *port = typec_cap_to_tcpm(cap);
struct tcpm_port *port = typec_get_drvdata(p);
int ret;
mutex_lock(&port->swap_lock);
@ -4082,10 +4074,9 @@ static int tcpm_pr_set(const struct typec_capability *cap,
return ret;
}
static int tcpm_vconn_set(const struct typec_capability *cap,
enum typec_role role)
static int tcpm_vconn_set(struct typec_port *p, enum typec_role role)
{
struct tcpm_port *port = typec_cap_to_tcpm(cap);
struct tcpm_port *port = typec_get_drvdata(p);
int ret;
mutex_lock(&port->swap_lock);
@ -4122,9 +4113,9 @@ static int tcpm_vconn_set(const struct typec_capability *cap,
return ret;
}
static int tcpm_try_role(const struct typec_capability *cap, int role)
static int tcpm_try_role(struct typec_port *p, int role)
{
struct tcpm_port *port = typec_cap_to_tcpm(cap);
struct tcpm_port *port = typec_get_drvdata(p);
struct tcpc_dev *tcpc = port->tcpc;
int ret = 0;
@ -4331,10 +4322,9 @@ static void tcpm_init(struct tcpm_port *port)
tcpm_set_state(port, PORT_RESET, 0);
}
static int tcpm_port_type_set(const struct typec_capability *cap,
enum typec_port_type type)
static int tcpm_port_type_set(struct typec_port *p, enum typec_port_type type)
{
struct tcpm_port *port = typec_cap_to_tcpm(cap);
struct tcpm_port *port = typec_get_drvdata(p);
mutex_lock(&port->lock);
if (type == port->port_type)
@ -4359,6 +4349,14 @@ static int tcpm_port_type_set(const struct typec_capability *cap,
return 0;
}
static const struct typec_operations tcpm_ops = {
.try_role = tcpm_try_role,
.dr_set = tcpm_dr_set,
.pr_set = tcpm_pr_set,
.vconn_set = tcpm_vconn_set,
.port_type_set = tcpm_port_type_set
};
void tcpm_tcpc_reset(struct tcpm_port *port)
{
mutex_lock(&port->lock);
@ -4772,11 +4770,8 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
port->typec_caps.fwnode = tcpc->fwnode;
port->typec_caps.revision = 0x0120; /* Type-C spec release 1.2 */
port->typec_caps.pd_revision = 0x0300; /* USB-PD spec release 3.0 */
port->typec_caps.dr_set = tcpm_dr_set;
port->typec_caps.pr_set = tcpm_pr_set;
port->typec_caps.vconn_set = tcpm_vconn_set;
port->typec_caps.try_role = tcpm_try_role;
port->typec_caps.port_type_set = tcpm_port_type_set;
port->typec_caps.driver_data = port;
port->typec_caps.ops = &tcpm_ops;
port->partner_desc.identity = &port->partner_ident;
port->port_type = port->typec_caps.type;