The __GFP_NOWARN flag was included in GFP_NOWAIT since commit
16f5dfbc851b ("gfp: include __GFP_NOWARN in GFP_NOWAIT"). So
remove the redundant __GFP_NOWARN flag.Signed-off-by: Huiwen He <[email protected]> --- drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 4 ++-- drivers/gpu/drm/i915/i915_active.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c b/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c index 8d4bb95f8424..22432912db2e 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c +++ b/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c @@ -220,7 +220,7 @@ static void heartbeat(struct work_struct *wrk) goto out; } - rq = heartbeat_create(ce, GFP_NOWAIT | __GFP_NOWARN); + rq = heartbeat_create(ce, GFP_NOWAIT); if (IS_ERR(rq)) goto unlock; @@ -282,7 +282,7 @@ static int __intel_engine_pulse(struct intel_engine_cs *engine) GEM_BUG_ON(!intel_engine_has_preemption(engine)); GEM_BUG_ON(!intel_engine_pm_is_awake(engine)); - rq = heartbeat_create(ce, GFP_NOWAIT | __GFP_NOWARN); + rq = heartbeat_create(ce, GFP_NOWAIT); if (IS_ERR(rq)) return PTR_ERR(rq); diff --git a/drivers/gpu/drm/i915/i915_active.c b/drivers/gpu/drm/i915/i915_active.c index 6b0c1162505a..f3acce9c1195 100644 --- a/drivers/gpu/drm/i915/i915_active.c +++ b/drivers/gpu/drm/i915/i915_active.c @@ -725,8 +725,7 @@ int i915_request_await_active(struct i915_request *rq, static int sw_await_fence(void *arg, struct dma_fence *fence) { - return i915_sw_fence_await_dma_fence(arg, fence, 0, - GFP_NOWAIT | __GFP_NOWARN); + return i915_sw_fence_await_dma_fence(arg, fence, 0, GFP_NOWAIT); } int i915_sw_fence_await_active(struct i915_sw_fence *fence, -- 2.25.1
