From ce2635f4106d227299668d46498e0b90fdc2de2d Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Tue, 19 Jul 2022 13:17:49 -0500 Subject: [PATCH] drivers: virt: ivshmem: Convert to use DEVICE_DT_GET_ONE Replace Kconfig (IVSHMEM_DEV_NAME) based named device_get_binding with DEVICE_DT_GET_ONE. Since there is only one driver for ivshmem use the qemu,ivshmem for that. Signed-off-by: Kumar Gala --- drivers/virtualization/Kconfig | 4 ---- drivers/virtualization/virt_ivshmem_shell.c | 6 +++--- tests/drivers/virtualization/ivshmem/src/ivshmem.c | 4 ++-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/virtualization/Kconfig b/drivers/virtualization/Kconfig index f9667ade0ba..a5ac6820a34 100644 --- a/drivers/virtualization/Kconfig +++ b/drivers/virtualization/Kconfig @@ -22,10 +22,6 @@ config IVSHMEM if IVSHMEM -config IVSHMEM_DEV_NAME - string - default "IVSHMEM" - module = IVSHMEM module-str = ivshmem source "subsys/logging/Kconfig.template.log_config" diff --git a/drivers/virtualization/virt_ivshmem_shell.c b/drivers/virtualization/virt_ivshmem_shell.c index 6360e55db0c..c818648e119 100644 --- a/drivers/virtualization/virt_ivshmem_shell.c +++ b/drivers/virtualization/virt_ivshmem_shell.c @@ -49,9 +49,9 @@ static void doorbell_notification_thread(const struct shell *shell) static bool get_ivshmem(const struct shell *shell) { if (ivshmem == NULL) { - ivshmem = device_get_binding(CONFIG_IVSHMEM_DEV_NAME); - if (!ivshmem) { - shell_error(shell, "IVshmem device cannot be found"); + ivshmem = DEVICE_DT_GET_ONE(qemu_ivshmem); + if (!device_is_ready(ivshmem)) { + shell_error(shell, "IVshmem device is not ready"); } } diff --git a/tests/drivers/virtualization/ivshmem/src/ivshmem.c b/tests/drivers/virtualization/ivshmem/src/ivshmem.c index af6c3919373..a77058437d0 100644 --- a/tests/drivers/virtualization/ivshmem/src/ivshmem.c +++ b/tests/drivers/virtualization/ivshmem/src/ivshmem.c @@ -19,8 +19,8 @@ void test_ivshmem_plain(void) uint16_t vectors; int ret; - ivshmem = device_get_binding(CONFIG_IVSHMEM_DEV_NAME); - zassert_not_null(ivshmem, "Could not get ivshmem device"); + ivshmem = DEVICE_DT_GET_ONE(qemu_ivshmem); + zassert_true(device_is_ready(ivshmem), "ivshmem device is not ready"); size = ivshmem_get_mem(ivshmem, &mem); zassert_not_equal(size, 0, "Size cannot not be 0");