diff options
| author | Jens Wiklander <jens.wiklander@linaro.org> | 2024-03-25 15:54:03 +0100 |
|---|---|---|
| committer | Jens Wiklander <jens.wiklander@linaro.org> | 2024-03-25 15:54:03 +0100 |
| commit | 746ef0fac697b952d3991436d8eafd6cc7cede6c (patch) | |
| tree | acc1b1b8578d5e92f259493fb1fc25644b91b144 | |
| parent | 4cece764965020c22cff7665b18a012006359095 (diff) | |
| parent | 5c794301eb4e5373822e8898661bacdc7f46ba14 (diff) | |
Merge branch 'optee_convert_platform_remove_callback_for_v6.10' into next
| -rw-r--r-- | drivers/tee/optee/smc_abi.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c index a37f87087e5c..c82b7b88991d 100644 --- a/drivers/tee/optee/smc_abi.c +++ b/drivers/tee/optee/smc_abi.c @@ -1433,7 +1433,7 @@ static optee_invoke_fn *get_invoke_func(struct device *dev) * optee_remove is called by platform subsystem to alert the driver * that it should release the device */ -static int optee_smc_remove(struct platform_device *pdev) +static void optee_smc_remove(struct platform_device *pdev) { struct optee *optee = platform_get_drvdata(pdev); @@ -1453,8 +1453,6 @@ static int optee_smc_remove(struct platform_device *pdev) memunmap(optee->smc.memremaped_shm); kfree(optee); - - return 0; } /* optee_shutdown - Device Removal Routine @@ -1806,7 +1804,7 @@ MODULE_DEVICE_TABLE(of, optee_dt_match); static struct platform_driver optee_driver = { .probe = optee_probe, - .remove = optee_smc_remove, + .remove_new = optee_smc_remove, .shutdown = optee_shutdown, .driver = { .name = "optee", |