Commit 8c05f50f authored by Sudeep Holla's avatar Sudeep Holla Committed by Jens Wiklander

tee: avoid explicit sysfs_create/delete_group by initialising dev->groups

If the dev->groups is initialised, the sysfs group is created as part
of device_add call. There is no need to call sysfs_create/delete_group
explicitly.
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarJens Wiklander <jens.wiklander@linaro.org>
parent ab3d8e1b
...@@ -962,9 +962,7 @@ static struct attribute *tee_dev_attrs[] = { ...@@ -962,9 +962,7 @@ static struct attribute *tee_dev_attrs[] = {
NULL NULL
}; };
static const struct attribute_group tee_dev_group = { ATTRIBUTE_GROUPS(tee_dev);
.attrs = tee_dev_attrs,
};
/** /**
* tee_device_register() - Registers a TEE device * tee_device_register() - Registers a TEE device
...@@ -984,6 +982,8 @@ int tee_device_register(struct tee_device *teedev) ...@@ -984,6 +982,8 @@ int tee_device_register(struct tee_device *teedev)
return -EINVAL; return -EINVAL;
} }
teedev->dev.groups = tee_dev_groups;
rc = cdev_device_add(&teedev->cdev, &teedev->dev); rc = cdev_device_add(&teedev->cdev, &teedev->dev);
if (rc) { if (rc) {
dev_err(&teedev->dev, dev_err(&teedev->dev,
...@@ -993,19 +993,8 @@ int tee_device_register(struct tee_device *teedev) ...@@ -993,19 +993,8 @@ int tee_device_register(struct tee_device *teedev)
return rc; return rc;
} }
rc = sysfs_create_group(&teedev->dev.kobj, &tee_dev_group);
if (rc) {
dev_err(&teedev->dev,
"failed to create sysfs attributes, err=%d\n", rc);
goto err_sysfs_create_group;
}
teedev->flags |= TEE_DEVICE_FLAG_REGISTERED; teedev->flags |= TEE_DEVICE_FLAG_REGISTERED;
return 0; return 0;
err_sysfs_create_group:
cdev_device_del(&teedev->cdev, &teedev->dev);
return rc;
} }
EXPORT_SYMBOL_GPL(tee_device_register); EXPORT_SYMBOL_GPL(tee_device_register);
...@@ -1048,10 +1037,8 @@ void tee_device_unregister(struct tee_device *teedev) ...@@ -1048,10 +1037,8 @@ void tee_device_unregister(struct tee_device *teedev)
if (!teedev) if (!teedev)
return; return;
if (teedev->flags & TEE_DEVICE_FLAG_REGISTERED) { if (teedev->flags & TEE_DEVICE_FLAG_REGISTERED)
sysfs_remove_group(&teedev->dev.kobj, &tee_dev_group);
cdev_device_del(&teedev->cdev, &teedev->dev); cdev_device_del(&teedev->cdev, &teedev->dev);
}
tee_device_put(teedev); tee_device_put(teedev);
wait_for_completion(&teedev->c_no_users); wait_for_completion(&teedev->c_no_users);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment