Rename the nova-drm driver directory from drivers/gpu/drm/nova/ to drivers/gpu/drm/nova-drm/ and the top-level source file from nova.rs to nova_drm.rs (matching the object name nova_drm.o) to follow the kebab-case naming convention already used by the auxiliary device name.
Update MAINTAINERS, Kconfig, and Makefile references accordingly. Update the Kconfig help text to reflect the new module name nova-drm. Link: https://github.com/Rust-for-Linux/linux/issues/1228 Signed-off-by: Cheng-Yang Chou <[email protected]> --- MAINTAINERS | 6 +++--- drivers/gpu/drm/Kconfig | 2 +- drivers/gpu/drm/Makefile | 2 +- drivers/gpu/drm/{nova => nova-drm}/Kconfig | 2 +- drivers/gpu/drm/nova-drm/Makefile | 3 +++ drivers/gpu/drm/{nova => nova-drm}/driver.rs | 0 drivers/gpu/drm/{nova => nova-drm}/file.rs | 0 drivers/gpu/drm/{nova => nova-drm}/gem.rs | 0 drivers/gpu/drm/{nova/nova.rs => nova-drm/nova_drm.rs} | 0 drivers/gpu/drm/nova/Makefile | 3 --- 10 files changed, 9 insertions(+), 9 deletions(-) rename drivers/gpu/drm/{nova => nova-drm}/Kconfig (84%) create mode 100644 drivers/gpu/drm/nova-drm/Makefile rename drivers/gpu/drm/{nova => nova-drm}/driver.rs (100%) rename drivers/gpu/drm/{nova => nova-drm}/file.rs (100%) rename drivers/gpu/drm/{nova => nova-drm}/gem.rs (100%) rename drivers/gpu/drm/{nova/nova.rs => nova-drm/nova_drm.rs} (100%) delete mode 100644 drivers/gpu/drm/nova/Makefile diff --git a/MAINTAINERS b/MAINTAINERS index 7b277d5bf3d1..7ee486627420 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8201,7 +8201,7 @@ B: https://gitlab.freedesktop.org/drm/nova/-/issues C: irc://irc.oftc.net/nouveau T: git https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust-next F: Documentation/gpu/nova/ -F: drivers/gpu/drm/nova/ +F: drivers/gpu/drm/nova-drm/ F: include/uapi/drm/nova_drm.h DRM DRIVER FOR OLIMEX LCD-OLINUXINO PANELS @@ -8484,7 +8484,7 @@ X: drivers/gpu/drm/i915/ X: drivers/gpu/drm/kmb/ X: drivers/gpu/drm/mediatek/ X: drivers/gpu/drm/msm/ -X: drivers/gpu/drm/nova/ +X: drivers/gpu/drm/nova-drm/ X: drivers/gpu/drm/radeon/ X: drivers/gpu/drm/tegra/ X: drivers/gpu/drm/tyr/ @@ -8496,7 +8496,7 @@ M: Alice Ryhl <[email protected]> S: Supported W: https://drm.pages.freedesktop.org/maintainer-tools/drm-rust.html T: git https://gitlab.freedesktop.org/drm/rust/kernel.git -F: drivers/gpu/drm/nova/ +F: drivers/gpu/drm/nova-drm/ F: drivers/gpu/drm/tyr/ F: drivers/gpu/nova-core/ F: rust/kernel/drm/ diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index d3d52310c9cc..958fa142b6cd 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -308,7 +308,7 @@ source "drivers/gpu/drm/mgag200/Kconfig" source "drivers/gpu/drm/msm/Kconfig" source "drivers/gpu/drm/mxsfb/Kconfig" source "drivers/gpu/drm/nouveau/Kconfig" -source "drivers/gpu/drm/nova/Kconfig" +source "drivers/gpu/drm/nova-drm/Kconfig" source "drivers/gpu/drm/omapdrm/Kconfig" source "drivers/gpu/drm/panel/Kconfig" source "drivers/gpu/drm/panfrost/Kconfig" diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index ec2c5ff82382..acdec9e30a27 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -186,7 +186,7 @@ obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/ obj-$(CONFIG_DRM_VGEM) += vgem/ obj-$(CONFIG_DRM_VKMS) += vkms/ obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/ -obj-$(CONFIG_DRM_NOVA) += nova/ +obj-$(CONFIG_DRM_NOVA) += nova-drm/ obj-$(CONFIG_DRM_EXYNOS) +=exynos/ obj-$(CONFIG_DRM_ROCKCHIP) +=rockchip/ obj-$(CONFIG_DRM_GMA500) += gma500/ diff --git a/drivers/gpu/drm/nova/Kconfig b/drivers/gpu/drm/nova-drm/Kconfig similarity index 84% rename from drivers/gpu/drm/nova/Kconfig rename to drivers/gpu/drm/nova-drm/Kconfig index 3e637ad7b5ba..48a731bff9b1 100644 --- a/drivers/gpu/drm/nova/Kconfig +++ b/drivers/gpu/drm/nova-drm/Kconfig @@ -13,4 +13,4 @@ config DRM_NOVA This driver is work in progress and may not be functional. - If M is selected, the module will be called nova. + If M is selected, the module will be called nova-drm. diff --git a/drivers/gpu/drm/nova-drm/Makefile b/drivers/gpu/drm/nova-drm/Makefile new file mode 100644 index 000000000000..bd3a5e703742 --- /dev/null +++ b/drivers/gpu/drm/nova-drm/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_DRM_NOVA) += nova_drm.o diff --git a/drivers/gpu/drm/nova/driver.rs b/drivers/gpu/drm/nova-drm/driver.rs similarity index 100% rename from drivers/gpu/drm/nova/driver.rs rename to drivers/gpu/drm/nova-drm/driver.rs diff --git a/drivers/gpu/drm/nova/file.rs b/drivers/gpu/drm/nova-drm/file.rs similarity index 100% rename from drivers/gpu/drm/nova/file.rs rename to drivers/gpu/drm/nova-drm/file.rs diff --git a/drivers/gpu/drm/nova/gem.rs b/drivers/gpu/drm/nova-drm/gem.rs similarity index 100% rename from drivers/gpu/drm/nova/gem.rs rename to drivers/gpu/drm/nova-drm/gem.rs diff --git a/drivers/gpu/drm/nova/nova.rs b/drivers/gpu/drm/nova-drm/nova_drm.rs similarity index 100% rename from drivers/gpu/drm/nova/nova.rs rename to drivers/gpu/drm/nova-drm/nova_drm.rs diff --git a/drivers/gpu/drm/nova/Makefile b/drivers/gpu/drm/nova/Makefile deleted file mode 100644 index 42019bff3173..000000000000 --- a/drivers/gpu/drm/nova/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 - -obj-$(CONFIG_DRM_NOVA) += nova.o -- 2.48.1
