tee: avoid explicit sysfs_create/delete_group by initialising dev->groups (8c05f50f) · Commits · 戴 / test

drivers/tee/tee_core.c

+4 −17

Original line number	Diff line number	Diff line
		@@ -962,9 +962,7 @@ static struct attribute *tee_dev_attrs[] = {
		NULL
		};

		static const struct attribute_group tee_dev_group = {
		.attrs = tee_dev_attrs,
		};
		ATTRIBUTE_GROUPS(tee_dev);

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

		teedev->dev.groups = tee_dev_groups;

		rc = cdev_device_add(&teedev->cdev, &teedev->dev);
		if (rc) {
		dev_err(&teedev->dev,
		@@ -993,19 +993,8 @@ int tee_device_register(struct tee_device *teedev)
		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;
		return 0;

		err_sysfs_create_group:
		cdev_device_del(&teedev->cdev, &teedev->dev);
		return rc;
		}
		EXPORT_SYMBOL_GPL(tee_device_register);

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

		if (teedev->flags & TEE_DEVICE_FLAG_REGISTERED) {
		sysfs_remove_group(&teedev->dev.kobj, &tee_dev_group);
		if (teedev->flags & TEE_DEVICE_FLAG_REGISTERED)
		cdev_device_del(&teedev->cdev, &teedev->dev);
		}

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