Merge tag 'usb-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[thirdparty/linux.git] / drivers / usb / typec / altmodes / displayport.c

diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c
index 867f9796f8a841c5bb4d82f43d18dc24195c65e4..038dc51f429dda5146cb0d92d8146880c39d2b61 100644 (file)
--- a/drivers/usb/typec/altmodes/displayport.c
+++ b/drivers/usb/typec/altmodes/displayport.c
@@ -703,16 +703,21 @@ static ssize_t hpd_show(struct device *dev, struct device_attribute *attr, char
 }
 static DEVICE_ATTR_RO(hpd);
 
-static struct attribute *dp_altmode_attrs[] = {
+static struct attribute *displayport_attrs[] = {
        &dev_attr_configuration.attr,
        &dev_attr_pin_assignment.attr,
        &dev_attr_hpd.attr,
        NULL
 };
 
-static const struct attribute_group dp_altmode_group = {
+static const struct attribute_group displayport_group = {
        .name = "displayport",
-       .attrs = dp_altmode_attrs,
+       .attrs = displayport_attrs,
+};
+
+static const struct attribute_group *displayport_groups[] = {
+       &displayport_group,
+       NULL,
 };
 
 int dp_altmode_probe(struct typec_altmode *alt)
@@ -721,7 +726,6 @@ int dp_altmode_probe(struct typec_altmode *alt)
        struct typec_altmode *plug = typec_altmode_get_plug(alt, TYPEC_PLUG_SOP_P);
        struct fwnode_handle *fwnode;
        struct dp_altmode *dp;
-       int ret;
 
        /* FIXME: Port can only be DFP_U. */
 
@@ -732,10 +736,6 @@ int dp_altmode_probe(struct typec_altmode *alt)
              DP_CAP_PIN_ASSIGN_DFP_D(alt->vdo)))
                return -ENODEV;
 
-       ret = sysfs_create_group(&alt->dev.kobj, &dp_altmode_group);
-       if (ret)
-               return ret;
-
        dp = devm_kzalloc(&alt->dev, sizeof(*dp), GFP_KERNEL);
        if (!dp)
                return -ENOMEM;
@@ -778,7 +778,6 @@ void dp_altmode_remove(struct typec_altmode *alt)
 {
        struct dp_altmode *dp = typec_altmode_get_drvdata(alt);
 
-       sysfs_remove_group(&alt->dev.kobj, &dp_altmode_group);
        cancel_work_sync(&dp->work);
        typec_altmode_put_plug(dp->plug_prime);
 
@@ -804,6 +803,7 @@ static struct typec_altmode_driver dp_altmode_driver = {
        .driver = {
                .name = "typec_displayport",
                .owner = THIS_MODULE,
+               .dev_groups = displayport_groups,
        },
 };
 module_typec_altmode_driver(dp_altmode_driver);