From ee7f0a678fff8316ec0be973f1b3780a63f50942 Mon Sep 17 00:00:00 2001 From: Myy Miouyouyou Date: Mon, 11 Dec 2017 21:04:56 +0100 Subject: [PATCH] gpu: arm: Midgard: setup_timer() -> timer_setup() This patch is due the changes provoked by series of commit ending at 513ae785c63c30741e46f43960213d4ae5382ec0, and removing the setup_timer macros. The previous patches replaced made sure that timers were all set up with setup_timer and replaced setup_timer calls by timer_setup calls. This changed was introduced in the 4.15-rc1. Signed-off-by: Myy Miouyouyou --- drivers/gpu/arm/midgard/mali_kbase.h | 2 +- drivers/gpu/arm/midgard/mali_kbase_context.c | 4 ++-- drivers/gpu/arm/midgard/mali_kbase_softjobs.c | 4 ++-- drivers/gpu/arm/midgard/mali_kbase_tlstream.c | 6 ++---- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/arm/midgard/mali_kbase.h b/drivers/gpu/arm/midgard/mali_kbase.h index a4ceab9e0..27bde3b71 100644 --- a/drivers/gpu/arm/midgard/mali_kbase.h +++ b/drivers/gpu/arm/midgard/mali_kbase.h @@ -213,7 +213,7 @@ int kbase_soft_event_update(struct kbase_context *kctx, bool kbase_replay_process(struct kbase_jd_atom *katom); -void kbasep_soft_job_timeout_worker(unsigned long data); +void kbasep_soft_job_timeout_worker(struct timer_list *t); void kbasep_complete_triggered_soft_events(struct kbase_context *kctx, u64 evt); /* api used internally for register access. Contains validation and tracing */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_context.c b/drivers/gpu/arm/midgard/mali_kbase_context.c index f43db48fd..589df768c 100644 --- a/drivers/gpu/arm/midgard/mali_kbase_context.c +++ b/drivers/gpu/arm/midgard/mali_kbase_context.c @@ -165,9 +165,9 @@ kbase_create_context(struct kbase_device *kbdev, bool is_compat) mutex_init(&kctx->vinstr_cli_lock); - setup_timer(&kctx->soft_job_timeout, + timer_setup(&kctx->soft_job_timeout, kbasep_soft_job_timeout_worker, - (uintptr_t)kctx); + 0); return kctx; diff --git a/drivers/gpu/arm/midgard/mali_kbase_softjobs.c b/drivers/gpu/arm/midgard/mali_kbase_softjobs.c index 127ada07f..019edf562 100644 --- a/drivers/gpu/arm/midgard/mali_kbase_softjobs.c +++ b/drivers/gpu/arm/midgard/mali_kbase_softjobs.c @@ -370,9 +370,9 @@ static void kbase_fence_debug_timeout(struct kbase_jd_atom *katom) } #endif /* CONFIG_MALI_FENCE_DEBUG */ -void kbasep_soft_job_timeout_worker(unsigned long data) +void kbasep_soft_job_timeout_worker(struct timer_list *t) { - struct kbase_context *kctx = (struct kbase_context *)data; + struct kbase_context *kctx = from_timer(kctx, t, soft_job_timeout); u32 timeout_ms = (u32)atomic_read( &kctx->kbdev->js_data.soft_job_timeout_ms); struct timer_list *timer = &kctx->soft_job_timeout; diff --git a/drivers/gpu/arm/midgard/mali_kbase_tlstream.c b/drivers/gpu/arm/midgard/mali_kbase_tlstream.c index d01aa23b2..11d8b59c7 100644 --- a/drivers/gpu/arm/midgard/mali_kbase_tlstream.c +++ b/drivers/gpu/arm/midgard/mali_kbase_tlstream.c @@ -1042,13 +1042,11 @@ static void kbasep_tlstream_flush_stream(enum tl_stream_type stype) * Timer is executed periodically to check if any of the stream contains * buffer ready to be submitted to user space. */ -static void kbasep_tlstream_autoflush_timer_callback(unsigned long data) +static void kbasep_tlstream_autoflush_timer_callback(struct timer_list *unused) { enum tl_stream_type stype; int rcode; - CSTD_UNUSED(data); - for (stype = 0; stype < TL_STREAM_TYPE_COUNT; stype++) { struct tl_stream *stream = tl_stream[stype]; unsigned long flags; @@ -1371,7 +1369,7 @@ int kbase_tlstream_init(void) /* Initialize autoflush timer. */ atomic_set(&autoflush_timer_active, 0); - setup_timer(&autoflush_timer, + timer_setup(&autoflush_timer, kbasep_tlstream_autoflush_timer_callback, 0); -- 2.14.1