[PATCH 024/156] drm/nouveau/nvkm: move nvkm/engine/device/ to nvkm/device/

[Ben Skeggs]

- move to a more appropriate place before making changes

Signed-off-by: Ben Skeggs <bskeggs at nvidia.com>
---
 drivers/gpu/drm/nouveau/nvkm/Kbuild                      | 1 +
 drivers/gpu/drm/nouveau/nvkm/device/Kbuild               | 7 +++++++
 drivers/gpu/drm/nouveau/nvkm/{engine => }/device/acpi.c  | 0
 drivers/gpu/drm/nouveau/nvkm/{engine => }/device/acpi.h  | 0
 drivers/gpu/drm/nouveau/nvkm/{engine => }/device/base.c  | 0
 drivers/gpu/drm/nouveau/nvkm/{engine => }/device/ctrl.c  | 0
 drivers/gpu/drm/nouveau/nvkm/{engine => }/device/ctrl.h  | 0
 drivers/gpu/drm/nouveau/nvkm/{engine => }/device/pci.c   | 0
 drivers/gpu/drm/nouveau/nvkm/{engine => }/device/priv.h  | 0
 drivers/gpu/drm/nouveau/nvkm/{engine => }/device/tegra.c | 0
 drivers/gpu/drm/nouveau/nvkm/{engine => }/device/user.c  | 0
 drivers/gpu/drm/nouveau/nvkm/engine/Kbuild               | 1 -
 drivers/gpu/drm/nouveau/nvkm/engine/device/Kbuild        | 7 -------
 13 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 drivers/gpu/drm/nouveau/nvkm/device/Kbuild
 rename drivers/gpu/drm/nouveau/nvkm/{engine => }/device/acpi.c (100%)
 rename drivers/gpu/drm/nouveau/nvkm/{engine => }/device/acpi.h (100%)
 rename drivers/gpu/drm/nouveau/nvkm/{engine => }/device/base.c (100%)
 rename drivers/gpu/drm/nouveau/nvkm/{engine => }/device/ctrl.c (100%)
 rename drivers/gpu/drm/nouveau/nvkm/{engine => }/device/ctrl.h (100%)
 rename drivers/gpu/drm/nouveau/nvkm/{engine => }/device/pci.c (100%)
 rename drivers/gpu/drm/nouveau/nvkm/{engine => }/device/priv.h (100%)
 rename drivers/gpu/drm/nouveau/nvkm/{engine => }/device/tegra.c (100%)
 rename drivers/gpu/drm/nouveau/nvkm/{engine => }/device/user.c (100%)
 delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/device/Kbuild

diff --git a/drivers/gpu/drm/nouveau/nvkm/Kbuild b/drivers/gpu/drm/nouveau/nvkm/Kbuild
index db3ade125fa9..f68c19586b53 100644
--- a/drivers/gpu/drm/nouveau/nvkm/Kbuild
+++ b/drivers/gpu/drm/nouveau/nvkm/Kbuild
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: MIT
 include $(src)/nvkm/core/Kbuild
 include $(src)/nvkm/nvfw/Kbuild
+include $(src)/nvkm/device/Kbuild
 include $(src)/nvkm/falcon/Kbuild
 include $(src)/nvkm/subdev/Kbuild
 include $(src)/nvkm/engine/Kbuild
diff --git a/drivers/gpu/drm/nouveau/nvkm/device/Kbuild b/drivers/gpu/drm/nouveau/nvkm/device/Kbuild
new file mode 100644
index 000000000000..0e5ce7877b94
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/device/Kbuild
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: MIT
+nvkm-y += nvkm/device/acpi.o
+nvkm-y += nvkm/device/base.o
+nvkm-y += nvkm/device/ctrl.o
+nvkm-y += nvkm/device/pci.o
+nvkm-y += nvkm/device/tegra.o
+nvkm-y += nvkm/device/user.o
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/acpi.c b/drivers/gpu/drm/nouveau/nvkm/device/acpi.c
similarity index 100%
rename from drivers/gpu/drm/nouveau/nvkm/engine/device/acpi.c
rename to drivers/gpu/drm/nouveau/nvkm/device/acpi.c
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/acpi.h b/drivers/gpu/drm/nouveau/nvkm/device/acpi.h
similarity index 100%
rename from drivers/gpu/drm/nouveau/nvkm/engine/device/acpi.h
rename to drivers/gpu/drm/nouveau/nvkm/device/acpi.h
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/device/base.c
similarity index 100%
rename from drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
rename to drivers/gpu/drm/nouveau/nvkm/device/base.c
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c b/drivers/gpu/drm/nouveau/nvkm/device/ctrl.c
similarity index 100%
rename from drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c
rename to drivers/gpu/drm/nouveau/nvkm/device/ctrl.c
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.h b/drivers/gpu/drm/nouveau/nvkm/device/ctrl.h
similarity index 100%
rename from drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.h
rename to drivers/gpu/drm/nouveau/nvkm/device/ctrl.h
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c b/drivers/gpu/drm/nouveau/nvkm/device/pci.c
similarity index 100%
rename from drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c
rename to drivers/gpu/drm/nouveau/nvkm/device/pci.c
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h b/drivers/gpu/drm/nouveau/nvkm/device/priv.h
similarity index 100%
rename from drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h
rename to drivers/gpu/drm/nouveau/nvkm/device/priv.h
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c b/drivers/gpu/drm/nouveau/nvkm/device/tegra.c
similarity index 100%
rename from drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
rename to drivers/gpu/drm/nouveau/nvkm/device/tegra.c
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c b/drivers/gpu/drm/nouveau/nvkm/device/user.c
similarity index 100%
rename from drivers/gpu/drm/nouveau/nvkm/engine/device/user.c
rename to drivers/gpu/drm/nouveau/nvkm/device/user.c
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/Kbuild b/drivers/gpu/drm/nouveau/nvkm/engine/Kbuild
index bfaaff645a34..f9eb68a25de8 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/Kbuild
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/Kbuild
@@ -5,7 +5,6 @@ nvkm-y += nvkm/engine/xtensa.o
 include $(src)/nvkm/engine/bsp/Kbuild
 include $(src)/nvkm/engine/ce/Kbuild
 include $(src)/nvkm/engine/cipher/Kbuild
-include $(src)/nvkm/engine/device/Kbuild
 include $(src)/nvkm/engine/disp/Kbuild
 include $(src)/nvkm/engine/dma/Kbuild
 include $(src)/nvkm/engine/fifo/Kbuild
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/Kbuild b/drivers/gpu/drm/nouveau/nvkm/engine/device/Kbuild
deleted file mode 100644
index 293c57678dab..000000000000
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/Kbuild
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: MIT
-nvkm-y += nvkm/engine/device/acpi.o
-nvkm-y += nvkm/engine/device/base.o
-nvkm-y += nvkm/engine/device/ctrl.o
-nvkm-y += nvkm/engine/device/pci.o
-nvkm-y += nvkm/engine/device/tegra.o
-nvkm-y += nvkm/engine/device/user.o
-- 
2.41.0