github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-29 17:43:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

tpm/tpm_ftpm_tee: Make use of tee bus methods

Browse Source 
The tee bus got dedicated callbacks for probe and remove.
Make use of these. This fixes a runtime warning about the driver needing
to be converted to the bus methods.

Reviewed-by: Sumit Garg <sumit.garg@oss.qualcomm.com>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
This commit is contained in:
Uwe Kleine-König 2025-12-15 15:16:47 +01:00 committed by Jens Wiklander
parent 9e4c7808b7
commit 92fad96aea
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/char/tpm/tpm_ftpm_tee.c
View File

@ -169,7 +169,7 @@ static int ftpm_tee_match(struct tee_ioctl_version_data *ver, const void *data)
* Return: * Return:
* On success, 0. On failure, -errno. * On success, 0. On failure, -errno.
*/ */
static int ftpm_tee_probe(struct device *dev) static int ftpm_tee_probe_generic(struct device *dev)
{ {
int rc; int rc;
struct tpm_chip *chip; struct tpm_chip *chip;
@ -251,11 +251,18 @@ static int ftpm_tee_probe(struct device *dev)
return rc; return rc;
} }
static int ftpm_tee_probe(struct tee_client_device *tcdev)
{
struct device *dev = &tcdev->dev;
return ftpm_tee_probe_generic(dev);
}
static int ftpm_plat_tee_probe(struct platform_device *pdev) static int ftpm_plat_tee_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
return ftpm_tee_probe(dev); return ftpm_tee_probe_generic(dev);
} }
/** /**
@ -265,7 +272,7 @@ static int ftpm_plat_tee_probe(struct platform_device *pdev)
* Return: * Return:
* 0 always. * 0 always.
*/ */
static int ftpm_tee_remove(struct device *dev) static void ftpm_tee_remove_generic(struct device *dev)
{ {
struct ftpm_tee_private *pvt_data = dev_get_drvdata(dev); struct ftpm_tee_private *pvt_data = dev_get_drvdata(dev);
@ -285,15 +292,20 @@ static int ftpm_tee_remove(struct device *dev)
tee_client_close_context(pvt_data->ctx); tee_client_close_context(pvt_data->ctx);
/* memory allocated with devm_kzalloc() is freed automatically */ /* memory allocated with devm_kzalloc() is freed automatically */
}
return 0; static void ftpm_tee_remove(struct tee_client_device *tcdev)
{
struct device *dev = &tcdev->dev;
ftpm_tee_remove_generic(dev);
} }
static void ftpm_plat_tee_remove(struct platform_device *pdev) static void ftpm_plat_tee_remove(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
ftpm_tee_remove(dev); ftpm_tee_remove_generic(dev);
} }
/** /**
@ -335,11 +347,11 @@ static const struct tee_client_device_id optee_ftpm_id_table[] = {
MODULE_DEVICE_TABLE(tee, optee_ftpm_id_table); MODULE_DEVICE_TABLE(tee, optee_ftpm_id_table);
static struct tee_client_driver ftpm_tee_driver = { static struct tee_client_driver ftpm_tee_driver = {
.probe = ftpm_tee_probe,
.remove = ftpm_tee_remove,
.id_table = optee_ftpm_id_table, .id_table = optee_ftpm_id_table,
.driver = { .driver = {
.name = "optee-ftpm", .name = "optee-ftpm",
.probe = ftpm_tee_probe,
.remove = ftpm_tee_remove,
}, },
}; };