Merge tag 'afs-next-20171113' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowel...

[sfrench/cifs-2.6.git] / drivers / media / platform / qcom / venus / hfi.c

diff --git a/drivers/media/platform/qcom/venus/hfi.c b/drivers/media/platform/qcom/venus/hfi.c
index ba29fd4d49847cc3d1956eefd224823d42cdb14e..1baf78d3c02d09e4085ffe54623b2b79db5657a2 100644 (file)
--- a/drivers/media/platform/qcom/venus/hfi.c
+++ b/drivers/media/platform/qcom/venus/hfi.c
@@ -88,12 +88,6 @@ unlock:
        return ret;
 }
 
        return ret;
 }
 

-static int core_deinit_wait_atomic_t(atomic_t *p)
-{
-       schedule();
-       return 0;
-}
-

 int hfi_core_deinit(struct venus_core *core, bool blocking)
 {
        int ret = 0, empty;
 int hfi_core_deinit(struct venus_core *core, bool blocking)
 {
        int ret = 0, empty;


@@ -112,7 +106,7 @@ int hfi_core_deinit(struct venus_core *core, bool blocking)
 
        if (!empty) {
                mutex_unlock(&core->lock);
 
        if (!empty) {
                mutex_unlock(&core->lock);

-               wait_on_atomic_t(&core->insts_count, core_deinit_wait_atomic_t,
+               wait_on_atomic_t(&core->insts_count, atomic_t_wait,

                                 TASK_UNINTERRUPTIBLE);
                mutex_lock(&core->lock);
        }
                                 TASK_UNINTERRUPTIBLE);
                mutex_lock(&core->lock);
        }