From e36c9c00188458d4843d68cae947e64d99259b0e Mon Sep 17 00:00:00 2001 From: Bruno Moreira-Guedes Date: Thu, 21 Apr 2022 11:59:34 -0300 Subject: [PATCH] staging: vme: Move 'vme/devices/' to 'vme_user/' In ("Staging: VME: move VME drivers out of staging") the vme code, board and bridge drivers were moved out of the staging tree, remaining only the VME user device driver. Since this driver is the only one remaining in staging, such multi-level structure confuses more than helps. The current structure is as follows: - drivers/staging/vme/ Makefile devices/ Kconfig Makefile vme_user.c vme_user.h The top-level Makefile has the only function of calling another Makefile into the devices/ subdirectory. This latter only compiles the vme_user driver, since there is no other in the staging tree. This patch removes the unnecessary Makefile from the 'vme/' dir, move the contents of 'vme/devices' into the 'vme/' dir, and renames it to 'vme_user/' (the driver name), allowing a straightforward understanding of this driver's contents. Furthermore, it updates the MAINTAINERS file to properly reflect the new paths. Signed-off-by: Bruno Moreira-Guedes Link: https://lore.kernel.org/r/2cd7de9a426c443a5ea618682d605ecfd751d798.1650544175.git.codeagain@codeagain.dev Signed-off-by: Greg Kroah-Hartman --- MAINTAINERS | 2 +- drivers/staging/Kconfig | 3 +-- drivers/staging/Makefile | 2 +- drivers/staging/vme/Makefile | 2 -- drivers/staging/{vme/devices => vme_user}/Kconfig | 0 drivers/staging/{vme/devices => vme_user}/Makefile | 0 drivers/staging/{vme/devices => vme_user}/vme_user.c | 0 drivers/staging/{vme/devices => vme_user}/vme_user.h | 0 8 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 drivers/staging/vme/Makefile rename drivers/staging/{vme/devices => vme_user}/Kconfig (100%) rename drivers/staging/{vme/devices => vme_user}/Makefile (100%) rename drivers/staging/{vme/devices => vme_user}/vme_user.c (100%) rename drivers/staging/{vme/devices => vme_user}/vme_user.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index a62da6d0f943..0a635f2ae5b9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -21002,7 +21002,7 @@ L: linux-kernel@vger.kernel.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git F: Documentation/driver-api/vme.rst -F: drivers/staging/vme/ +F: drivers/staging/vme_user/ F: drivers/vme/ F: include/linux/vme* diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 42dcb9b7cb60..0a993c47273e 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -84,7 +84,6 @@ source "drivers/staging/fieldbus/Kconfig" source "drivers/staging/qlge/Kconfig" - -source "drivers/staging/vme/devices/Kconfig" +source "drivers/staging/vme_user/Kconfig" endif # STAGING diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index a17a2aeaceba..2800ab9b2d1d 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -14,7 +14,7 @@ obj-$(CONFIG_OCTEON_ETHERNET) += octeon/ obj-$(CONFIG_OCTEON_USB) += octeon-usb/ obj-$(CONFIG_VT6655) += vt6655/ obj-$(CONFIG_VT6656) += vt6656/ -obj-$(CONFIG_VME_BUS) += vme/ +obj-$(CONFIG_VME_BUS) += vme_user/ obj-$(CONFIG_IIO) += iio/ obj-$(CONFIG_FB_SM750) += sm750fb/ obj-$(CONFIG_USB_EMXX) += emxx_udc/ diff --git a/drivers/staging/vme/Makefile b/drivers/staging/vme/Makefile deleted file mode 100644 index cf2f686ccffe..000000000000 --- a/drivers/staging/vme/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -obj-y += devices/ diff --git a/drivers/staging/vme/devices/Kconfig b/drivers/staging/vme_user/Kconfig similarity index 100% rename from drivers/staging/vme/devices/Kconfig rename to drivers/staging/vme_user/Kconfig diff --git a/drivers/staging/vme/devices/Makefile b/drivers/staging/vme_user/Makefile similarity index 100% rename from drivers/staging/vme/devices/Makefile rename to drivers/staging/vme_user/Makefile diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme_user/vme_user.c similarity index 100% rename from drivers/staging/vme/devices/vme_user.c rename to drivers/staging/vme_user/vme_user.c diff --git a/drivers/staging/vme/devices/vme_user.h b/drivers/staging/vme_user/vme_user.h similarity index 100% rename from drivers/staging/vme/devices/vme_user.h rename to drivers/staging/vme_user/vme_user.h