firmware: tee_bnxt: 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>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

diff --git a/drivers/firmware/broadcom/tee_bnxt_fw.c b/drivers/firmware/broadcom/tee_bnxt_fw.c
index fbdf1aa97c8234f997476c24c28f8ef2b2b65d09..a706c84eb2b690108fc36d0e89026d2d93654fcf 100644 (file)
--- a/drivers/firmware/broadcom/tee_bnxt_fw.c
+++ b/drivers/firmware/broadcom/tee_bnxt_fw.c
@@ -181,9 +181,9 @@ static int optee_ctx_match(struct tee_ioctl_version_data *ver, const void *data)
        return (ver->impl_id == TEE_IMPL_ID_OPTEE);
 }
 
-static int tee_bnxt_fw_probe(struct device *dev)
+static int tee_bnxt_fw_probe(struct tee_client_device *bnxt_device)
 {
-       struct tee_client_device *bnxt_device = to_tee_client_device(dev);
+       struct device *dev = &bnxt_device->dev;
        int ret, err = -ENODEV;
        struct tee_ioctl_open_session_arg sess_arg;
        struct tee_shm *fw_shm_pool;
@@ -231,17 +231,15 @@ out_ctx:
        return err;
 }
 
-static int tee_bnxt_fw_remove(struct device *dev)
+static void tee_bnxt_fw_remove(struct tee_client_device *bnxt_device)
 {
        tee_shm_free(pvt_data.fw_shm_pool);
        tee_client_close_session(pvt_data.ctx, pvt_data.session_id);
        tee_client_close_context(pvt_data.ctx);
        pvt_data.ctx = NULL;
-
-       return 0;
 }
 
-static void tee_bnxt_fw_shutdown(struct device *dev)
+static void tee_bnxt_fw_shutdown(struct tee_client_device *bnxt_device)
 {
        tee_shm_free(pvt_data.fw_shm_pool);
        tee_client_close_session(pvt_data.ctx, pvt_data.session_id);
@@ -258,12 +256,12 @@ static const struct tee_client_device_id tee_bnxt_fw_id_table[] = {
 MODULE_DEVICE_TABLE(tee, tee_bnxt_fw_id_table);
 
 static struct tee_client_driver tee_bnxt_fw_driver = {
+       .probe          = tee_bnxt_fw_probe,
+       .remove         = tee_bnxt_fw_remove,
+       .shutdown       = tee_bnxt_fw_shutdown,
        .id_table       = tee_bnxt_fw_id_table,
        .driver         = {
                .name           = KBUILD_MODNAME,
-               .probe          = tee_bnxt_fw_probe,
-               .remove         = tee_bnxt_fw_remove,
-               .shutdown       = tee_bnxt_fw_shutdown,
        },
 };