Commit 35ba63b8 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

vme: move back to staging 



The VME subsystem graduated from staging into a top-level subsystem in
2012, with commit db3b9e99 ("Staging: VME: move VME drivers out of
staging") stating:

    The VME device drivers have not moved out yet due to some API
    questions they are still working through, that should happen soon,
    hopefully.

However, this never happened: maintenance of drivers/vme effectively
stopped in 2017, with all subsequent changes being treewide cleanups.
No hardware driver remains in staging, only the limited user-level
access, and I just removed one of the two bridge drivers and the only
remaining board.

drivers/staging/vme/devices/ was recently moved to
drivers/staging/vme_user/, but as the vme_user driver is the only one
remaining for this subsystem, it is easier to just move the remaining
three source files into this directory rather than keeping the original
hierarchy.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20220606084109.4108188-3-arnd@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 34935361

Documentation/driver-api/vme.rst

+2 −2
Original line number Diff line number Diff line
@@ -290,8 +290,8 @@ The function :c:func:`vme_bus_num` returns the bus ID of the provided bridge. 
VME API

-------



.. kernel-doc:: include/linux/vme.h

.. kernel-doc:: drivers/staging/vme_user/vme.h

   :internal:



.. kernel-doc:: drivers/vme/vme.c

.. kernel-doc:: drivers/staging/vme_user/vme.c

   :export:

MAINTAINERS

+1 −3
Original line number Diff line number Diff line
@@ -21230,12 +21230,10 @@ M: Martyn Welch <martyn@welchs.me.uk> 
M:	Manohar Vanga <manohar.vanga@gmail.com>

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

L:	linux-kernel@vger.kernel.org

S:	Maintained

S:	Odd fixes

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_user/

F:	drivers/vme/

F:	include/linux/vme*









VM SOCKETS (AF_VSOCK)









M:	Stefano Garzarella <sgarzare@redhat.com>

























drivers/Kconfig



+0
−2






























Original line number
Diff line number
Diff line







@@ -183,8 +183,6 @@ source "drivers/iio/Kconfig"

















source "drivers/ntb/Kconfig"



















source "drivers/vme/Kconfig"



















source "drivers/pwm/Kconfig"



















source "drivers/irqchip/Kconfig"


































drivers/Makefile



+0
−1






























Original line number
Diff line number
Diff line







@@ -165,7 +165,6 @@ obj-$(CONFIG_PM_DEVFREQ)	+= devfreq/







obj-$(CONFIG_EXTCON)		+= extcon/









obj-$(CONFIG_MEMORY)		+= memory/









obj-$(CONFIG_IIO)		+= iio/









obj-$(CONFIG_VME_BUS)		+= vme/









obj-$(CONFIG_IPACK_BUS)		+= ipack/









obj-$(CONFIG_NTB)		+= ntb/









obj-$(CONFIG_POWERCAP)		+= powercap/


































drivers/staging/vme_user/Kconfig



+27
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0









menuconfig VME_BUS









	bool "VME bridge support"









	depends on STAGING && PCI









	help









	  If you say Y here you get support for the VME bridge Framework.



















if VME_BUS



















comment "VME Bridge Drivers"



















config VME_TSI148









	tristate "Tempe"









	depends on HAS_DMA









	help









	 If you say Y here you get support for the Tundra TSI148 VME bridge









	 chip.



















config VME_FAKE









	tristate "Fake"









	help









	 If you say Y here you get support for the fake VME bridge. This









	 provides a virtualised VME Bus for devices with no VME bridge. This









	 is mainly useful for VME development (in the absence of VME









	 hardware).



















comment "VME Device Drivers"



















config VME_USER










@@ -11,3 +36,5 @@ config VME_USER

















	  To compile this driver as a module, choose M here. The module will









	  be called vme_user. If unsure, say N.



















endif