diff options
| author |   Russell King <rmk+kernel@armlinux.org.uk> | 2021-02-02 14:37:25 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2021-02-02 14:37:25 +0000 |
| commit | 9d4d8572a539ef807e21c196f145aa365fd52f0e (patch) | |
| tree | 59a4fcd89ce86de32f068c2052f17a348188ae7e /drivers/gpu/drm/i915/i915_request.c | |
| parent | Linux 5.10 (diff) | |
| parent | amba: Make use of bus_type functions (diff) | |
| download | wireguard-linux-9d4d8572a539ef807e21c196f145aa365fd52f0e.tar.xz wireguard-linux-9d4d8572a539ef807e21c196f145aa365fd52f0e.zip | |
Merge tag 'amba-make-remove-return-void' of https://git.pengutronix.de/git/ukl/linux into devel-stable
Tag for adaptions to struct amba_driver::remove changing prototype
Diffstat (limited to 'drivers/gpu/drm/i915/i915_request.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_request.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c index 0e813819b041..5385b081a376 100644 --- a/drivers/gpu/drm/i915/i915_request.c +++ b/drivers/gpu/drm/i915/i915_request.c @@ -197,7 +197,7 @@ __notify_execute_cb(struct i915_request *rq, bool (*fn)(struct irq_work *wrk)) llist_for_each_entry_safe(cb, cn, llist_del_all(&rq->execute_cb), - work.llnode) + work.node.llist) fn(&cb->work); } @@ -460,7 +460,7 @@ __await_execution(struct i915_request *rq, * callback first, then checking the ACTIVE bit, we serialise with * the completed/retired request. */ - if (llist_add(&cb->work.llnode, &signal->execute_cb)) { + if (llist_add(&cb->work.node.llist, &signal->execute_cb)) { if (i915_request_is_active(signal) || __request_in_flight(signal)) __notify_execute_cb_imm(signal); |