Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: gpib: Destage gpib

Move the gpib drivers out of staging and into the "real" part of the
kernel. This entails:

- Remove the gpib Kconfig menu and Makefile build rule from staging.
- Remove gpib/uapi from the header file search path in subdir-ccflags
of the gpib Makefile
- move the gpib/uapi files to include/uapi/linux
- Move the gpib tree out of staging to drivers.
- Remove the word "Linux" from the gpib Kconfig file.
- Add the gpib Kconfig menu and Makefile build rule to drivers

Signed-off-by: Dave Penkler <dpenkler@gmail.com>
Link: https://patch.msgid.link/20251117144021.23569-5-dpenkler@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Dave Penkler and committed by
Greg Kroah-Hartman
e6ab5046 a64ff10c

+14 -12
+3 -1
MAINTAINERS
··· 10628 10628 GPIB DRIVERS 10629 10629 M: Dave Penkler <dpenkler@gmail.com> 10630 10630 S: Maintained 10631 - F: drivers/staging/gpib/ 10631 + F: drivers/gpib/ 10632 + F: include/uapi/linux/gpib.h 10633 + F: include/uapi/linux/gpib_ioctl.h 10632 10634 10633 10635 GPIO ACPI SUPPORT 10634 10636 M: Mika Westerberg <westeri@kernel.org>
+2
drivers/Kconfig
··· 161 161 162 162 source "drivers/comedi/Kconfig" 163 163 164 + source "drivers/gpib/Kconfig" 165 + 164 166 source "drivers/staging/Kconfig" 165 167 166 168 source "drivers/platform/Kconfig"
+1
drivers/Makefile
··· 150 150 obj-$(CONFIG_VHOST) += vhost/ 151 151 obj-$(CONFIG_GREYBUS) += greybus/ 152 152 obj-$(CONFIG_COMEDI) += comedi/ 153 + obj-$(CONFIG_GPIB) += gpib/ 153 154 obj-$(CONFIG_STAGING) += staging/ 154 155 obj-y += platform/ 155 156
-2
drivers/staging/Kconfig
··· 48 48 49 49 source "drivers/staging/vme_user/Kconfig" 50 50 51 - source "drivers/staging/gpib/Kconfig" 52 - 53 51 endif # STAGING
-1
drivers/staging/Makefile
··· 13 13 obj-$(CONFIG_GREYBUS) += greybus/ 14 14 obj-$(CONFIG_BCM2835_VCHIQ) += vc04_services/ 15 15 obj-$(CONFIG_XIL_AXIS_FIFO) += axis-fifo/ 16 - obj-$(CONFIG_GPIB) += gpib/
+4 -4
drivers/staging/gpib/Kconfig drivers/gpib/Kconfig
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 2 menuconfig GPIB 3 - tristate "Linux GPIB drivers" 3 + tristate "GPIB drivers" 4 4 help 5 - Enable support for GPIB cards and dongles for Linux. GPIB 6 - is the General Purpose Interface Bus which conforms to the 7 - IEEE488 standard. 5 + Enable support for GPIB cards and dongles. GPIB is the 6 + General Purpose Interface Bus which conforms to the IEEE488 7 + standard. 8 8 9 9 This set of drivers can be used with the corresponding user 10 10 space library that can be found on Sourceforge under linux-gpib.
+1 -1
drivers/staging/gpib/Makefile drivers/gpib/Makefile
··· 1 1 2 - subdir-ccflags-y += -I$(src)/include -I$(src)/uapi 2 + subdir-ccflags-y += -I$(src)/include 3 3 4 4 obj-$(CONFIG_GPIB_AGILENT_82350B) += agilent_82350b/ 5 5 obj-$(CONFIG_GPIB_AGILENT_82357A) += agilent_82357a/
drivers/staging/gpib/TODO drivers/gpib/TODO
drivers/staging/gpib/agilent_82350b/Makefile drivers/gpib/agilent_82350b/Makefile
drivers/staging/gpib/agilent_82350b/agilent_82350b.c drivers/gpib/agilent_82350b/agilent_82350b.c
drivers/staging/gpib/agilent_82350b/agilent_82350b.h drivers/gpib/agilent_82350b/agilent_82350b.h
drivers/staging/gpib/agilent_82357a/Makefile drivers/gpib/agilent_82357a/Makefile
drivers/staging/gpib/agilent_82357a/agilent_82357a.c drivers/gpib/agilent_82357a/agilent_82357a.c
drivers/staging/gpib/agilent_82357a/agilent_82357a.h drivers/gpib/agilent_82357a/agilent_82357a.h
drivers/staging/gpib/cb7210/Makefile drivers/gpib/cb7210/Makefile
drivers/staging/gpib/cb7210/cb7210.c drivers/gpib/cb7210/cb7210.c
drivers/staging/gpib/cb7210/cb7210.h drivers/gpib/cb7210/cb7210.h
drivers/staging/gpib/cec/Makefile drivers/gpib/cec/Makefile
drivers/staging/gpib/cec/cec.h drivers/gpib/cec/cec.h
drivers/staging/gpib/cec/cec_gpib.c drivers/gpib/cec/cec_gpib.c
drivers/staging/gpib/common/Makefile drivers/gpib/common/Makefile
drivers/staging/gpib/common/gpib_os.c drivers/gpib/common/gpib_os.c
drivers/staging/gpib/common/iblib.c drivers/gpib/common/iblib.c
drivers/staging/gpib/common/ibsys.h drivers/gpib/common/ibsys.h
drivers/staging/gpib/eastwood/Makefile drivers/gpib/eastwood/Makefile
drivers/staging/gpib/eastwood/fluke_gpib.c drivers/gpib/eastwood/fluke_gpib.c
drivers/staging/gpib/eastwood/fluke_gpib.h drivers/gpib/eastwood/fluke_gpib.h
drivers/staging/gpib/fmh_gpib/Makefile drivers/gpib/fmh_gpib/Makefile
drivers/staging/gpib/fmh_gpib/fmh_gpib.c drivers/gpib/fmh_gpib/fmh_gpib.c
drivers/staging/gpib/fmh_gpib/fmh_gpib.h drivers/gpib/fmh_gpib/fmh_gpib.h
drivers/staging/gpib/gpio/Makefile drivers/gpib/gpio/Makefile
drivers/staging/gpib/gpio/gpib_bitbang.c drivers/gpib/gpio/gpib_bitbang.c
drivers/staging/gpib/hp_82335/Makefile drivers/gpib/hp_82335/Makefile
drivers/staging/gpib/hp_82335/hp82335.c drivers/gpib/hp_82335/hp82335.c
drivers/staging/gpib/hp_82335/hp82335.h drivers/gpib/hp_82335/hp82335.h
drivers/staging/gpib/hp_82341/Makefile drivers/gpib/hp_82341/Makefile
drivers/staging/gpib/hp_82341/hp_82341.c drivers/gpib/hp_82341/hp_82341.c
drivers/staging/gpib/hp_82341/hp_82341.h drivers/gpib/hp_82341/hp_82341.h
drivers/staging/gpib/include/amcc5920.h drivers/gpib/include/amcc5920.h
drivers/staging/gpib/include/amccs5933.h drivers/gpib/include/amccs5933.h
+2 -2
drivers/staging/gpib/include/gpibP.h drivers/gpib/include/gpibP.h
··· 12 12 #include "gpib_types.h" 13 13 #include "gpib_proto.h" 14 14 #include "gpib_cmd.h" 15 - #include "gpib.h" 16 - #include "gpib_ioctl.h" 15 + #include <linux/gpib.h> 16 + #include <linux/gpib_ioctl.h> 17 17 18 18 #include <linux/fs.h> 19 19 #include <linux/interrupt.h>
drivers/staging/gpib/include/gpib_cmd.h drivers/gpib/include/gpib_cmd.h
drivers/staging/gpib/include/gpib_pci_ids.h drivers/gpib/include/gpib_pci_ids.h
drivers/staging/gpib/include/gpib_proto.h drivers/gpib/include/gpib_proto.h
drivers/staging/gpib/include/gpib_state_machines.h drivers/gpib/include/gpib_state_machines.h
+1 -1
drivers/staging/gpib/include/gpib_types.h drivers/gpib/include/gpib_types.h
··· 8 8 #define _GPIB_TYPES_H 9 9 10 10 #ifdef __KERNEL__ 11 - #include "gpib.h" 11 + #include <linux/gpib.h> 12 12 #include <linux/atomic.h> 13 13 #include <linux/device.h> 14 14 #include <linux/mutex.h>
drivers/staging/gpib/include/nec7210.h drivers/gpib/include/nec7210.h
drivers/staging/gpib/include/nec7210_registers.h drivers/gpib/include/nec7210_registers.h
drivers/staging/gpib/include/plx9050.h drivers/gpib/include/plx9050.h
drivers/staging/gpib/include/quancom_pci.h drivers/gpib/include/quancom_pci.h
drivers/staging/gpib/include/tms9914.h drivers/gpib/include/tms9914.h
drivers/staging/gpib/include/tnt4882_registers.h drivers/gpib/include/tnt4882_registers.h
drivers/staging/gpib/ines/Makefile drivers/gpib/ines/Makefile
drivers/staging/gpib/ines/ines.h drivers/gpib/ines/ines.h
drivers/staging/gpib/ines/ines_gpib.c drivers/gpib/ines/ines_gpib.c
drivers/staging/gpib/lpvo_usb_gpib/Makefile drivers/gpib/lpvo_usb_gpib/Makefile
drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c
drivers/staging/gpib/nec7210/Makefile drivers/gpib/nec7210/Makefile
drivers/staging/gpib/nec7210/board.h drivers/gpib/nec7210/board.h
drivers/staging/gpib/nec7210/nec7210.c drivers/gpib/nec7210/nec7210.c
drivers/staging/gpib/ni_usb/Makefile drivers/gpib/ni_usb/Makefile
drivers/staging/gpib/ni_usb/ni_usb_gpib.c drivers/gpib/ni_usb/ni_usb_gpib.c
drivers/staging/gpib/ni_usb/ni_usb_gpib.h drivers/gpib/ni_usb/ni_usb_gpib.h
drivers/staging/gpib/pc2/Makefile drivers/gpib/pc2/Makefile
drivers/staging/gpib/pc2/pc2_gpib.c drivers/gpib/pc2/pc2_gpib.c
drivers/staging/gpib/tms9914/Makefile drivers/gpib/tms9914/Makefile
drivers/staging/gpib/tms9914/tms9914.c drivers/gpib/tms9914/tms9914.c
drivers/staging/gpib/tnt4882/Makefile drivers/gpib/tnt4882/Makefile
drivers/staging/gpib/tnt4882/mite.c drivers/gpib/tnt4882/mite.c
drivers/staging/gpib/tnt4882/mite.h drivers/gpib/tnt4882/mite.h
drivers/staging/gpib/tnt4882/tnt4882_gpib.c drivers/gpib/tnt4882/tnt4882_gpib.c
drivers/staging/gpib/uapi/gpib.h include/uapi/linux/gpib.h
drivers/staging/gpib/uapi/gpib_ioctl.h include/uapi/linux/gpib_ioctl.h