iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OP-TEE Convert to platform remove callback returning void

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCgA4FiEEFV+gSSXZJY9ZyuB5LinzTIcAHJcFAmYp+g0aHGplbnMud2lr
 bGFuZGVyQGxpbmFyby5vcmcACgkQLinzTIcAHJf6OBAAvqgiq2gbDF8iJOB+0zz8
 S/h5yOdKDLDrxXU5uv0Kth/+kXVVpuHidRN2mwe2M5xlAr3ZRS/mwvS/KnU4AWTr
 4pOfF35ARq5I7W6EVV6l8iCAWhTIos/L1eKvasvSh+igXvja1Fp9+N1bzCEnOekF
 ifrlq74DWsjH4OKWQbUnasvAmp8C22GAzWFIf5NepyKTdxjRvxfKKs2zOr76ScpP
 lgyBpKPLoi5Ez/gcCyIGs78xtlDZz3JtQ1W7Pa8FvtTSrYqUsbH/ZZcrIxSLQN5n
 +OFJ1jcMhW1jHyFVLHaeTQyGi0NKoGcJ6Q3yM4htKRSDZ6/pIzqoAettFhjMDF1a
 m90tEpGRlZCcrX2N0wd87SW/IptnpJfBDzfx9rt6oj0EAmNUEyGcfG7NLhNyQKPI
 U3adu2CJC3Zmc28aqr4GcL+rHOogk9dHi0z1qmhv1MQCq0AzvX0ly8shfaouuZxu
 xSTGhE+gC0AzQJ9wGCkvBumkdPpB7/V2oQ/iga7uSDK/AvIMkE1BSyxE9KRyXo0U
 AjbG2NPTx+9FHcaaqF0hJtXni70XOpm3vza5ZKEluYj+TLRiGt9YE/jsQatZ2W20
 ZU4iBhrVryV+7jJ8+SjfvLKV3GNqWM/nby1pl55F5fr2k6itkWkHoLPI8R0+VeMx
 LbgLTjVbxw7YJe0a0dip0ww=
 =3GUN
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmYwAxEACgkQYKtH/8kJ
 Uidbtw/9EmnaUts1xjCGQFyI0qTz+mXOdgYeGfPinOH5RD5rRsamqDPX/frF5Uqx
 6v6Xsn7T+thiPZtdDXJ+MleF6OyLvndHMRKeFzxFxpeB0PWZMbleIirh3PUR20OT
 61udmWSvq499Lhfk9s6vLHgUEgvBlM4ganqYhA4drnf5WLujfpsDaRW2moOAC0xx
 iHFmFuuGzE8nYK7R2vOTk1DY0YNOgqTFVaGePXoCxK6o97lUNA1oVMqOXFZ6nefC
 DaJEA4EWKxA66qtlQhyUOkYtlDkWQMCmlqwaK3PPhMe9tyI5/paMZfxyRwNwkRLZ
 pw2DNMDnUTPGwIZL45fW6kUOchpmmCPmgGL257IpOimCAyV4KPl9dT9j4Yxo8QFb
 XNC0/N//Se1qX/0OPjfpRCQ+OXVCpKols3wNVzhlbVqULOpBl8GnrtVSSgRvJPCt
 RGCHuagx6lVkIU88wJuyMcxgaSSTAaF4P0bEC504FNSmsjUVYMivcx5F0tVymck3
 /krSc8Xrmw5CVxCw8RIc6HHHatBKPey7+ITevdypMI2gV7Tg6sbHR7Mrvs6HDB2L
 gRqQS29Tej6fLh4LdAMlqX/F4Z8H3aIKEa6vJnXBWxxrRqW0Z3yhiOIfHBK2/rV3
 cyDvLTOy856SZ0UMEEVniReK1BPb/mq7GalCIsasFjeltlhi8ho=
 =Unfh
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2024-04-29 22:29:05 +02:00
commit d9f843fbd4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/tee/optee/smc_abi.c
View File

@ -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",