On Thu, Dec 11, 2025 at 06:15:09PM +0100, Uwe Kleine-König wrote: > 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. > > Signed-off-by: Uwe Kleine-König <[email protected]> > --- > security/keys/trusted-keys/trusted_tee.c | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-)
Reviewed-by: Sumit Garg <[email protected]> -Sumit > > diff --git a/security/keys/trusted-keys/trusted_tee.c > b/security/keys/trusted-keys/trusted_tee.c > index 3cea9a377955..6e465c8bef5e 100644 > --- a/security/keys/trusted-keys/trusted_tee.c > +++ b/security/keys/trusted-keys/trusted_tee.c > @@ -202,9 +202,9 @@ static int optee_ctx_match(struct tee_ioctl_version_data > *ver, const void *data) > return 0; > } > > -static int trusted_key_probe(struct device *dev) > +static int trusted_key_probe(struct tee_client_device *rng_device) > { > - struct tee_client_device *rng_device = to_tee_client_device(dev); > + struct device *dev = &rng_device->dev; > int ret; > struct tee_ioctl_open_session_arg sess_arg; > > @@ -244,13 +244,11 @@ static int trusted_key_probe(struct device *dev) > return ret; > } > > -static int trusted_key_remove(struct device *dev) > +static void trusted_key_remove(struct tee_client_device *dev) > { > unregister_key_type(&key_type_trusted); > tee_client_close_session(pvt_data.ctx, pvt_data.session_id); > tee_client_close_context(pvt_data.ctx); > - > - return 0; > } > > static const struct tee_client_device_id trusted_key_id_table[] = { > @@ -261,11 +259,11 @@ static const struct tee_client_device_id > trusted_key_id_table[] = { > MODULE_DEVICE_TABLE(tee, trusted_key_id_table); > > static struct tee_client_driver trusted_key_driver = { > + .probe = trusted_key_probe, > + .remove = trusted_key_remove, > .id_table = trusted_key_id_table, > .driver = { > .name = DRIVER_NAME, > - .probe = trusted_key_probe, > - .remove = trusted_key_remove, > }, > }; > > -- > 2.47.3 >
