Commit ffbbaa74 authored by Steven Price's avatar Steven Price Committed by Daniel Vetter

dma_resv: prime lockdep annotations

From d07ea81611ed6e4fb8cc290f42d23dbcca2da2f8 Mon Sep 17 00:00:00 2001
From: Steven Price <steven.price@arm.com>
Date: Mon, 11 Nov 2019 13:07:19 +0000
Subject: [PATCH] dma_resv: Correct return type of dma_resv_lockdep()

subsys_initcall() expects a function which returns 'int'. Fix
dma_resv_lockdep() so it returns an 'int' error code.

Fixes: b2a8116e ("dma_resv: prime lockdep annotations")
Signed-off-by: default avatarSteven Price <steven.price@arm.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/c0a0c70d-e6fe-1103-2888-1ce1425f4a5d@arm.com
parent be143124
...@@ -97,13 +97,13 @@ static void dma_resv_list_free(struct dma_resv_list *list) ...@@ -97,13 +97,13 @@ static void dma_resv_list_free(struct dma_resv_list *list)
} }
#if IS_ENABLED(CONFIG_LOCKDEP) #if IS_ENABLED(CONFIG_LOCKDEP)
static void __init dma_resv_lockdep(void) static int __init dma_resv_lockdep(void)
{ {
struct mm_struct *mm = mm_alloc(); struct mm_struct *mm = mm_alloc();
struct dma_resv obj; struct dma_resv obj;
if (!mm) if (!mm)
return; return -ENOMEM;
dma_resv_init(&obj); dma_resv_init(&obj);
...@@ -115,6 +115,8 @@ static void __init dma_resv_lockdep(void) ...@@ -115,6 +115,8 @@ static void __init dma_resv_lockdep(void)
up_read(&mm->mmap_sem); up_read(&mm->mmap_sem);
mmput(mm); mmput(mm);
return 0;
} }
subsys_initcall(dma_resv_lockdep); subsys_initcall(dma_resv_lockdep);
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment