struct typec_switch *sw;
struct typec_mux *mux;
- const struct typec_capability *orig_cap; /* to be removed */
const struct typec_capability *cap;
const struct typec_operations *ops;
};
return -EOPNOTSUPP;
}
- if (!port->cap->try_role && (!port->ops || !port->ops->try_role)) {
+ if (!port->ops || !port->ops->try_role) {
dev_dbg(dev, "Setting preferred role not supported\n");
return -EOPNOTSUPP;
}
return -EINVAL;
}
- if (port->ops && port->ops->try_role)
- ret = port->ops->try_role(port, role);
- else
- ret = port->cap->try_role(port->orig_cap, role);
+ ret = port->ops->try_role(port, role);
if (ret)
return ret;
struct typec_port *port = to_typec_port(dev);
int ret;
- if (!port->cap->dr_set && (!port->ops || !port->ops->dr_set)) {
+ if (!port->ops || !port->ops->dr_set) {
dev_dbg(dev, "data role swapping not supported\n");
return -EOPNOTSUPP;
}
goto unlock_and_ret;
}
- if (port->ops && port->ops->dr_set)
- ret = port->ops->dr_set(port, ret);
- else
- ret = port->cap->dr_set(port->orig_cap, ret);
+ ret = port->ops->dr_set(port, ret);
if (ret)
goto unlock_and_ret;
return -EOPNOTSUPP;
}
- if (!port->cap->pr_set && (!port->ops || !port->ops->pr_set)) {
+ if (!port->ops || !port->ops->pr_set) {
dev_dbg(dev, "power role swapping not supported\n");
return -EOPNOTSUPP;
}
goto unlock_and_ret;
}
- if (port->ops && port->ops->dr_set)
- ret = port->ops->pr_set(port, ret);
- else
- ret = port->cap->pr_set(port->orig_cap, ret);
+ ret = port->ops->pr_set(port, ret);
if (ret)
goto unlock_and_ret;
int ret;
enum typec_port_type type;
- if (port->cap->type != TYPEC_PORT_DRP || (!port->cap->port_type_set &&
- (!port->ops || !port->ops->port_type_set))) {
+ if (port->cap->type != TYPEC_PORT_DRP ||
+ !port->ops || !port->ops->port_type_set) {
dev_dbg(dev, "changing port type not supported\n");
return -EOPNOTSUPP;
}
goto unlock_and_ret;
}
- if (port->ops && port->ops->port_type_set)
- ret = port->ops->port_type_set(port, type);
- else
- ret = port->cap->port_type_set(port->orig_cap, type);
+ ret = port->ops->port_type_set(port, type);
if (ret)
goto unlock_and_ret;
return -EOPNOTSUPP;
}
- if (!port->cap->vconn_set && (!port->ops || !port->ops->vconn_set)) {
+ if (!port->ops || !port->ops->vconn_set) {
dev_dbg(dev, "VCONN swapping not supported\n");
return -EOPNOTSUPP;
}
if (ret)
return ret;
- if (port->ops && port->ops->vconn_set)
- ret = port->ops->vconn_set(port, (enum typec_role)source);
- else
- ret = port->cap->vconn_set(port->orig_cap,
- (enum typec_role)source);
+ ret = port->ops->vconn_set(port, (enum typec_role)source);
if (ret)
return ret;
port->id = id;
port->ops = cap->ops;
- port->orig_cap = cap;
port->port_type = cap->type;
port->prefer_role = cap->prefer_role;
* @fwnode: Optional fwnode of the port
* @driver_data: Private pointer for driver specific info
* @ops: Port operations vector
- * @try_role: Set data role preference for DRP port
- * @dr_set: Set Data Role
- * @pr_set: Set Power Role
- * @vconn_set: Set VCONN Role
- * @port_type_set: Set port type
*
* Static capabilities of a single USB Type-C port.
*/
void *driver_data;
const struct typec_operations *ops;
-
- int (*try_role)(const struct typec_capability *,
- int role);
-
- int (*dr_set)(const struct typec_capability *,
- enum typec_data_role);
- int (*pr_set)(const struct typec_capability *,
- enum typec_role);
- int (*vconn_set)(const struct typec_capability *,
- enum typec_role);
- int (*port_type_set)(const struct typec_capability *,
- enum typec_port_type);
};
/* Specific to try_role(). Indicates the user want's to clear the preference. */