Skip to content

Commit 8c05f50

Browse files
sudeep-hollajenswi-linaro
authored andcommitted
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: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
1 parent ab3d8e1 commit 8c05f50

1 file changed

Lines changed: 4 additions & 17 deletions

File tree

drivers/tee/tee_core.c

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -962,9 +962,7 @@ static struct attribute *tee_dev_attrs[] = {
962962
NULL
963963
};
964964

965-
static const struct attribute_group tee_dev_group = {
966-
.attrs = tee_dev_attrs,
967-
};
965+
ATTRIBUTE_GROUPS(tee_dev);
968966

969967
/**
970968
* tee_device_register() - Registers a TEE device
@@ -984,6 +982,8 @@ int tee_device_register(struct tee_device *teedev)
984982
return -EINVAL;
985983
}
986984

985+
teedev->dev.groups = tee_dev_groups;
986+
987987
rc = cdev_device_add(&teedev->cdev, &teedev->dev);
988988
if (rc) {
989989
dev_err(&teedev->dev,
@@ -993,19 +993,8 @@ int tee_device_register(struct tee_device *teedev)
993993
return rc;
994994
}
995995

996-
rc = sysfs_create_group(&teedev->dev.kobj, &tee_dev_group);
997-
if (rc) {
998-
dev_err(&teedev->dev,
999-
"failed to create sysfs attributes, err=%d\n", rc);
1000-
goto err_sysfs_create_group;
1001-
}
1002-
1003996
teedev->flags |= TEE_DEVICE_FLAG_REGISTERED;
1004997
return 0;
1005-
1006-
err_sysfs_create_group:
1007-
cdev_device_del(&teedev->cdev, &teedev->dev);
1008-
return rc;
1009998
}
1010999
EXPORT_SYMBOL_GPL(tee_device_register);
10111000

@@ -1048,10 +1037,8 @@ void tee_device_unregister(struct tee_device *teedev)
10481037
if (!teedev)
10491038
return;
10501039

1051-
if (teedev->flags & TEE_DEVICE_FLAG_REGISTERED) {
1052-
sysfs_remove_group(&teedev->dev.kobj, &tee_dev_group);
1040+
if (teedev->flags & TEE_DEVICE_FLAG_REGISTERED)
10531041
cdev_device_del(&teedev->cdev, &teedev->dev);
1054-
}
10551042

10561043
tee_device_put(teedev);
10571044
wait_for_completion(&teedev->c_no_users);

0 commit comments

Comments
 (0)