Skip to contentSkip to conversation

staging: gpib: Destage gpib drivers

PATCH Superseded Dave Penkler 2 participants 15 messages Nov 10, 2025

Subsystems (2)

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Dave Penkler

author maintainer
#0 lore raw

cover 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
author maintainer
#1 lore raw

PATCH 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
index 075e775d3868..2f92cd698bef 100644
@@ -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
author maintainer
#2 lore raw

PATCH 2/11 staging: Remove build of gpib drivers from Makefile

In reply to Dave Penkler

Once 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
index e681e403509c..f5b8876aa536 100644
@@ -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
#3 lore raw

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.

---
 drivers/staging/Makefile | 1 -
 1 file changed, 1 deletion(-)
drivers/staging/Makefile +0 -0
index e681e403509c..f5b8876aa536 100644

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

author maintainer
#4 lore raw

PATCH 3/11 staging: gpib: Remove gpib/uapi from search path

In reply to Dave Penkler

The 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
index d0e88f5c0844..2d44fed2a743 100644
@@ -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
author maintainer
#5 lore raw

PATCH 4/11 staging: gpib: Change file path for uapi headers

In reply to Dave Penkler

As 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
index 1b27f37e0ba0..e3938ada3e0d 100644
@@ -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
index 998abb379749..5a0978ae27e7 100644
@@ -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
author maintainer
#6 lore raw

PATCH 5/11 staging: gpib: Update TODO file

In reply to Dave Penkler

The 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
index ab41a7f9ca5b..ac07dd90b4ef 100644
@@ -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
author maintainer
#7 lore raw

PATCH 6/11 staging: gpib: Change gpib Kconfig option title

In reply to Dave Penkler

Remove 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
index aa01538d5beb..2f42aa2d55fd 100644
@@ -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
author maintainer
#8 lore raw

PATCH 7/11 staging: gpib: Fix SPDX license for gpib headers

In reply to Dave Penkler

As 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
index ddf82a4d989f..2a7f5eeb9777 100644
@@ -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
index 55bf5e55507a..50bb6e251e45 100644
@@ -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
author maintainer
#9 lore raw

PATCH 8/11 uapi: linux: Add common gpib interface headers

In reply to Dave Penkler

The 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
similarity index 100%
rename from drivers/staging/gpib/uapi/gpib.h
rename to include/uapi/linux/gpib.h
include/uapi/linux/gpib_ioctl.h renamed from drivers/staging/gpib/uapi/gpib_ioctl.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/uapi/gpib_ioctl.h
rename to include/uapi/linux/gpib_ioctl.h
Signature · 1 line
2.51.2
author maintainer
#10 lore raw

PATCH 9/11 gpib: Move gpib drivers out of staging

In reply to Dave Penkler

Changes 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
similarity index 100%
rename from drivers/staging/gpib/Kconfig
rename to drivers/gpib/Kconfig
drivers/gpib/Makefile renamed from drivers/staging/gpib/Makefile +0 -0
similarity index 100%
rename from drivers/staging/gpib/Makefile
rename to drivers/gpib/Makefile
drivers/gpib/TODO renamed from drivers/staging/gpib/TODO +0 -0
similarity index 100%
rename from drivers/staging/gpib/TODO
rename to drivers/gpib/TODO
drivers/gpib/agilent_82350b/Makefile renamed from drivers/staging/gpib/agilent_82350b/Makefile +0 -0
similarity index 100%
rename from drivers/staging/gpib/agilent_82350b/Makefile
rename to drivers/gpib/agilent_82350b/Makefile
drivers/gpib/agilent_82350b/agilent_82350b.c renamed from drivers/staging/gpib/agilent_82350b/agilent_82350b.c +0 -0
similarity index 100%
rename from drivers/staging/gpib/agilent_82350b/agilent_82350b.c
rename to drivers/gpib/agilent_82350b/agilent_82350b.c
drivers/gpib/agilent_82350b/agilent_82350b.h renamed from drivers/staging/gpib/agilent_82350b/agilent_82350b.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/agilent_82350b/agilent_82350b.h
rename to drivers/gpib/agilent_82350b/agilent_82350b.h
drivers/gpib/agilent_82357a/Makefile renamed from drivers/staging/gpib/agilent_82357a/Makefile +0 -0
similarity index 100%
rename from drivers/staging/gpib/agilent_82357a/Makefile
rename to drivers/gpib/agilent_82357a/Makefile
drivers/gpib/agilent_82357a/agilent_82357a.c renamed from drivers/staging/gpib/agilent_82357a/agilent_82357a.c +0 -0
similarity index 100%
rename from drivers/staging/gpib/agilent_82357a/agilent_82357a.c
rename to drivers/gpib/agilent_82357a/agilent_82357a.c
drivers/gpib/agilent_82357a/agilent_82357a.h renamed from drivers/staging/gpib/agilent_82357a/agilent_82357a.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/agilent_82357a/agilent_82357a.h
rename to drivers/gpib/agilent_82357a/agilent_82357a.h
drivers/gpib/cb7210/Makefile renamed from drivers/staging/gpib/cb7210/Makefile +0 -0
similarity index 100%
rename from drivers/staging/gpib/cb7210/Makefile
rename to drivers/gpib/cb7210/Makefile
drivers/gpib/cb7210/cb7210.c renamed from drivers/staging/gpib/cb7210/cb7210.c +0 -0
similarity index 100%
rename from drivers/staging/gpib/cb7210/cb7210.c
rename to drivers/gpib/cb7210/cb7210.c
drivers/gpib/cb7210/cb7210.h renamed from drivers/staging/gpib/cb7210/cb7210.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/cb7210/cb7210.h
rename to drivers/gpib/cb7210/cb7210.h
drivers/gpib/cec/Makefile renamed from drivers/staging/gpib/cec/Makefile +0 -0
similarity index 100%
rename from drivers/staging/gpib/cec/Makefile
rename to drivers/gpib/cec/Makefile
drivers/gpib/cec/cec.h renamed from drivers/staging/gpib/cec/cec.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/cec/cec.h
rename to drivers/gpib/cec/cec.h
drivers/gpib/cec/cec_gpib.c renamed from drivers/staging/gpib/cec/cec_gpib.c +0 -0
similarity index 100%
rename from drivers/staging/gpib/cec/cec_gpib.c
rename to drivers/gpib/cec/cec_gpib.c
drivers/gpib/common/Makefile renamed from drivers/staging/gpib/common/Makefile +0 -0
similarity index 100%
rename from drivers/staging/gpib/common/Makefile
rename to drivers/gpib/common/Makefile
drivers/gpib/common/gpib_os.c renamed from drivers/staging/gpib/common/gpib_os.c +0 -0
similarity index 100%
rename from drivers/staging/gpib/common/gpib_os.c
rename to drivers/gpib/common/gpib_os.c
drivers/gpib/common/iblib.c renamed from drivers/staging/gpib/common/iblib.c +0 -0
similarity index 100%
rename from drivers/staging/gpib/common/iblib.c
rename to drivers/gpib/common/iblib.c
drivers/gpib/common/ibsys.h renamed from drivers/staging/gpib/common/ibsys.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/common/ibsys.h
rename to drivers/gpib/common/ibsys.h
drivers/gpib/eastwood/Makefile renamed from drivers/staging/gpib/eastwood/Makefile +0 -0
similarity index 100%
rename from drivers/staging/gpib/eastwood/Makefile
rename to drivers/gpib/eastwood/Makefile
drivers/gpib/eastwood/fluke_gpib.c renamed from drivers/staging/gpib/eastwood/fluke_gpib.c +0 -0
similarity index 100%
rename from drivers/staging/gpib/eastwood/fluke_gpib.c
rename to drivers/gpib/eastwood/fluke_gpib.c
drivers/gpib/eastwood/fluke_gpib.h renamed from drivers/staging/gpib/eastwood/fluke_gpib.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/eastwood/fluke_gpib.h
rename to drivers/gpib/eastwood/fluke_gpib.h
drivers/gpib/fmh_gpib/Makefile renamed from drivers/staging/gpib/fmh_gpib/Makefile +0 -0
similarity index 100%
rename from drivers/staging/gpib/fmh_gpib/Makefile
rename to drivers/gpib/fmh_gpib/Makefile
drivers/gpib/fmh_gpib/fmh_gpib.c renamed from drivers/staging/gpib/fmh_gpib/fmh_gpib.c +0 -0
similarity index 100%
rename from drivers/staging/gpib/fmh_gpib/fmh_gpib.c
rename to drivers/gpib/fmh_gpib/fmh_gpib.c
drivers/gpib/fmh_gpib/fmh_gpib.h renamed from drivers/staging/gpib/fmh_gpib/fmh_gpib.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/fmh_gpib/fmh_gpib.h
rename to drivers/gpib/fmh_gpib/fmh_gpib.h
drivers/gpib/gpio/Makefile renamed from drivers/staging/gpib/gpio/Makefile +0 -0
similarity index 100%
rename from drivers/staging/gpib/gpio/Makefile
rename to drivers/gpib/gpio/Makefile
drivers/gpib/gpio/gpib_bitbang.c renamed from drivers/staging/gpib/gpio/gpib_bitbang.c +0 -0
similarity index 100%
rename from drivers/staging/gpib/gpio/gpib_bitbang.c
rename to drivers/gpib/gpio/gpib_bitbang.c
drivers/gpib/hp_82335/Makefile renamed from drivers/staging/gpib/hp_82335/Makefile +0 -0
similarity index 100%
rename from drivers/staging/gpib/hp_82335/Makefile
rename to drivers/gpib/hp_82335/Makefile
drivers/gpib/hp_82335/hp82335.c renamed from drivers/staging/gpib/hp_82335/hp82335.c +0 -0
similarity index 100%
rename from drivers/staging/gpib/hp_82335/hp82335.c
rename to drivers/gpib/hp_82335/hp82335.c
drivers/gpib/hp_82335/hp82335.h renamed from drivers/staging/gpib/hp_82335/hp82335.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/hp_82335/hp82335.h
rename to drivers/gpib/hp_82335/hp82335.h
drivers/gpib/hp_82341/Makefile renamed from drivers/staging/gpib/hp_82341/Makefile +0 -0
similarity index 100%
rename from drivers/staging/gpib/hp_82341/Makefile
rename to drivers/gpib/hp_82341/Makefile
drivers/gpib/hp_82341/hp_82341.c renamed from drivers/staging/gpib/hp_82341/hp_82341.c +0 -0
similarity index 100%
rename from drivers/staging/gpib/hp_82341/hp_82341.c
rename to drivers/gpib/hp_82341/hp_82341.c
drivers/gpib/hp_82341/hp_82341.h renamed from drivers/staging/gpib/hp_82341/hp_82341.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/hp_82341/hp_82341.h
rename to drivers/gpib/hp_82341/hp_82341.h
drivers/gpib/include/amcc5920.h renamed from drivers/staging/gpib/include/amcc5920.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/include/amcc5920.h
rename to drivers/gpib/include/amcc5920.h
drivers/gpib/include/amccs5933.h renamed from drivers/staging/gpib/include/amccs5933.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/include/amccs5933.h
rename to drivers/gpib/include/amccs5933.h
drivers/gpib/include/gpibP.h renamed from drivers/staging/gpib/include/gpibP.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/include/gpibP.h
rename to drivers/gpib/include/gpibP.h
drivers/gpib/include/gpib_cmd.h renamed from drivers/staging/gpib/include/gpib_cmd.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/include/gpib_cmd.h
rename to drivers/gpib/include/gpib_cmd.h
drivers/gpib/include/gpib_pci_ids.h renamed from drivers/staging/gpib/include/gpib_pci_ids.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/include/gpib_pci_ids.h
rename to drivers/gpib/include/gpib_pci_ids.h
drivers/gpib/include/gpib_proto.h renamed from drivers/staging/gpib/include/gpib_proto.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/include/gpib_proto.h
rename to drivers/gpib/include/gpib_proto.h
drivers/gpib/include/gpib_state_machines.h renamed from drivers/staging/gpib/include/gpib_state_machines.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/include/gpib_state_machines.h
rename to drivers/gpib/include/gpib_state_machines.h
drivers/gpib/include/gpib_types.h renamed from drivers/staging/gpib/include/gpib_types.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/include/gpib_types.h
rename to drivers/gpib/include/gpib_types.h
drivers/gpib/include/nec7210.h renamed from drivers/staging/gpib/include/nec7210.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/include/nec7210.h
rename to drivers/gpib/include/nec7210.h
drivers/gpib/include/nec7210_registers.h renamed from drivers/staging/gpib/include/nec7210_registers.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/include/nec7210_registers.h
rename to drivers/gpib/include/nec7210_registers.h
drivers/gpib/include/plx9050.h renamed from drivers/staging/gpib/include/plx9050.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/include/plx9050.h
rename to drivers/gpib/include/plx9050.h
drivers/gpib/include/quancom_pci.h renamed from drivers/staging/gpib/include/quancom_pci.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/include/quancom_pci.h
rename to drivers/gpib/include/quancom_pci.h
drivers/gpib/include/tms9914.h renamed from drivers/staging/gpib/include/tms9914.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/include/tms9914.h
rename to drivers/gpib/include/tms9914.h
drivers/gpib/include/tnt4882_registers.h renamed from drivers/staging/gpib/include/tnt4882_registers.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/include/tnt4882_registers.h
rename to drivers/gpib/include/tnt4882_registers.h
drivers/gpib/ines/Makefile renamed from drivers/staging/gpib/ines/Makefile +0 -0
similarity index 100%
rename from drivers/staging/gpib/ines/Makefile
rename to drivers/gpib/ines/Makefile
drivers/gpib/ines/ines.h renamed from drivers/staging/gpib/ines/ines.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/ines/ines.h
rename to drivers/gpib/ines/ines.h
drivers/gpib/ines/ines_gpib.c renamed from drivers/staging/gpib/ines/ines_gpib.c +0 -0
similarity index 100%
rename from drivers/staging/gpib/ines/ines_gpib.c
rename to drivers/gpib/ines/ines_gpib.c
drivers/gpib/lpvo_usb_gpib/Makefile renamed from drivers/staging/gpib/lpvo_usb_gpib/Makefile +0 -0
similarity index 100%
rename from drivers/staging/gpib/lpvo_usb_gpib/Makefile
rename to drivers/gpib/lpvo_usb_gpib/Makefile
drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c renamed from drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c +0 -0
similarity index 100%
rename from drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c
rename to drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c
drivers/gpib/nec7210/Makefile renamed from drivers/staging/gpib/nec7210/Makefile +0 -0
similarity index 100%
rename from drivers/staging/gpib/nec7210/Makefile
rename to drivers/gpib/nec7210/Makefile
drivers/gpib/nec7210/board.h renamed from drivers/staging/gpib/nec7210/board.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/nec7210/board.h
rename to drivers/gpib/nec7210/board.h
drivers/gpib/nec7210/nec7210.c renamed from drivers/staging/gpib/nec7210/nec7210.c +0 -0
similarity index 100%
rename from drivers/staging/gpib/nec7210/nec7210.c
rename to drivers/gpib/nec7210/nec7210.c
drivers/gpib/ni_usb/Makefile renamed from drivers/staging/gpib/ni_usb/Makefile +0 -0
similarity index 100%
rename from drivers/staging/gpib/ni_usb/Makefile
rename to drivers/gpib/ni_usb/Makefile
drivers/gpib/ni_usb/ni_usb_gpib.c renamed from drivers/staging/gpib/ni_usb/ni_usb_gpib.c +0 -0
similarity index 100%
rename from drivers/staging/gpib/ni_usb/ni_usb_gpib.c
rename to drivers/gpib/ni_usb/ni_usb_gpib.c
drivers/gpib/ni_usb/ni_usb_gpib.h renamed from drivers/staging/gpib/ni_usb/ni_usb_gpib.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/ni_usb/ni_usb_gpib.h
rename to drivers/gpib/ni_usb/ni_usb_gpib.h
drivers/gpib/pc2/Makefile renamed from drivers/staging/gpib/pc2/Makefile +0 -0
similarity index 100%
rename from drivers/staging/gpib/pc2/Makefile
rename to drivers/gpib/pc2/Makefile
drivers/gpib/pc2/pc2_gpib.c renamed from drivers/staging/gpib/pc2/pc2_gpib.c +0 -0
similarity index 100%
rename from drivers/staging/gpib/pc2/pc2_gpib.c
rename to drivers/gpib/pc2/pc2_gpib.c
drivers/gpib/tms9914/Makefile renamed from drivers/staging/gpib/tms9914/Makefile +0 -0
similarity index 100%
rename from drivers/staging/gpib/tms9914/Makefile
rename to drivers/gpib/tms9914/Makefile
drivers/gpib/tms9914/tms9914.c renamed from drivers/staging/gpib/tms9914/tms9914.c +0 -0
similarity index 100%
rename from drivers/staging/gpib/tms9914/tms9914.c
rename to drivers/gpib/tms9914/tms9914.c
drivers/gpib/tnt4882/Makefile renamed from drivers/staging/gpib/tnt4882/Makefile +0 -0
similarity index 100%
rename from drivers/staging/gpib/tnt4882/Makefile
rename to drivers/gpib/tnt4882/Makefile
drivers/gpib/tnt4882/mite.c renamed from drivers/staging/gpib/tnt4882/mite.c +0 -0
similarity index 100%
rename from drivers/staging/gpib/tnt4882/mite.c
rename to drivers/gpib/tnt4882/mite.c
drivers/gpib/tnt4882/mite.h renamed from drivers/staging/gpib/tnt4882/mite.h +0 -0
similarity index 100%
rename from drivers/staging/gpib/tnt4882/mite.h
rename to drivers/gpib/tnt4882/mite.h
drivers/gpib/tnt4882/tnt4882_gpib.c renamed from drivers/staging/gpib/tnt4882/tnt4882_gpib.c +0 -0
similarity index 100%
rename from drivers/staging/gpib/tnt4882/tnt4882_gpib.c
rename to drivers/gpib/tnt4882/tnt4882_gpib.c
Signature · 1 line
2.51.2
author maintainer
#11 lore raw

PATCH 10/11 gpib: Add gpib Kconfig option

In reply to Dave Penkler

As 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
index 4915a63866b0..01602581b880 100644
@@ -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
#12 lore raw

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 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 +0 -0
index 4915a63866b0..01602581b880 100644

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

author maintainer
#13 lore raw

PATCH 11/11 gpib: Add build rule for gpib to Makefile

In reply to Dave Penkler

As 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
index 8e1ffa4358d5..d275b1526cdd 100644
@@ -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
#14 lore raw

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.

---
 drivers/Makefile | 1 +
 1 file changed, 1 insertion(+)
drivers/Makefile +0 -0
index 8e1ffa4358d5..d275b1526cdd 100644

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 -0
 obj-$(CONFIG_STAGING)		+= staging/
 obj-y				+= platform/

Johan