Skip to content

Commit 7a5f567

Browse files
ukleinekjenswi-linaro
authored andcommitted
efi: stmm: 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: Ilias Apalodimas <ilias.apalodimas@linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
1 parent 0a6441a commit 7a5f567

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

drivers/firmware/efi/stmm/tee_stmm_efi.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -520,8 +520,9 @@ static void tee_stmm_restore_efivars_generic_ops(void)
520520
efivars_generic_ops_register();
521521
}
522522

523-
static int tee_stmm_efi_probe(struct device *dev)
523+
static int tee_stmm_efi_probe(struct tee_client_device *tee_dev)
524524
{
525+
struct device *dev = &tee_dev->dev;
525526
struct tee_ioctl_open_session_arg sess_arg;
526527
efi_status_t ret;
527528
int rc;
@@ -571,21 +572,19 @@ static int tee_stmm_efi_probe(struct device *dev)
571572
return 0;
572573
}
573574

574-
static int tee_stmm_efi_remove(struct device *dev)
575+
static void tee_stmm_efi_remove(struct tee_client_device *dev)
575576
{
576577
tee_stmm_restore_efivars_generic_ops();
577-
578-
return 0;
579578
}
580579

581580
MODULE_DEVICE_TABLE(tee, tee_stmm_efi_id_table);
582581

583582
static struct tee_client_driver tee_stmm_efi_driver = {
584583
.id_table = tee_stmm_efi_id_table,
584+
.probe = tee_stmm_efi_probe,
585+
.remove = tee_stmm_efi_remove,
585586
.driver = {
586587
.name = "tee-stmm-efi",
587-
.probe = tee_stmm_efi_probe,
588-
.remove = tee_stmm_efi_remove,
589588
},
590589
};
591590

0 commit comments

Comments
 (0)