KEYS: trusted: Make use of tee bus methods

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>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

diff --git a/security/keys/trusted-keys/trusted_tee.c b/security/keys/trusted-keys/trusted_tee.c
index 3cea9a3779558924e441a1503acede6384a6165d..6e465c8bef5e5b6d30279da40fc3e5410fe1cbef 100644 (file)
--- 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 @@ out_ctx:
        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,
        },
 };