On Tue, Oct 08, 2019 at 02:13:49PM +0300, Heikki Krogerus wrote:
> There are no more users for them.
>
> Signed-off-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> ---
> drivers/usb/typec/class.c | 40 +++++++++++----------------------------
> include/linux/usb/typec.h | 17 -----------------
> 2 files changed, 11 insertions(+), 46 deletions(-)
>
> diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c
> index 11ed3dc6fc49..3e9fa2530b86 100644
> --- a/drivers/usb/typec/class.c
> +++ b/drivers/usb/typec/class.c
> @@ -52,7 +52,6 @@ struct typec_port {
> 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;
> };
> @@ -957,7 +956,7 @@ preferred_role_store(struct device *dev, struct device_attribute *attr,
> 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;
> }
> @@ -970,10 +969,7 @@ preferred_role_store(struct device *dev, struct device_attribute *attr,
> 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;
>
> @@ -1004,7 +1000,7 @@ static ssize_t data_role_store(struct device *dev,
> 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;
> }
> @@ -1019,10 +1015,7 @@ static ssize_t data_role_store(struct device *dev,
> 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;
>
> @@ -1057,7 +1050,7 @@ static ssize_t power_role_store(struct device *dev,
> 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;
> }
> @@ -1079,10 +1072,7 @@ static ssize_t power_role_store(struct device *dev,
> 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;
>
> @@ -1113,8 +1103,8 @@ port_type_store(struct device *dev, struct device_attribute *attr,
> 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;
> }
> @@ -1131,10 +1121,7 @@ port_type_store(struct device *dev, struct device_attribute *attr,
> 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;
>
> @@ -1190,7 +1177,7 @@ static ssize_t vconn_source_store(struct device *dev,
> 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;
> }
> @@ -1199,11 +1186,7 @@ static ssize_t vconn_source_store(struct device *dev,
> 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;
>
> @@ -1610,7 +1593,6 @@ struct typec_port *typec_register_port(struct device *parent,
>
> port->id = id;
> port->ops = cap->ops;
> - port->orig_cap = cap;
> port->port_type = cap->type;
> port->prefer_role = cap->prefer_role;
> port->cap = kmemdup(cap, sizeof(*cap), GFP_KERNEL);
> diff --git a/include/linux/usb/typec.h b/include/linux/usb/typec.h
> index c9bef128453b..894798084319 100644
> --- a/include/linux/usb/typec.h
> +++ b/include/linux/usb/typec.h
> @@ -198,11 +198,6 @@ struct typec_operations {
> * @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.
> */
> @@ -220,18 +215,6 @@ struct typec_capability {
> 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. */
> --
> 2.23.0
>
