Unverified Commit 68f5ad9b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8658 usb: typec: altmodes/displayport: create sysfs nodes as driver's... 

!8658  usb: typec: altmodes/displayport: create sysfs nodes as driver's default device attribute group

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhang Changzhong <zhangchangzhong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/WSQUMFKJA35CWRKX3QEE27JLAAXTSQ5C/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9Q8ZK 
 
Link:https://gitee.com/openeuler/kernel/pulls/8658

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 4a047672 ebf08935

drivers/usb/typec/altmodes/displayport.c

+9 −9
Original line number Diff line number Diff line
@@ -512,22 +512,26 @@ static ssize_t pin_assignment_show(struct device *dev, 
}

static DEVICE_ATTR_RW(pin_assignment);



static struct attribute *dp_altmode_attrs[] = {

static struct attribute *displayport_attrs[] = {

	&dev_attr_configuration.attr,

	&dev_attr_pin_assignment.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)

{

	const struct typec_altmode *port = typec_altmode_get_partner(alt);

	struct dp_altmode *dp;

	int ret;



	/* FIXME: Port can only be DFP_U. */
@@ -538,10 +542,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;
@@ -567,7 +567,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);

}

EXPORT_SYMBOL_GPL(dp_altmode_remove);
@@ -585,6 +584,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);