diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-04-29 23:29:05 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-04-29 23:29:05 +0300 |
| commit | d9f843fbd45e159593f18bc9770eea0a62223e5d (patch) | |
| tree | c62034985fbe358f4dc92fd119894f576b60d9c8 /drivers/tee | |
| parent | d1734cfcece1f18a85b68f74e81923a741bffaaf (diff) | |
| parent | 5c794301eb4e5373822e8898661bacdc7f46ba14 (diff) | |
| download | linux-d9f843fbd45e159593f18bc9770eea0a62223e5d.tar.xz | |
Merge tag 'optee-convert-platform-remove-callback-for-v6.10' of https://git.linaro.org/people/jens.wiklander/linux-tee into soc/drivers
OP-TEE Convert to platform remove callback returning void
* tag 'optee-convert-platform-remove-callback-for-v6.10' of https://git.linaro.org/people/jens.wiklander/linux-tee:
tee: optee: smc: Convert to platform remove callback returning void
Link: https://lore.kernel.org/r/20240425072835.GA3258167@rayden
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/tee')
| -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", |