rtc: optee: 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>
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

diff --git a/drivers/rtc/rtc-optee.c b/drivers/rtc/rtc-optee.c
index f924a729ead0d17e05cf7f23f135d4aa9f2e7081..eefde789d19448efc62ed2be558278d21d608d0a 100644 (file)
--- a/drivers/rtc/rtc-optee.c
+++ b/drivers/rtc/rtc-optee.c
@@ -547,9 +547,9 @@ static int optee_ctx_match(struct tee_ioctl_version_data *ver, const void *data)
                return 0;
 }
 
-static int optee_rtc_probe(struct device *dev)
+static int optee_rtc_probe(struct tee_client_device *rtc_device)
 {
-       struct tee_client_device *rtc_device = to_tee_client_device(dev);
+       struct device *dev = &rtc_device->dev;
        struct tee_ioctl_open_session_arg sess2_arg = {0};
        struct tee_ioctl_open_session_arg sess_arg = {0};
        struct optee_rtc *priv;
@@ -682,8 +682,9 @@ out_ctx:
        return err;
 }
 
-static int optee_rtc_remove(struct device *dev)
+static void optee_rtc_remove(struct tee_client_device *rtc_device)
 {
+       struct device *dev = &rtc_device->dev;
        struct optee_rtc *priv = dev_get_drvdata(dev);
 
        if (priv->features & TA_RTC_FEATURE_ALARM) {
@@ -696,8 +697,6 @@ static int optee_rtc_remove(struct device *dev)
        tee_shm_free(priv->shm);
        tee_client_close_session(priv->ctx, priv->session_id);
        tee_client_close_context(priv->ctx);
-
-       return 0;
 }
 
 static int optee_rtc_suspend(struct device *dev)
@@ -724,10 +723,10 @@ MODULE_DEVICE_TABLE(tee, optee_rtc_id_table);
 
 static struct tee_client_driver optee_rtc_driver = {
        .id_table       = optee_rtc_id_table,
+       .probe          = optee_rtc_probe,
+       .remove         = optee_rtc_remove,
        .driver         = {
                .name           = "optee_rtc",
-               .probe          = optee_rtc_probe,
-               .remove         = optee_rtc_remove,
                .pm             = pm_sleep_ptr(&optee_rtc_pm_ops),
        },
 };