Merge tag 'drm-next-2023-03-03-1' of git://anongit.freedesktop.org/drm/drm

[sfrench/cifs-2.6.git] / drivers / gpu / drm / amd / amdkfd / kfd_events.c

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_events.c b/drivers/gpu/drm/amd/amdkfd/kfd_events.c
index dd0436bf349a464f9529e5082742db9cc69d467b..c894cf8f7c50d468c6ef57a6a93b1d07dbb15975 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_events.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_events.c
@@ -778,16 +778,13 @@ static struct kfd_event_waiter *alloc_event_waiters(uint32_t num_events)
        struct kfd_event_waiter *event_waiters;
        uint32_t i;
 
-       event_waiters = kmalloc_array(num_events,
-                                       sizeof(struct kfd_event_waiter),
-                                       GFP_KERNEL);
+       event_waiters = kcalloc(num_events, sizeof(struct kfd_event_waiter),
+                               GFP_KERNEL);
        if (!event_waiters)
                return NULL;
 
-       for (i = 0; (event_waiters) && (i < num_events) ; i++) {
+       for (i = 0; i < num_events; i++)
                init_wait(&event_waiters[i].wait);
-               event_waiters[i].activated = false;
-       }
 
        return event_waiters;
 }