On Fri, Apr 19, 2024 at 09:16:48PM +0000, Jameson Thies wrote:
> From: Abhishek Pandit-Subedi <abhishekpandit@xxxxxxxxxxxx>
>
> When adding altmode ops, update the sysfs group so that visibility is
> also recalculated.
>
> Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@xxxxxxxxxxxx>
Reviewed-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
> ---
> drivers/usb/typec/altmodes/displayport.c | 2 +-
> drivers/usb/typec/class.c | 18 +++++++++++++++++-
> drivers/usb/typec/ucsi/displayport.c | 2 +-
> include/linux/usb/typec.h | 3 +++
> 4 files changed, 22 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c
> index 596cd4806018b..92cc1b1361208 100644
> --- a/drivers/usb/typec/altmodes/displayport.c
> +++ b/drivers/usb/typec/altmodes/displayport.c
> @@ -746,7 +746,7 @@ int dp_altmode_probe(struct typec_altmode *alt)
> dp->alt = alt;
>
> alt->desc = "DisplayPort";
> - alt->ops = &dp_altmode_ops;
> + typec_altmode_set_ops(alt, &dp_altmode_ops);
>
> if (plug) {
> plug->desc = "Displayport";
> diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c
> index 9610e647a8d48..9262fcd4144f8 100644
> --- a/drivers/usb/typec/class.c
> +++ b/drivers/usb/typec/class.c
> @@ -467,6 +467,22 @@ static const struct attribute_group *typec_altmode_groups[] = {
> NULL
> };
>
> +/**
> + * typec_altmode_set_ops - Set ops for altmode
> + * @adev: Handle to the alternate mode
> + * @ops: Ops for the alternate mode
> + *
> + * After setting ops, attribute visiblity needs to be refreshed if the alternate
> + * mode can be activated.
> + */
> +void typec_altmode_set_ops(struct typec_altmode *adev,
> + const struct typec_altmode_ops *ops)
> +{
> + adev->ops = ops;
> + sysfs_update_group(&adev->dev.kobj, &typec_altmode_group);
> +}
> +EXPORT_SYMBOL_GPL(typec_altmode_set_ops);
> +
> static int altmode_id_get(struct device *dev)
> {
> struct ida *ids;
> @@ -2317,7 +2333,7 @@ void typec_port_register_altmodes(struct typec_port *port,
> continue;
> }
>
> - alt->ops = ops;
> + typec_altmode_set_ops(alt, ops);
> typec_altmode_set_drvdata(alt, drvdata);
> altmodes[index] = alt;
> index++;
> diff --git a/drivers/usb/typec/ucsi/displayport.c b/drivers/usb/typec/ucsi/displayport.c
> index d9d3c91125ca8..eb7b8d6e47d00 100644
> --- a/drivers/usb/typec/ucsi/displayport.c
> +++ b/drivers/usb/typec/ucsi/displayport.c
> @@ -337,7 +337,7 @@ struct typec_altmode *ucsi_register_displayport(struct ucsi_connector *con,
> dp->con = con;
> dp->alt = alt;
>
> - alt->ops = &ucsi_displayport_ops;
> + typec_altmode_set_ops(alt, &ucsi_displayport_ops);
> typec_altmode_set_drvdata(alt, dp);
>
> return alt;
> diff --git a/include/linux/usb/typec.h b/include/linux/usb/typec.h
> index b35b427561ab5..549275f8ac1b3 100644
> --- a/include/linux/usb/typec.h
> +++ b/include/linux/usb/typec.h
> @@ -167,6 +167,9 @@ struct typec_port *typec_altmode2port(struct typec_altmode *alt);
>
> void typec_altmode_update_active(struct typec_altmode *alt, bool active);
>
> +void typec_altmode_set_ops(struct typec_altmode *alt,
> + const struct typec_altmode_ops *ops);
> +
> enum typec_plug_index {
> TYPEC_PLUG_SOP_P,
> TYPEC_PLUG_SOP_PP,
> --
> 2.44.0.769.g3c40516874-goog
--
heikki
