[PATCH] drm/nouveau: remove duplicate include in nouveau_dmem and base

From: menglong8 . dong
Date: Sat Mar 06 2021 - 06:19:42 EST


From: Zhang Yunkai <zhang.yunkai@xxxxxxxxxx>

'if000c.h' included in 'nouveau_dmem.c' is duplicated.
'priv.h' included in 'base.c' is duplicated.

Signed-off-by: Zhang Yunkai <zhang.yunkai@xxxxxxxxxx>
---
drivers/gpu/drm/nouveau/nouveau_dmem.c | 1 -
drivers/gpu/drm/nouveau/nvkm/engine/nvenc/base.c | 2 --
2 files changed, 3 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouveau/nouveau_dmem.c
index 92987daa5e17..f5cc057b123b 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dmem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c
@@ -33,7 +33,6 @@
#include <nvif/if000c.h>
#include <nvif/if500b.h>
#include <nvif/if900b.h>
-#include <nvif/if000c.h>

#include <nvhw/class/cla0b5.h>

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/base.c
index c39e797dc7c9..09524168431c 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/base.c
@@ -20,8 +20,6 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
#include "priv.h"
-
-#include "priv.h"
#include <core/firmware.h>

static void *
--
2.25.1