On Tue, Oct 08, 2019 at 02:13:48PM +0300, Heikki Krogerus wrote:
> Supplying the operation callbacks as part of a struct
> typec_operations instead of as part of struct
> typec_capability during port registration. After this there
> is not need to keep the capabilities stored anywhere in the
> driver.
>
> Signed-off-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> ---
> drivers/usb/typec/hd3ss3220.c | 24 +++++++++++++-----------
> 1 file changed, 13 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/usb/typec/hd3ss3220.c b/drivers/usb/typec/hd3ss3220.c
> index 1900910c637e..7c3ee9d28670 100644
> --- a/drivers/usb/typec/hd3ss3220.c
> +++ b/drivers/usb/typec/hd3ss3220.c
> @@ -38,7 +38,6 @@ struct hd3ss3220 {
> struct regmap *regmap;
> struct usb_role_switch *role_sw;
> struct typec_port *port;
> - struct typec_capability typec_cap;
> };
>
> static int hd3ss3220_set_source_pref(struct hd3ss3220 *hd3ss3220, int src_pref)
> @@ -74,11 +73,9 @@ static enum usb_role hd3ss3220_get_attached_state(struct hd3ss3220 *hd3ss3220)
> return attached_state;
> }
>
> -static int hd3ss3220_dr_set(const struct typec_capability *cap,
> - enum typec_data_role role)
> +static int hd3ss3220_dr_set(struct typec_port *port, enum typec_data_role role)
> {
> - struct hd3ss3220 *hd3ss3220 = container_of(cap, struct hd3ss3220,
> - typec_cap);
> + struct hd3ss3220 *hd3ss3220 = typec_get_drvdata(port);
> enum usb_role role_val;
> int pref, ret = 0;
>
> @@ -99,6 +96,10 @@ static int hd3ss3220_dr_set(const struct typec_capability *cap,
> return ret;
> }
>
> +static const struct typec_operations hd3ss3220_ops = {
> + .dr_set = hd3ss3220_dr_set
> +};
> +
> static void hd3ss3220_set_role(struct hd3ss3220 *hd3ss3220)
> {
> enum usb_role role_state = hd3ss3220_get_attached_state(hd3ss3220);
> @@ -153,6 +154,7 @@ static const struct regmap_config config = {
> static int hd3ss3220_probe(struct i2c_client *client,
> const struct i2c_device_id *id)
> {
> + struct typec_capability typec_cap = { };
> struct hd3ss3220 *hd3ss3220;
> struct fwnode_handle *connector;
> int ret;
> @@ -181,13 +183,13 @@ static int hd3ss3220_probe(struct i2c_client *client,
> if (IS_ERR_OR_NULL(hd3ss3220->role_sw))
> return PTR_ERR(hd3ss3220->role_sw);
>
> - hd3ss3220->typec_cap.prefer_role = TYPEC_NO_PREFERRED_ROLE;
> - hd3ss3220->typec_cap.dr_set = hd3ss3220_dr_set;
> - hd3ss3220->typec_cap.type = TYPEC_PORT_DRP;
> - hd3ss3220->typec_cap.data = TYPEC_PORT_DRD;
> + typec_cap.prefer_role = TYPEC_NO_PREFERRED_ROLE;
> + typec_cap.driver_data = hd3ss3220;
> + typec_cap.type = TYPEC_PORT_DRP;
> + typec_cap.data = TYPEC_PORT_DRD;
> + typec_cap.ops = &hd3ss3220_ops;
>
> - hd3ss3220->port = typec_register_port(&client->dev,
> - &hd3ss3220->typec_cap);
> + hd3ss3220->port = typec_register_port(&client->dev, &typec_cap);
> if (IS_ERR(hd3ss3220->port))
> return PTR_ERR(hd3ss3220->port);
>
> --
> 2.23.0
>
