staging: gpib: Destage gpib drivers
Subsystems (2)
Dave Penkler
maintainercover staging: gpib: Destage gpib drivers
This patch series is for moving the gpib drivers out of the staging area.
As many changes as possible (patches 1-7) are done in the staging area to prepare for the move out of the staging area. Patches 8-11 do the move and enable gpib in Kconfig and Makefile in the main drivers directory.
The MAINTAINER file will need to be updated when these patches have been applied.
Patch 1: Remove the gpib option from the staging Kconfig menu Patch 2: Remove the build rule for gpib from staging Makefile Patch 3: Remove the gpib/uapi directory from include search path Patch 4: In the code change the uapi include file paths to <linux/xxx.h> Patch 5: Remove comment item in TODO file
Patch 6: Delete the word Linux from gpib Kconfig option title Patch 7: Add SPDX syscall note to uapi gpib headers
Patch 8: Move the common gpib/uapi headers to include/uapi/linux Patch 9: Move the gpib tree out of staging
Patch 10: Add gpib Kconfig option to the main drivers Kconfig menu Patch 11: Add gpib build rule to main drivers Makefile
Dave Penkler (11):
staging: Remove gpib Kconfig option from staging
staging: Remove build of gpib drivers from Makefile
staging: gpib: Remove gpib/uapi from search path
staging: gpib: Change file path for uapi headers
staging: gpib: Update TODO file
staging: gpib: Change gpib Kconfig option title
staging: gpib: Fix SPDX license for gpib headers
uapi: linux: Add common gpib interface headers
gpib: Move gpib drivers out of staging
gpib: Add gpib Kconfig option
gpib: Add build rule for gpib to Makefile
drivers/Kconfig | 2 ++
drivers/Makefile | 1 +
drivers/{staging => }/gpib/Kconfig | 2 +-
drivers/{staging => }/gpib/Makefile | 2 +-
drivers/{staging => }/gpib/TODO | 14 --------------
drivers/{staging => }/gpib/agilent_82350b/Makefile | 0
.../gpib/agilent_82350b/agilent_82350b.c | 0
.../gpib/agilent_82350b/agilent_82350b.h | 0
drivers/{staging => }/gpib/agilent_82357a/Makefile | 0
.../gpib/agilent_82357a/agilent_82357a.c | 0
.../gpib/agilent_82357a/agilent_82357a.h | 0
drivers/{staging => }/gpib/cb7210/Makefile | 0
drivers/{staging => }/gpib/cb7210/cb7210.c | 0
drivers/{staging => }/gpib/cb7210/cb7210.h | 0
drivers/{staging => }/gpib/cec/Makefile | 0
drivers/{staging => }/gpib/cec/cec.h | 0
drivers/{staging => }/gpib/cec/cec_gpib.c | 0
drivers/{staging => }/gpib/common/Makefile | 0
drivers/{staging => }/gpib/common/gpib_os.c | 0
drivers/{staging => }/gpib/common/iblib.c | 0
drivers/{staging => }/gpib/common/ibsys.h | 0
drivers/{staging => }/gpib/eastwood/Makefile | 0
drivers/{staging => }/gpib/eastwood/fluke_gpib.c | 0
drivers/{staging => }/gpib/eastwood/fluke_gpib.h | 0
drivers/{staging => }/gpib/fmh_gpib/Makefile | 0
drivers/{staging => }/gpib/fmh_gpib/fmh_gpib.c | 0
drivers/{staging => }/gpib/fmh_gpib/fmh_gpib.h | 0
drivers/{staging => }/gpib/gpio/Makefile | 0
drivers/{staging => }/gpib/gpio/gpib_bitbang.c | 0
drivers/{staging => }/gpib/hp_82335/Makefile | 0
drivers/{staging => }/gpib/hp_82335/hp82335.c | 0
drivers/{staging => }/gpib/hp_82335/hp82335.h | 0
drivers/{staging => }/gpib/hp_82341/Makefile | 0
drivers/{staging => }/gpib/hp_82341/hp_82341.c | 0
drivers/{staging => }/gpib/hp_82341/hp_82341.h | 0
drivers/{staging => }/gpib/include/amcc5920.h | 0
drivers/{staging => }/gpib/include/amccs5933.h | 0
drivers/{staging => }/gpib/include/gpibP.h | 4 ++--
drivers/{staging => }/gpib/include/gpib_cmd.h | 0
drivers/{staging => }/gpib/include/gpib_pci_ids.h | 0
drivers/{staging => }/gpib/include/gpib_proto.h | 0
.../gpib/include/gpib_state_machines.h | 0
drivers/{staging => }/gpib/include/gpib_types.h | 2 +-
drivers/{staging => }/gpib/include/nec7210.h | 0
.../{staging => }/gpib/include/nec7210_registers.h | 0
drivers/{staging => }/gpib/include/plx9050.h | 0
drivers/{staging => }/gpib/include/quancom_pci.h | 0
drivers/{staging => }/gpib/include/tms9914.h | 0
.../{staging => }/gpib/include/tnt4882_registers.h | 0
drivers/{staging => }/gpib/ines/Makefile | 0
drivers/{staging => }/gpib/ines/ines.h | 0
drivers/{staging => }/gpib/ines/ines_gpib.c | 0
drivers/{staging => }/gpib/lpvo_usb_gpib/Makefile | 0
.../gpib/lpvo_usb_gpib/lpvo_usb_gpib.c | 0
drivers/{staging => }/gpib/nec7210/Makefile | 0
drivers/{staging => }/gpib/nec7210/board.h | 0
drivers/{staging => }/gpib/nec7210/nec7210.c | 0
drivers/{staging => }/gpib/ni_usb/Makefile | 0
drivers/{staging => }/gpib/ni_usb/ni_usb_gpib.c | 0
drivers/{staging => }/gpib/ni_usb/ni_usb_gpib.h | 0
drivers/{staging => }/gpib/pc2/Makefile | 0
drivers/{staging => }/gpib/pc2/pc2_gpib.c | 0
drivers/{staging => }/gpib/tms9914/Makefile | 0
drivers/{staging => }/gpib/tms9914/tms9914.c | 0
drivers/{staging => }/gpib/tnt4882/Makefile | 0
drivers/{staging => }/gpib/tnt4882/mite.c | 0
drivers/{staging => }/gpib/tnt4882/mite.h | 0
drivers/{staging => }/gpib/tnt4882/tnt4882_gpib.c | 0
drivers/staging/Kconfig | 2 --
drivers/staging/Makefile | 1 -
.../gpib/uapi => include/uapi/linux}/gpib.h | 2 +-
.../gpib/uapi => include/uapi/linux}/gpib_ioctl.h | 2 +-
72 files changed, 10 insertions(+), 24 deletions(-)
rename drivers/{staging => }/gpib/Kconfig (99%)
rename drivers/{staging => }/gpib/Makefile (92%)
rename drivers/{staging => }/gpib/TODO (56%)
rename drivers/{staging => }/gpib/agilent_82350b/Makefile (100%)
rename drivers/{staging => }/gpib/agilent_82350b/agilent_82350b.c (100%)
rename drivers/{staging => }/gpib/agilent_82350b/agilent_82350b.h (100%)
rename drivers/{staging => }/gpib/agilent_82357a/Makefile (100%)
rename drivers/{staging => }/gpib/agilent_82357a/agilent_82357a.c (100%)
rename drivers/{staging => }/gpib/agilent_82357a/agilent_82357a.h (100%)
rename drivers/{staging => }/gpib/cb7210/Makefile (100%)
rename drivers/{staging => }/gpib/cb7210/cb7210.c (100%)
rename drivers/{staging => }/gpib/cb7210/cb7210.h (100%)
rename drivers/{staging => }/gpib/cec/Makefile (100%)
rename drivers/{staging => }/gpib/cec/cec.h (100%)
rename drivers/{staging => }/gpib/cec/cec_gpib.c (100%)
rename drivers/{staging => }/gpib/common/Makefile (100%)
rename drivers/{staging => }/gpib/common/gpib_os.c (100%)
rename drivers/{staging => }/gpib/common/iblib.c (100%)
rename drivers/{staging => }/gpib/common/ibsys.h (100%)
rename drivers/{staging => }/gpib/eastwood/Makefile (100%)
rename drivers/{staging => }/gpib/eastwood/fluke_gpib.c (100%)
rename drivers/{staging => }/gpib/eastwood/fluke_gpib.h (100%)
rename drivers/{staging => }/gpib/fmh_gpib/Makefile (100%)
rename drivers/{staging => }/gpib/fmh_gpib/fmh_gpib.c (100%)
rename drivers/{staging => }/gpib/fmh_gpib/fmh_gpib.h (100%)
rename drivers/{staging => }/gpib/gpio/Makefile (100%)
rename drivers/{staging => }/gpib/gpio/gpib_bitbang.c (100%)
rename drivers/{staging => }/gpib/hp_82335/Makefile (100%)
rename drivers/{staging => }/gpib/hp_82335/hp82335.c (100%)
rename drivers/{staging => }/gpib/hp_82335/hp82335.h (100%)
rename drivers/{staging => }/gpib/hp_82341/Makefile (100%)
rename drivers/{staging => }/gpib/hp_82341/hp_82341.c (100%)
rename drivers/{staging => }/gpib/hp_82341/hp_82341.h (100%)
rename drivers/{staging => }/gpib/include/amcc5920.h (100%)
rename drivers/{staging => }/gpib/include/amccs5933.h (100%)
rename drivers/{staging => }/gpib/include/gpibP.h (96%)
rename drivers/{staging => }/gpib/include/gpib_cmd.h (100%)
rename drivers/{staging => }/gpib/include/gpib_pci_ids.h (100%)
rename drivers/{staging => }/gpib/include/gpib_proto.h (100%)
rename drivers/{staging => }/gpib/include/gpib_state_machines.h (100%)
rename drivers/{staging => }/gpib/include/gpib_types.h (99%)
rename drivers/{staging => }/gpib/include/nec7210.h (100%)
rename drivers/{staging => }/gpib/include/nec7210_registers.h (100%)
rename drivers/{staging => }/gpib/include/plx9050.h (100%)
rename drivers/{staging => }/gpib/include/quancom_pci.h (100%)
rename drivers/{staging => }/gpib/include/tms9914.h (100%)
rename drivers/{staging => }/gpib/include/tnt4882_registers.h (100%)
rename drivers/{staging => }/gpib/ines/Makefile (100%)
rename drivers/{staging => }/gpib/ines/ines.h (100%)
rename drivers/{staging => }/gpib/ines/ines_gpib.c (100%)
rename drivers/{staging => }/gpib/lpvo_usb_gpib/Makefile (100%)
rename drivers/{staging => }/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c (100%)
rename drivers/{staging => }/gpib/nec7210/Makefile (100%)
rename drivers/{staging => }/gpib/nec7210/board.h (100%)
rename drivers/{staging => }/gpib/nec7210/nec7210.c (100%)
rename drivers/{staging => }/gpib/ni_usb/Makefile (100%)
rename drivers/{staging => }/gpib/ni_usb/ni_usb_gpib.c (100%)
rename drivers/{staging => }/gpib/ni_usb/ni_usb_gpib.h (100%)
rename drivers/{staging => }/gpib/pc2/Makefile (100%)
rename drivers/{staging => }/gpib/pc2/pc2_gpib.c (100%)
rename drivers/{staging => }/gpib/tms9914/Makefile (100%)
rename drivers/{staging => }/gpib/tms9914/tms9914.c (100%)
rename drivers/{staging => }/gpib/tnt4882/Makefile (100%)
rename drivers/{staging => }/gpib/tnt4882/mite.c (100%)
rename drivers/{staging => }/gpib/tnt4882/mite.h (100%)
rename drivers/{staging => }/gpib/tnt4882/tnt4882_gpib.c (100%)
rename {drivers/staging/gpib/uapi => include/uapi/linux}/gpib.h (97%)
rename {drivers/staging/gpib/uapi => include/uapi/linux}/gpib_ioctl.h (98%)Signature · 1 line
2.51.2
Dave Penkler
maintainerPATCH 1/11 staging: Remove gpib Kconfig option from staging
This option is no longer needed after the gpib drivers have been destaged.
--- drivers/staging/Kconfig | 2 -- 1 file changed, 2 deletions(-)
drivers/staging/Kconfig +0 -2
@@ -48,6 +48,4 @@ source "drivers/staging/axis-fifo/Kconfig" source "drivers/staging/vme_user/Kconfig" -source "drivers/staging/gpib/Kconfig" - endif # STAGING
Signature · 1 line
2.51.2
Dave Penkler
maintainerPATCH 2/11 staging: Remove build of gpib drivers from Makefile
In reply to Dave PenklerOnce the gpib drivers have moved out of staging/ the build rule for the gpib drivers in staging is no longer required.
--- drivers/staging/Makefile | 1 - 1 file changed, 1 deletion(-)
drivers/staging/Makefile +0 -1
@@ -13,4 +13,3 @@ obj-$(CONFIG_MOST) += most/ obj-$(CONFIG_GREYBUS) += greybus/ obj-$(CONFIG_BCM2835_VCHIQ) += vc04_services/ obj-$(CONFIG_XIL_AXIS_FIFO) += axis-fifo/ -obj-$(CONFIG_GPIB) += gpib/
Signature · 1 line
2.51.2
Re: [PATCH 02/11] staging: Remove build of gpib drivers from Makefile
Quoted 13 lines · Dave Penkler
Once the gpib drivers have moved out of staging/ the build rule for the gpib drivers in staging is no longer required.
Signed-off-by Dave Penkler <[email protected]>--- drivers/staging/Makefile | 1 - 1 file changed, 1 deletion(-)drivers/staging/Makefile +0
-0
drivers/staging/Makefile obj-$(CONFIG_MOST) += most/ · line 16
Quoted 4 lines
drivers/staging/Makefile +0
-1@@ -13,4 +13,3 @@ obj-$(CONFIG_MOST) += most/ obj-$(CONFIG_GREYBUS) += greybus/ obj-$(CONFIG_BCM2835_VCHIQ) += vc04_services/ obj-$(CONFIG_XIL_AXIS_FIFO) += axis-fifo/ -obj-$(CONFIG_GPIB) += gpib/
Just fold this into whatever patch is removing the last gpib staging bits.
Johan
Dave Penkler
maintainerPATCH 3/11 staging: gpib: Remove gpib/uapi from search path
In reply to Dave PenklerThe gpib/uapi header files are being moved to include/uapi/linux as part of the gpib destaging process. The latter directory is automatically searched when building the drivers.
Remove gpib/uapi from the header file search path in subdir-ccflags
--- drivers/staging/gpib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/gpib/Makefile +1 -1
@@ -1,5 +1,5 @@ -subdir-ccflags-y += -I$(src)/include -I$(src)/uapi +subdir-ccflags-y += -I$(src)/include obj-$(CONFIG_GPIB_AGILENT_82350B) += agilent_82350b/ obj-$(CONFIG_GPIB_AGILENT_82357A) += agilent_82357a/
Signature · 1 line
2.51.2
Dave Penkler
maintainerPATCH 4/11 staging: gpib: Change file path for uapi headers
In reply to Dave PenklerAs part of the gpib destaging process the gpib/uapi header files will be moved to the standard kernel uapi directory include/uapi/linux
Change the include file path in the code for these files accordingly.
--- drivers/staging/gpib/include/gpibP.h | 4 ++-- drivers/staging/gpib/include/gpib_types.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/gpib/include/gpibP.h +2 -2
@@ -12,8 +12,8 @@#include "gpib_types.h" #include "gpib_proto.h" #include "gpib_cmd.h" -#include "gpib.h" -#include "gpib_ioctl.h" +#include <linux/gpib.h> +#include <linux/gpib_ioctl.h> #include <linux/fs.h> #include <linux/interrupt.h>
drivers/staging/gpib/include/gpib_types.h +1 -1
@@ -8,7 +8,7 @@#define _GPIB_TYPES_H#ifdef __KERNEL__ -#include "gpib.h" +#include <linux/gpib.h> #include <linux/atomic.h> #include <linux/device.h> #include <linux/mutex.h>
Signature · 1 line
2.51.2
Dave Penkler
maintainerPATCH 5/11 staging: gpib: Update TODO file
In reply to Dave PenklerThe comments have now been fixed so remove the item about comments from the TODO file.
--- drivers/staging/gpib/TODO | 14 -------------- 1 file changed, 14 deletions(-)
drivers/staging/gpib/TODO +0 -14
@@ -4,20 +4,6 @@ TODO: CHECK:ALLOC_SIZEOF_STRUCT: Prefer kmalloc(sizeof(*board->private_data)...) over kmalloc(sizeof(struct xxx_priv)...) ./gpio/gpib_bitbang.c:50: ERROR:COMPLEX_MACRO: Macros with complex values should be enclosed in parenthese This warning will be addressed later: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string -- tidy-up comments: - - there are some "//comments" and "// comments" scattered around - - sometimes they are misaligned - - sometimes "// comments" are interleaved with "/* comments */" - - multiline comments should start with initial almost-blank line: - /* - * Good - * multiline - * comment - */ - /* Bad - * multiline - * comment - */ - resolve XXX notes where possible - fix FIXME notes - clean-up commented-out code
Signature · 1 line
2.51.2
Dave Penkler
maintainerPATCH 6/11 staging: gpib: Change gpib Kconfig option title
In reply to Dave PenklerRemove the word "Linux" from the gpib Kconfig option title as it adds no information - it is redundant.
--- drivers/staging/gpib/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/gpib/Kconfig +1 -1
@@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 menuconfig GPIB - tristate "Linux GPIB drivers" + tristate "GPIB drivers" help Enable support for GPIB cards and dongles for Linux. GPIB is the General Purpose Interface Bus which conforms to the
Signature · 1 line
2.51.2
Dave Penkler
maintainerPATCH 7/11 staging: gpib: Fix SPDX license for gpib headers
In reply to Dave PenklerAs part destaging the gpib drivers we need to add the WITH Linux-syscall-note to the SPDX license in the gpib common includes as these will be part of the kernel headers.
--- drivers/staging/gpib/uapi/gpib.h | 2 +- drivers/staging/gpib/uapi/gpib_ioctl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/gpib/uapi/gpib.h +1 -1
@@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /*************************************************************************** * copyright : (C) 2002 by Frank Mori Hess
drivers/staging/gpib/uapi/gpib_ioctl.h +1 -1
@@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /*************************************************************************** * copyright : (C) 2002 by Frank Mori Hess
Signature · 1 line
2.51.2
Dave Penkler
maintainerPATCH 8/11 uapi: linux: Add common gpib interface headers
In reply to Dave PenklerThe gpib user space library needs these include files in order to communicate with the drivers. Copies of these includes were previously used to build the user space library. Post destaging they can use the includes from the kernel headers.
---
{drivers/staging/gpib/uapi => include/uapi/linux}/gpib.h | 0
{drivers/staging/gpib/uapi => include/uapi/linux}/gpib_ioctl.h | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename {drivers/staging/gpib/uapi => include/uapi/linux}/gpib.h (100%)
rename {drivers/staging/gpib/uapi => include/uapi/linux}/gpib_ioctl.h (100%)include/uapi/linux/gpib.h renamed from drivers/staging/gpib/uapi/gpib.h +0 -0
include/uapi/linux/gpib_ioctl.h renamed from drivers/staging/gpib/uapi/gpib_ioctl.h +0 -0
Signature · 1 line
2.51.2
Dave Penkler
maintainerPATCH 9/11 gpib: Move gpib drivers out of staging
In reply to Dave PenklerChanges within the gpib tree for destaging have been addressed in the preceding patches.
---
drivers/{staging => }/gpib/Kconfig | 0
drivers/{staging => }/gpib/Makefile | 0
drivers/{staging => }/gpib/TODO | 0
drivers/{staging => }/gpib/agilent_82350b/Makefile | 0
drivers/{staging => }/gpib/agilent_82350b/agilent_82350b.c | 0
drivers/{staging => }/gpib/agilent_82350b/agilent_82350b.h | 0
drivers/{staging => }/gpib/agilent_82357a/Makefile | 0
drivers/{staging => }/gpib/agilent_82357a/agilent_82357a.c | 0
drivers/{staging => }/gpib/agilent_82357a/agilent_82357a.h | 0
drivers/{staging => }/gpib/cb7210/Makefile | 0
drivers/{staging => }/gpib/cb7210/cb7210.c | 0
drivers/{staging => }/gpib/cb7210/cb7210.h | 0
drivers/{staging => }/gpib/cec/Makefile | 0
drivers/{staging => }/gpib/cec/cec.h | 0
drivers/{staging => }/gpib/cec/cec_gpib.c | 0
drivers/{staging => }/gpib/common/Makefile | 0
drivers/{staging => }/gpib/common/gpib_os.c | 0
drivers/{staging => }/gpib/common/iblib.c | 0
drivers/{staging => }/gpib/common/ibsys.h | 0
drivers/{staging => }/gpib/eastwood/Makefile | 0
drivers/{staging => }/gpib/eastwood/fluke_gpib.c | 0
drivers/{staging => }/gpib/eastwood/fluke_gpib.h | 0
drivers/{staging => }/gpib/fmh_gpib/Makefile | 0
drivers/{staging => }/gpib/fmh_gpib/fmh_gpib.c | 0
drivers/{staging => }/gpib/fmh_gpib/fmh_gpib.h | 0
drivers/{staging => }/gpib/gpio/Makefile | 0
drivers/{staging => }/gpib/gpio/gpib_bitbang.c | 0
drivers/{staging => }/gpib/hp_82335/Makefile | 0
drivers/{staging => }/gpib/hp_82335/hp82335.c | 0
drivers/{staging => }/gpib/hp_82335/hp82335.h | 0
drivers/{staging => }/gpib/hp_82341/Makefile | 0
drivers/{staging => }/gpib/hp_82341/hp_82341.c | 0
drivers/{staging => }/gpib/hp_82341/hp_82341.h | 0
drivers/{staging => }/gpib/include/amcc5920.h | 0
drivers/{staging => }/gpib/include/amccs5933.h | 0
drivers/{staging => }/gpib/include/gpibP.h | 0
drivers/{staging => }/gpib/include/gpib_cmd.h | 0
drivers/{staging => }/gpib/include/gpib_pci_ids.h | 0
drivers/{staging => }/gpib/include/gpib_proto.h | 0
drivers/{staging => }/gpib/include/gpib_state_machines.h | 0
drivers/{staging => }/gpib/include/gpib_types.h | 0
drivers/{staging => }/gpib/include/nec7210.h | 0
drivers/{staging => }/gpib/include/nec7210_registers.h | 0
drivers/{staging => }/gpib/include/plx9050.h | 0
drivers/{staging => }/gpib/include/quancom_pci.h | 0
drivers/{staging => }/gpib/include/tms9914.h | 0
drivers/{staging => }/gpib/include/tnt4882_registers.h | 0
drivers/{staging => }/gpib/ines/Makefile | 0
drivers/{staging => }/gpib/ines/ines.h | 0
drivers/{staging => }/gpib/ines/ines_gpib.c | 0
drivers/{staging => }/gpib/lpvo_usb_gpib/Makefile | 0
drivers/{staging => }/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c | 0
drivers/{staging => }/gpib/nec7210/Makefile | 0
drivers/{staging => }/gpib/nec7210/board.h | 0
drivers/{staging => }/gpib/nec7210/nec7210.c | 0
drivers/{staging => }/gpib/ni_usb/Makefile | 0
drivers/{staging => }/gpib/ni_usb/ni_usb_gpib.c | 0
drivers/{staging => }/gpib/ni_usb/ni_usb_gpib.h | 0
drivers/{staging => }/gpib/pc2/Makefile | 0
drivers/{staging => }/gpib/pc2/pc2_gpib.c | 0
drivers/{staging => }/gpib/tms9914/Makefile | 0
drivers/{staging => }/gpib/tms9914/tms9914.c | 0
drivers/{staging => }/gpib/tnt4882/Makefile | 0
drivers/{staging => }/gpib/tnt4882/mite.c | 0
drivers/{staging => }/gpib/tnt4882/mite.h | 0
drivers/{staging => }/gpib/tnt4882/tnt4882_gpib.c | 0
66 files changed, 0 insertions(+), 0 deletions(-)
rename drivers/{staging => }/gpib/Kconfig (100%)
rename drivers/{staging => }/gpib/Makefile (100%)
rename drivers/{staging => }/gpib/TODO (100%)
rename drivers/{staging => }/gpib/agilent_82350b/Makefile (100%)
rename drivers/{staging => }/gpib/agilent_82350b/agilent_82350b.c (100%)
rename drivers/{staging => }/gpib/agilent_82350b/agilent_82350b.h (100%)
rename drivers/{staging => }/gpib/agilent_82357a/Makefile (100%)
rename drivers/{staging => }/gpib/agilent_82357a/agilent_82357a.c (100%)
rename drivers/{staging => }/gpib/agilent_82357a/agilent_82357a.h (100%)
rename drivers/{staging => }/gpib/cb7210/Makefile (100%)
rename drivers/{staging => }/gpib/cb7210/cb7210.c (100%)
rename drivers/{staging => }/gpib/cb7210/cb7210.h (100%)
rename drivers/{staging => }/gpib/cec/Makefile (100%)
rename drivers/{staging => }/gpib/cec/cec.h (100%)
rename drivers/{staging => }/gpib/cec/cec_gpib.c (100%)
rename drivers/{staging => }/gpib/common/Makefile (100%)
rename drivers/{staging => }/gpib/common/gpib_os.c (100%)
rename drivers/{staging => }/gpib/common/iblib.c (100%)
rename drivers/{staging => }/gpib/common/ibsys.h (100%)
rename drivers/{staging => }/gpib/eastwood/Makefile (100%)
rename drivers/{staging => }/gpib/eastwood/fluke_gpib.c (100%)
rename drivers/{staging => }/gpib/eastwood/fluke_gpib.h (100%)
rename drivers/{staging => }/gpib/fmh_gpib/Makefile (100%)
rename drivers/{staging => }/gpib/fmh_gpib/fmh_gpib.c (100%)
rename drivers/{staging => }/gpib/fmh_gpib/fmh_gpib.h (100%)
rename drivers/{staging => }/gpib/gpio/Makefile (100%)
rename drivers/{staging => }/gpib/gpio/gpib_bitbang.c (100%)
rename drivers/{staging => }/gpib/hp_82335/Makefile (100%)
rename drivers/{staging => }/gpib/hp_82335/hp82335.c (100%)
rename drivers/{staging => }/gpib/hp_82335/hp82335.h (100%)
rename drivers/{staging => }/gpib/hp_82341/Makefile (100%)
rename drivers/{staging => }/gpib/hp_82341/hp_82341.c (100%)
rename drivers/{staging => }/gpib/hp_82341/hp_82341.h (100%)
rename drivers/{staging => }/gpib/include/amcc5920.h (100%)
rename drivers/{staging => }/gpib/include/amccs5933.h (100%)
rename drivers/{staging => }/gpib/include/gpibP.h (100%)
rename drivers/{staging => }/gpib/include/gpib_cmd.h (100%)
rename drivers/{staging => }/gpib/include/gpib_pci_ids.h (100%)
rename drivers/{staging => }/gpib/include/gpib_proto.h (100%)
rename drivers/{staging => }/gpib/include/gpib_state_machines.h (100%)
rename drivers/{staging => }/gpib/include/gpib_types.h (100%)
rename drivers/{staging => }/gpib/include/nec7210.h (100%)
rename drivers/{staging => }/gpib/include/nec7210_registers.h (100%)
rename drivers/{staging => }/gpib/include/plx9050.h (100%)
rename drivers/{staging => }/gpib/include/quancom_pci.h (100%)
rename drivers/{staging => }/gpib/include/tms9914.h (100%)
rename drivers/{staging => }/gpib/include/tnt4882_registers.h (100%)
rename drivers/{staging => }/gpib/ines/Makefile (100%)
rename drivers/{staging => }/gpib/ines/ines.h (100%)
rename drivers/{staging => }/gpib/ines/ines_gpib.c (100%)
rename drivers/{staging => }/gpib/lpvo_usb_gpib/Makefile (100%)
rename drivers/{staging => }/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c (100%)
rename drivers/{staging => }/gpib/nec7210/Makefile (100%)
rename drivers/{staging => }/gpib/nec7210/board.h (100%)
rename drivers/{staging => }/gpib/nec7210/nec7210.c (100%)
rename drivers/{staging => }/gpib/ni_usb/Makefile (100%)
rename drivers/{staging => }/gpib/ni_usb/ni_usb_gpib.c (100%)
rename drivers/{staging => }/gpib/ni_usb/ni_usb_gpib.h (100%)
rename drivers/{staging => }/gpib/pc2/Makefile (100%)
rename drivers/{staging => }/gpib/pc2/pc2_gpib.c (100%)
rename drivers/{staging => }/gpib/tms9914/Makefile (100%)
rename drivers/{staging => }/gpib/tms9914/tms9914.c (100%)
rename drivers/{staging => }/gpib/tnt4882/Makefile (100%)
rename drivers/{staging => }/gpib/tnt4882/mite.c (100%)
rename drivers/{staging => }/gpib/tnt4882/mite.h (100%)
rename drivers/{staging => }/gpib/tnt4882/tnt4882_gpib.c (100%)drivers/gpib/Kconfig renamed from drivers/staging/gpib/Kconfig +0 -0
drivers/gpib/Makefile renamed from drivers/staging/gpib/Makefile +0 -0
drivers/gpib/TODO renamed from drivers/staging/gpib/TODO +0 -0
drivers/gpib/agilent_82350b/Makefile renamed from drivers/staging/gpib/agilent_82350b/Makefile +0 -0
drivers/gpib/agilent_82350b/agilent_82350b.c renamed from drivers/staging/gpib/agilent_82350b/agilent_82350b.c +0 -0
drivers/gpib/agilent_82350b/agilent_82350b.h renamed from drivers/staging/gpib/agilent_82350b/agilent_82350b.h +0 -0
drivers/gpib/agilent_82357a/Makefile renamed from drivers/staging/gpib/agilent_82357a/Makefile +0 -0
drivers/gpib/agilent_82357a/agilent_82357a.c renamed from drivers/staging/gpib/agilent_82357a/agilent_82357a.c +0 -0
drivers/gpib/agilent_82357a/agilent_82357a.h renamed from drivers/staging/gpib/agilent_82357a/agilent_82357a.h +0 -0
drivers/gpib/cb7210/Makefile renamed from drivers/staging/gpib/cb7210/Makefile +0 -0
drivers/gpib/cb7210/cb7210.c renamed from drivers/staging/gpib/cb7210/cb7210.c +0 -0
drivers/gpib/cb7210/cb7210.h renamed from drivers/staging/gpib/cb7210/cb7210.h +0 -0
drivers/gpib/cec/Makefile renamed from drivers/staging/gpib/cec/Makefile +0 -0
drivers/gpib/cec/cec.h renamed from drivers/staging/gpib/cec/cec.h +0 -0
drivers/gpib/cec/cec_gpib.c renamed from drivers/staging/gpib/cec/cec_gpib.c +0 -0
drivers/gpib/common/Makefile renamed from drivers/staging/gpib/common/Makefile +0 -0
drivers/gpib/common/gpib_os.c renamed from drivers/staging/gpib/common/gpib_os.c +0 -0
drivers/gpib/common/iblib.c renamed from drivers/staging/gpib/common/iblib.c +0 -0
drivers/gpib/common/ibsys.h renamed from drivers/staging/gpib/common/ibsys.h +0 -0
drivers/gpib/eastwood/Makefile renamed from drivers/staging/gpib/eastwood/Makefile +0 -0
drivers/gpib/eastwood/fluke_gpib.c renamed from drivers/staging/gpib/eastwood/fluke_gpib.c +0 -0
drivers/gpib/eastwood/fluke_gpib.h renamed from drivers/staging/gpib/eastwood/fluke_gpib.h +0 -0
drivers/gpib/fmh_gpib/Makefile renamed from drivers/staging/gpib/fmh_gpib/Makefile +0 -0
drivers/gpib/fmh_gpib/fmh_gpib.c renamed from drivers/staging/gpib/fmh_gpib/fmh_gpib.c +0 -0
drivers/gpib/fmh_gpib/fmh_gpib.h renamed from drivers/staging/gpib/fmh_gpib/fmh_gpib.h +0 -0
drivers/gpib/gpio/Makefile renamed from drivers/staging/gpib/gpio/Makefile +0 -0
drivers/gpib/gpio/gpib_bitbang.c renamed from drivers/staging/gpib/gpio/gpib_bitbang.c +0 -0
drivers/gpib/hp_82335/Makefile renamed from drivers/staging/gpib/hp_82335/Makefile +0 -0
drivers/gpib/hp_82335/hp82335.c renamed from drivers/staging/gpib/hp_82335/hp82335.c +0 -0
drivers/gpib/hp_82335/hp82335.h renamed from drivers/staging/gpib/hp_82335/hp82335.h +0 -0
drivers/gpib/hp_82341/Makefile renamed from drivers/staging/gpib/hp_82341/Makefile +0 -0
drivers/gpib/hp_82341/hp_82341.c renamed from drivers/staging/gpib/hp_82341/hp_82341.c +0 -0
drivers/gpib/hp_82341/hp_82341.h renamed from drivers/staging/gpib/hp_82341/hp_82341.h +0 -0
drivers/gpib/include/amcc5920.h renamed from drivers/staging/gpib/include/amcc5920.h +0 -0
drivers/gpib/include/amccs5933.h renamed from drivers/staging/gpib/include/amccs5933.h +0 -0
drivers/gpib/include/gpibP.h renamed from drivers/staging/gpib/include/gpibP.h +0 -0
drivers/gpib/include/gpib_cmd.h renamed from drivers/staging/gpib/include/gpib_cmd.h +0 -0
drivers/gpib/include/gpib_pci_ids.h renamed from drivers/staging/gpib/include/gpib_pci_ids.h +0 -0
drivers/gpib/include/gpib_proto.h renamed from drivers/staging/gpib/include/gpib_proto.h +0 -0
drivers/gpib/include/gpib_state_machines.h renamed from drivers/staging/gpib/include/gpib_state_machines.h +0 -0
drivers/gpib/include/gpib_types.h renamed from drivers/staging/gpib/include/gpib_types.h +0 -0
drivers/gpib/include/nec7210.h renamed from drivers/staging/gpib/include/nec7210.h +0 -0
drivers/gpib/include/nec7210_registers.h renamed from drivers/staging/gpib/include/nec7210_registers.h +0 -0
drivers/gpib/include/plx9050.h renamed from drivers/staging/gpib/include/plx9050.h +0 -0
drivers/gpib/include/quancom_pci.h renamed from drivers/staging/gpib/include/quancom_pci.h +0 -0
drivers/gpib/include/tms9914.h renamed from drivers/staging/gpib/include/tms9914.h +0 -0
drivers/gpib/include/tnt4882_registers.h renamed from drivers/staging/gpib/include/tnt4882_registers.h +0 -0
drivers/gpib/ines/Makefile renamed from drivers/staging/gpib/ines/Makefile +0 -0
drivers/gpib/ines/ines.h renamed from drivers/staging/gpib/ines/ines.h +0 -0
drivers/gpib/ines/ines_gpib.c renamed from drivers/staging/gpib/ines/ines_gpib.c +0 -0
drivers/gpib/lpvo_usb_gpib/Makefile renamed from drivers/staging/gpib/lpvo_usb_gpib/Makefile +0 -0
drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c renamed from drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c +0 -0
drivers/gpib/nec7210/Makefile renamed from drivers/staging/gpib/nec7210/Makefile +0 -0
drivers/gpib/nec7210/board.h renamed from drivers/staging/gpib/nec7210/board.h +0 -0
drivers/gpib/nec7210/nec7210.c renamed from drivers/staging/gpib/nec7210/nec7210.c +0 -0
drivers/gpib/ni_usb/Makefile renamed from drivers/staging/gpib/ni_usb/Makefile +0 -0
drivers/gpib/ni_usb/ni_usb_gpib.c renamed from drivers/staging/gpib/ni_usb/ni_usb_gpib.c +0 -0
drivers/gpib/ni_usb/ni_usb_gpib.h renamed from drivers/staging/gpib/ni_usb/ni_usb_gpib.h +0 -0
drivers/gpib/pc2/Makefile renamed from drivers/staging/gpib/pc2/Makefile +0 -0
drivers/gpib/pc2/pc2_gpib.c renamed from drivers/staging/gpib/pc2/pc2_gpib.c +0 -0
drivers/gpib/tms9914/Makefile renamed from drivers/staging/gpib/tms9914/Makefile +0 -0
drivers/gpib/tms9914/tms9914.c renamed from drivers/staging/gpib/tms9914/tms9914.c +0 -0
drivers/gpib/tnt4882/Makefile renamed from drivers/staging/gpib/tnt4882/Makefile +0 -0
drivers/gpib/tnt4882/mite.c renamed from drivers/staging/gpib/tnt4882/mite.c +0 -0
drivers/gpib/tnt4882/mite.h renamed from drivers/staging/gpib/tnt4882/mite.h +0 -0
drivers/gpib/tnt4882/tnt4882_gpib.c renamed from drivers/staging/gpib/tnt4882/tnt4882_gpib.c +0 -0
Signature · 1 line
2.51.2
Dave Penkler
maintainerPATCH 10/11 gpib: Add gpib Kconfig option
In reply to Dave PenklerAs part of destaging the gpib drivers we need to add the sourcing of the gpib Kconfig file to the main drivers Kconfig file. It has been added just after the Kconfig for the comedi drivers as they are most related to the gpib drivers.
--- drivers/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
drivers/Kconfig +2 -0
@@ -161,6 +161,8 @@ source "drivers/greybus/Kconfig" source "drivers/comedi/Kconfig" +source "drivers/gpib/Kconfig" + source "drivers/staging/Kconfig" source "drivers/platform/Kconfig"
Signature · 1 line
2.51.2
Re: [PATCH 10/11] gpib: Add gpib Kconfig option
Quoted 15 lines · Dave Penkler
As part of destaging the gpib drivers we need to add the sourcing of the gpib
Kconfigfile to the main driversKconfigfile. It has been added just after theKconfigfor the comedi drivers as they are most related to the gpib drivers.Signed-off-by Dave Penkler <[email protected]>--- drivers/Kconfig | 2 ++ 1 file changed, 2 insertions(+)drivers/Kconfig +0
-0
drivers/Kconfig source "drivers/greybus/Kconfig" · line 164
Quoted 4 lines
drivers/Kconfig +1
-0@@ -161,6 +161,8 @@ source "drivers/greybus/Kconfig" source "drivers/comedi/Kconfig" +source "drivers/gpib/Kconfig"
And fold this into the commit adding the Kconfig.
Joha
Dave Penkler
maintainerPATCH 11/11 gpib: Add build rule for gpib to Makefile
In reply to Dave PenklerAs part of the destaging of the gpib drivers we need to add the gpib rule to the main drivers Makefile.
--- drivers/Makefile | 1 + 1 file changed, 1 insertion(+)
drivers/Makefile +1 -0
@@ -150,6 +150,7 @@ obj-$(CONFIG_VHOST_IOTLB) += vhost/ obj-$(CONFIG_VHOST) += vhost/ obj-$(CONFIG_GREYBUS) += greybus/ obj-$(CONFIG_COMEDI) += comedi/ +obj-$(CONFIG_GPIB) += gpib/ obj-$(CONFIG_STAGING) += staging/ obj-y += platform/
Signature · 1 line
2.51.2
Re: [PATCH 11/11] gpib: Add build rule for gpib to Makefile
Quoted 13 lines · Dave Penkler
As part of the destaging of the gpib drivers we need to add the gpib rule to the main drivers
Makefile.Signed-off-by Dave Penkler <[email protected]>--- drivers/Makefile | 1 + 1 file changed, 1 insertion(+)drivers/Makefile +0
-0
drivers/Makefile obj-$(CONFIG_VHOST_IOTLB) += vhost/ · line 153
Quoted 4 lines
drivers/Makefile +1
-0@@ -150,6 +150,7 @@ obj-$(CONFIG_VHOST_IOTLB) += vhost/ obj-$(CONFIG_VHOST) += vhost/ obj-$(CONFIG_GREYBUS) += greybus/ obj-$(CONFIG_COMEDI) += comedi/ +obj-$(CONFIG_GPIB) += gpib/
And similar here, fold it into the patch moving the first gpib bits out of staging.
drivers/Makefile obj-$(CONFIG_VHOST_IOTLB) += vhost/ · line 155
Quoted 2 lines
drivers/Makefile +0
-0obj-$(CONFIG_STAGING) += staging/ obj-y += platform/
Johan