* [PATCH V4 1/4] staging: gpib: Change // comments in uapi header file
2025-11-17 14:40 [PATCH V4 0/4] Destage gpib drivers Dave Penkler
@ 2025-11-17 14:40 ` Dave Penkler
2025-11-17 14:40 ` [PATCH V4 2/4] staging: gpib: Update TODO file Dave Penkler
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Dave Penkler @ 2025-11-17 14:40 UTC (permalink / raw)
To: gregkh, linux-staging, linux-kernel
Cc: johan, Dave Penkler, kernel test robot
A ppc64 randconfig build complained about the // comments in the uapi
header file:
error: // comments are not allowed in this language [-Werror,-Wcomment]
Change the // comments to /* */ format.
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202511141203.sbp27oAR-lkp@intel.com/
Signed-off-by: Dave Penkler <dpenkler@gmail.com>
---
drivers/staging/gpib/uapi/gpib_ioctl.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/gpib/uapi/gpib_ioctl.h b/drivers/staging/gpib/uapi/gpib_ioctl.h
index 55bf5e55507a..1cfee6b44ac3 100644
--- a/drivers/staging/gpib/uapi/gpib_ioctl.h
+++ b/drivers/staging/gpib/uapi/gpib_ioctl.h
@@ -40,7 +40,7 @@ struct gpib_serial_poll_ioctl {
__u32 pad;
__s32 sad;
__u8 status_byte;
- __u8 padding[3]; // align to 32 bit boundary
+ __u8 padding[3]; /* align to 32 bit boundary */
};
struct gpib_eos_ioctl {
@@ -80,7 +80,7 @@ struct gpib_board_info_ioctl {
__u32 t1_delay;
unsigned ist : 1;
unsigned no_7_bit_eos : 1;
- unsigned padding :30; // align to 32 bit boundary
+ unsigned padding :30; /* align to 32 bit boundary */
};
struct gpib_select_pci_ioctl {
@@ -92,7 +92,7 @@ struct gpib_ppoll_config_ioctl {
__u8 config;
unsigned set_ist : 1;
unsigned clear_ist : 1;
- unsigned padding :22; // align to 32 bit boundary
+ unsigned padding :22; /* align to 32 bit boundary */
};
struct gpib_pad_ioctl {
@@ -105,15 +105,15 @@ struct gpib_sad_ioctl {
__s32 sad;
};
-// select a piece of hardware to attach by its sysfs device path
+/* select a piece of hardware to attach by its sysfs device path */
struct gpib_select_device_path_ioctl {
char device_path[0x1000];
};
-// update status byte and request service
+/* update status byte and request service */
struct gpib_request_service2 {
__u8 status_byte;
- __u8 padding[3]; // align to 32 bit boundary
+ __u8 padding[3]; /* align to 32 bit boundary */
__s32 new_reason_for_service;
};
@@ -160,7 +160,7 @@ enum gpib_ioctl {
IBPP2_SET = _IOW(GPIB_CODE, 40, __s16),
IBPP2_GET = _IOR(GPIB_CODE, 41, __s16),
IBSELECT_DEVICE_PATH = _IOW(GPIB_CODE, 43, struct gpib_select_device_path_ioctl),
- // 44 was IBSELECT_SERIAL_NUMBER
+ /* 44 was IBSELECT_SERIAL_NUMBER */
IBRSV2 = _IOW(GPIB_CODE, 45, struct gpib_request_service2)
};
--
2.51.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH V4 2/4] staging: gpib: Update TODO file
2025-11-17 14:40 [PATCH V4 0/4] Destage gpib drivers Dave Penkler
2025-11-17 14:40 ` [PATCH V4 1/4] staging: gpib: Change // comments in uapi header file Dave Penkler
@ 2025-11-17 14:40 ` Dave Penkler
2025-11-17 14:40 ` [PATCH V4 3/4] staging: gpib: Fix SPDX license for gpib headers Dave Penkler
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Dave Penkler @ 2025-11-17 14:40 UTC (permalink / raw)
To: gregkh, linux-staging, linux-kernel; +Cc: johan, Dave Penkler
The comments have now been fixed so remove the item about
comments from the TODO file.
Signed-off-by: Dave Penkler <dpenkler@gmail.com>
---
drivers/staging/gpib/TODO | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/drivers/staging/gpib/TODO b/drivers/staging/gpib/TODO
index ab41a7f9ca5b..ac07dd90b4ef 100644
--- a/drivers/staging/gpib/TODO
+++ b/drivers/staging/gpib/TODO
@@ -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
--
2.51.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH V4 3/4] staging: gpib: Fix SPDX license for gpib headers
2025-11-17 14:40 [PATCH V4 0/4] Destage gpib drivers Dave Penkler
2025-11-17 14:40 ` [PATCH V4 1/4] staging: gpib: Change // comments in uapi header file Dave Penkler
2025-11-17 14:40 ` [PATCH V4 2/4] staging: gpib: Update TODO file Dave Penkler
@ 2025-11-17 14:40 ` Dave Penkler
2025-11-17 14:40 ` [PATCH V4 4/4] gpib: Destage gpib Dave Penkler
2025-11-24 16:53 ` [PATCH V4 0/4] Destage gpib drivers Greg KH
4 siblings, 0 replies; 7+ messages in thread
From: Dave Penkler @ 2025-11-17 14:40 UTC (permalink / raw)
To: gregkh, linux-staging, linux-kernel; +Cc: johan, 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.
Signed-off-by: Dave Penkler <dpenkler@gmail.com>
---
drivers/staging/gpib/uapi/gpib.h | 2 +-
drivers/staging/gpib/uapi/gpib_ioctl.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/gpib/uapi/gpib.h b/drivers/staging/gpib/uapi/gpib.h
index ddf82a4d989f..2a7f5eeb9777 100644
--- a/drivers/staging/gpib/uapi/gpib.h
+++ b/drivers/staging/gpib/uapi/gpib.h
@@ -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
diff --git a/drivers/staging/gpib/uapi/gpib_ioctl.h b/drivers/staging/gpib/uapi/gpib_ioctl.h
index 1cfee6b44ac3..d544d8e4362c 100644
--- a/drivers/staging/gpib/uapi/gpib_ioctl.h
+++ b/drivers/staging/gpib/uapi/gpib_ioctl.h
@@ -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
--
2.51.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH V4 4/4] gpib: Destage gpib
2025-11-17 14:40 [PATCH V4 0/4] Destage gpib drivers Dave Penkler
` (2 preceding siblings ...)
2025-11-17 14:40 ` [PATCH V4 3/4] staging: gpib: Fix SPDX license for gpib headers Dave Penkler
@ 2025-11-17 14:40 ` Dave Penkler
2025-11-24 16:42 ` Greg KH
2025-11-24 16:53 ` [PATCH V4 0/4] Destage gpib drivers Greg KH
4 siblings, 1 reply; 7+ messages in thread
From: Dave Penkler @ 2025-11-17 14:40 UTC (permalink / raw)
To: gregkh, linux-staging, linux-kernel; +Cc: johan, Dave Penkler
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
As part of the 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.
The gpib user space library needs the uapi header files in order to
communicate with the drivers. Copy the common include files from
staging/gpib/uapi to include/linux/uapi
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
The gpib Kconfig menu has been added just after the related comedi
drivers.
MAINTAINERS: Change the gpib directory and add the uapi include files.
Signed-off-by: Dave Penkler <dpenkler@gmail.com>
---
MAINTAINERS | 4 +++-
drivers/Kconfig | 2 ++
drivers/Makefile | 1 +
drivers/{staging => }/gpib/Kconfig | 8 ++++----
drivers/{staging => }/gpib/Makefile | 2 +-
drivers/{staging => }/gpib/TODO | 0
drivers/{staging => }/gpib/agilent_82350b/Makefile | 0
.../{staging => }/gpib/agilent_82350b/agilent_82350b.c | 0
.../{staging => }/gpib/agilent_82350b/agilent_82350b.h | 0
drivers/{staging => }/gpib/agilent_82357a/Makefile | 0
.../{staging => }/gpib/agilent_82357a/agilent_82357a.c | 0
.../{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 | 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
drivers/{staging => }/gpib/include/gpib_state_machines.h | 0
drivers/{staging => }/gpib/include/gpib_types.h | 2 +-
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
drivers/staging/Kconfig | 2 --
drivers/staging/Makefile | 1 -
{drivers/staging/gpib/uapi => include/uapi/linux}/gpib.h | 0
.../staging/gpib/uapi => include/uapi/linux}/gpib_ioctl.h | 0
73 files changed, 14 insertions(+), 12 deletions(-)
rename drivers/{staging => }/gpib/Kconfig (97%)
rename drivers/{staging => }/gpib/Makefile (92%)
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 (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 (100%)
rename {drivers/staging/gpib/uapi => include/uapi/linux}/gpib_ioctl.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index df07d1a3c28d..4cb0de3777b5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10628,7 +10628,9 @@ F: drivers/platform/x86/gpd-pocket-fan.c
GPIB DRIVERS
M: Dave Penkler <dpenkler@gmail.com>
S: Maintained
-F: drivers/staging/gpib/
+F: drivers/gpib/
+F: include/uapi/linux/gpib.h
+F: include/uapi/linux/gpib_ioctl.h
GPIO ACPI SUPPORT
M: Mika Westerberg <westeri@kernel.org>
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 4915a63866b0..01602581b880 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -161,6 +161,8 @@ source "drivers/greybus/Kconfig"
source "drivers/comedi/Kconfig"
+source "drivers/gpib/Kconfig"
+
source "drivers/staging/Kconfig"
source "drivers/platform/Kconfig"
diff --git a/drivers/Makefile b/drivers/Makefile
index 8e1ffa4358d5..d275b1526cdd 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -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/
diff --git a/drivers/staging/gpib/Kconfig b/drivers/gpib/Kconfig
similarity index 97%
rename from drivers/staging/gpib/Kconfig
rename to drivers/gpib/Kconfig
index aa01538d5beb..eeb50956ce85 100644
--- a/drivers/staging/gpib/Kconfig
+++ b/drivers/gpib/Kconfig
@@ -1,10 +1,10 @@
# 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
- IEEE488 standard.
+ Enable support for GPIB cards and dongles. GPIB is the
+ General Purpose Interface Bus which conforms to the IEEE488
+ standard.
This set of drivers can be used with the corresponding user
space library that can be found on Sourceforge under linux-gpib.
diff --git a/drivers/staging/gpib/Makefile b/drivers/gpib/Makefile
similarity index 92%
rename from drivers/staging/gpib/Makefile
rename to drivers/gpib/Makefile
index d0e88f5c0844..2d44fed2a743 100644
--- a/drivers/staging/gpib/Makefile
+++ b/drivers/gpib/Makefile
@@ -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/
diff --git a/drivers/staging/gpib/TODO b/drivers/gpib/TODO
similarity index 100%
rename from drivers/staging/gpib/TODO
rename to drivers/gpib/TODO
diff --git a/drivers/staging/gpib/agilent_82350b/Makefile b/drivers/gpib/agilent_82350b/Makefile
similarity index 100%
rename from drivers/staging/gpib/agilent_82350b/Makefile
rename to drivers/gpib/agilent_82350b/Makefile
diff --git a/drivers/staging/gpib/agilent_82350b/agilent_82350b.c b/drivers/gpib/agilent_82350b/agilent_82350b.c
similarity index 100%
rename from drivers/staging/gpib/agilent_82350b/agilent_82350b.c
rename to drivers/gpib/agilent_82350b/agilent_82350b.c
diff --git a/drivers/staging/gpib/agilent_82350b/agilent_82350b.h b/drivers/gpib/agilent_82350b/agilent_82350b.h
similarity index 100%
rename from drivers/staging/gpib/agilent_82350b/agilent_82350b.h
rename to drivers/gpib/agilent_82350b/agilent_82350b.h
diff --git a/drivers/staging/gpib/agilent_82357a/Makefile b/drivers/gpib/agilent_82357a/Makefile
similarity index 100%
rename from drivers/staging/gpib/agilent_82357a/Makefile
rename to drivers/gpib/agilent_82357a/Makefile
diff --git a/drivers/staging/gpib/agilent_82357a/agilent_82357a.c b/drivers/gpib/agilent_82357a/agilent_82357a.c
similarity index 100%
rename from drivers/staging/gpib/agilent_82357a/agilent_82357a.c
rename to drivers/gpib/agilent_82357a/agilent_82357a.c
diff --git a/drivers/staging/gpib/agilent_82357a/agilent_82357a.h b/drivers/gpib/agilent_82357a/agilent_82357a.h
similarity index 100%
rename from drivers/staging/gpib/agilent_82357a/agilent_82357a.h
rename to drivers/gpib/agilent_82357a/agilent_82357a.h
diff --git a/drivers/staging/gpib/cb7210/Makefile b/drivers/gpib/cb7210/Makefile
similarity index 100%
rename from drivers/staging/gpib/cb7210/Makefile
rename to drivers/gpib/cb7210/Makefile
diff --git a/drivers/staging/gpib/cb7210/cb7210.c b/drivers/gpib/cb7210/cb7210.c
similarity index 100%
rename from drivers/staging/gpib/cb7210/cb7210.c
rename to drivers/gpib/cb7210/cb7210.c
diff --git a/drivers/staging/gpib/cb7210/cb7210.h b/drivers/gpib/cb7210/cb7210.h
similarity index 100%
rename from drivers/staging/gpib/cb7210/cb7210.h
rename to drivers/gpib/cb7210/cb7210.h
diff --git a/drivers/staging/gpib/cec/Makefile b/drivers/gpib/cec/Makefile
similarity index 100%
rename from drivers/staging/gpib/cec/Makefile
rename to drivers/gpib/cec/Makefile
diff --git a/drivers/staging/gpib/cec/cec.h b/drivers/gpib/cec/cec.h
similarity index 100%
rename from drivers/staging/gpib/cec/cec.h
rename to drivers/gpib/cec/cec.h
diff --git a/drivers/staging/gpib/cec/cec_gpib.c b/drivers/gpib/cec/cec_gpib.c
similarity index 100%
rename from drivers/staging/gpib/cec/cec_gpib.c
rename to drivers/gpib/cec/cec_gpib.c
diff --git a/drivers/staging/gpib/common/Makefile b/drivers/gpib/common/Makefile
similarity index 100%
rename from drivers/staging/gpib/common/Makefile
rename to drivers/gpib/common/Makefile
diff --git a/drivers/staging/gpib/common/gpib_os.c b/drivers/gpib/common/gpib_os.c
similarity index 100%
rename from drivers/staging/gpib/common/gpib_os.c
rename to drivers/gpib/common/gpib_os.c
diff --git a/drivers/staging/gpib/common/iblib.c b/drivers/gpib/common/iblib.c
similarity index 100%
rename from drivers/staging/gpib/common/iblib.c
rename to drivers/gpib/common/iblib.c
diff --git a/drivers/staging/gpib/common/ibsys.h b/drivers/gpib/common/ibsys.h
similarity index 100%
rename from drivers/staging/gpib/common/ibsys.h
rename to drivers/gpib/common/ibsys.h
diff --git a/drivers/staging/gpib/eastwood/Makefile b/drivers/gpib/eastwood/Makefile
similarity index 100%
rename from drivers/staging/gpib/eastwood/Makefile
rename to drivers/gpib/eastwood/Makefile
diff --git a/drivers/staging/gpib/eastwood/fluke_gpib.c b/drivers/gpib/eastwood/fluke_gpib.c
similarity index 100%
rename from drivers/staging/gpib/eastwood/fluke_gpib.c
rename to drivers/gpib/eastwood/fluke_gpib.c
diff --git a/drivers/staging/gpib/eastwood/fluke_gpib.h b/drivers/gpib/eastwood/fluke_gpib.h
similarity index 100%
rename from drivers/staging/gpib/eastwood/fluke_gpib.h
rename to drivers/gpib/eastwood/fluke_gpib.h
diff --git a/drivers/staging/gpib/fmh_gpib/Makefile b/drivers/gpib/fmh_gpib/Makefile
similarity index 100%
rename from drivers/staging/gpib/fmh_gpib/Makefile
rename to drivers/gpib/fmh_gpib/Makefile
diff --git a/drivers/staging/gpib/fmh_gpib/fmh_gpib.c b/drivers/gpib/fmh_gpib/fmh_gpib.c
similarity index 100%
rename from drivers/staging/gpib/fmh_gpib/fmh_gpib.c
rename to drivers/gpib/fmh_gpib/fmh_gpib.c
diff --git a/drivers/staging/gpib/fmh_gpib/fmh_gpib.h b/drivers/gpib/fmh_gpib/fmh_gpib.h
similarity index 100%
rename from drivers/staging/gpib/fmh_gpib/fmh_gpib.h
rename to drivers/gpib/fmh_gpib/fmh_gpib.h
diff --git a/drivers/staging/gpib/gpio/Makefile b/drivers/gpib/gpio/Makefile
similarity index 100%
rename from drivers/staging/gpib/gpio/Makefile
rename to drivers/gpib/gpio/Makefile
diff --git a/drivers/staging/gpib/gpio/gpib_bitbang.c b/drivers/gpib/gpio/gpib_bitbang.c
similarity index 100%
rename from drivers/staging/gpib/gpio/gpib_bitbang.c
rename to drivers/gpib/gpio/gpib_bitbang.c
diff --git a/drivers/staging/gpib/hp_82335/Makefile b/drivers/gpib/hp_82335/Makefile
similarity index 100%
rename from drivers/staging/gpib/hp_82335/Makefile
rename to drivers/gpib/hp_82335/Makefile
diff --git a/drivers/staging/gpib/hp_82335/hp82335.c b/drivers/gpib/hp_82335/hp82335.c
similarity index 100%
rename from drivers/staging/gpib/hp_82335/hp82335.c
rename to drivers/gpib/hp_82335/hp82335.c
diff --git a/drivers/staging/gpib/hp_82335/hp82335.h b/drivers/gpib/hp_82335/hp82335.h
similarity index 100%
rename from drivers/staging/gpib/hp_82335/hp82335.h
rename to drivers/gpib/hp_82335/hp82335.h
diff --git a/drivers/staging/gpib/hp_82341/Makefile b/drivers/gpib/hp_82341/Makefile
similarity index 100%
rename from drivers/staging/gpib/hp_82341/Makefile
rename to drivers/gpib/hp_82341/Makefile
diff --git a/drivers/staging/gpib/hp_82341/hp_82341.c b/drivers/gpib/hp_82341/hp_82341.c
similarity index 100%
rename from drivers/staging/gpib/hp_82341/hp_82341.c
rename to drivers/gpib/hp_82341/hp_82341.c
diff --git a/drivers/staging/gpib/hp_82341/hp_82341.h b/drivers/gpib/hp_82341/hp_82341.h
similarity index 100%
rename from drivers/staging/gpib/hp_82341/hp_82341.h
rename to drivers/gpib/hp_82341/hp_82341.h
diff --git a/drivers/staging/gpib/include/amcc5920.h b/drivers/gpib/include/amcc5920.h
similarity index 100%
rename from drivers/staging/gpib/include/amcc5920.h
rename to drivers/gpib/include/amcc5920.h
diff --git a/drivers/staging/gpib/include/amccs5933.h b/drivers/gpib/include/amccs5933.h
similarity index 100%
rename from drivers/staging/gpib/include/amccs5933.h
rename to drivers/gpib/include/amccs5933.h
diff --git a/drivers/staging/gpib/include/gpibP.h b/drivers/gpib/include/gpibP.h
similarity index 96%
rename from drivers/staging/gpib/include/gpibP.h
rename to drivers/gpib/include/gpibP.h
index 1b27f37e0ba0..e3938ada3e0d 100644
--- a/drivers/staging/gpib/include/gpibP.h
+++ b/drivers/gpib/include/gpibP.h
@@ -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>
diff --git a/drivers/staging/gpib/include/gpib_cmd.h b/drivers/gpib/include/gpib_cmd.h
similarity index 100%
rename from drivers/staging/gpib/include/gpib_cmd.h
rename to drivers/gpib/include/gpib_cmd.h
diff --git a/drivers/staging/gpib/include/gpib_pci_ids.h b/drivers/gpib/include/gpib_pci_ids.h
similarity index 100%
rename from drivers/staging/gpib/include/gpib_pci_ids.h
rename to drivers/gpib/include/gpib_pci_ids.h
diff --git a/drivers/staging/gpib/include/gpib_proto.h b/drivers/gpib/include/gpib_proto.h
similarity index 100%
rename from drivers/staging/gpib/include/gpib_proto.h
rename to drivers/gpib/include/gpib_proto.h
diff --git a/drivers/staging/gpib/include/gpib_state_machines.h b/drivers/gpib/include/gpib_state_machines.h
similarity index 100%
rename from drivers/staging/gpib/include/gpib_state_machines.h
rename to drivers/gpib/include/gpib_state_machines.h
diff --git a/drivers/staging/gpib/include/gpib_types.h b/drivers/gpib/include/gpib_types.h
similarity index 99%
rename from drivers/staging/gpib/include/gpib_types.h
rename to drivers/gpib/include/gpib_types.h
index 998abb379749..5a0978ae27e7 100644
--- a/drivers/staging/gpib/include/gpib_types.h
+++ b/drivers/gpib/include/gpib_types.h
@@ -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>
diff --git a/drivers/staging/gpib/include/nec7210.h b/drivers/gpib/include/nec7210.h
similarity index 100%
rename from drivers/staging/gpib/include/nec7210.h
rename to drivers/gpib/include/nec7210.h
diff --git a/drivers/staging/gpib/include/nec7210_registers.h b/drivers/gpib/include/nec7210_registers.h
similarity index 100%
rename from drivers/staging/gpib/include/nec7210_registers.h
rename to drivers/gpib/include/nec7210_registers.h
diff --git a/drivers/staging/gpib/include/plx9050.h b/drivers/gpib/include/plx9050.h
similarity index 100%
rename from drivers/staging/gpib/include/plx9050.h
rename to drivers/gpib/include/plx9050.h
diff --git a/drivers/staging/gpib/include/quancom_pci.h b/drivers/gpib/include/quancom_pci.h
similarity index 100%
rename from drivers/staging/gpib/include/quancom_pci.h
rename to drivers/gpib/include/quancom_pci.h
diff --git a/drivers/staging/gpib/include/tms9914.h b/drivers/gpib/include/tms9914.h
similarity index 100%
rename from drivers/staging/gpib/include/tms9914.h
rename to drivers/gpib/include/tms9914.h
diff --git a/drivers/staging/gpib/include/tnt4882_registers.h b/drivers/gpib/include/tnt4882_registers.h
similarity index 100%
rename from drivers/staging/gpib/include/tnt4882_registers.h
rename to drivers/gpib/include/tnt4882_registers.h
diff --git a/drivers/staging/gpib/ines/Makefile b/drivers/gpib/ines/Makefile
similarity index 100%
rename from drivers/staging/gpib/ines/Makefile
rename to drivers/gpib/ines/Makefile
diff --git a/drivers/staging/gpib/ines/ines.h b/drivers/gpib/ines/ines.h
similarity index 100%
rename from drivers/staging/gpib/ines/ines.h
rename to drivers/gpib/ines/ines.h
diff --git a/drivers/staging/gpib/ines/ines_gpib.c b/drivers/gpib/ines/ines_gpib.c
similarity index 100%
rename from drivers/staging/gpib/ines/ines_gpib.c
rename to drivers/gpib/ines/ines_gpib.c
diff --git a/drivers/staging/gpib/lpvo_usb_gpib/Makefile b/drivers/gpib/lpvo_usb_gpib/Makefile
similarity index 100%
rename from drivers/staging/gpib/lpvo_usb_gpib/Makefile
rename to drivers/gpib/lpvo_usb_gpib/Makefile
diff --git a/drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c b/drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c
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
diff --git a/drivers/staging/gpib/nec7210/Makefile b/drivers/gpib/nec7210/Makefile
similarity index 100%
rename from drivers/staging/gpib/nec7210/Makefile
rename to drivers/gpib/nec7210/Makefile
diff --git a/drivers/staging/gpib/nec7210/board.h b/drivers/gpib/nec7210/board.h
similarity index 100%
rename from drivers/staging/gpib/nec7210/board.h
rename to drivers/gpib/nec7210/board.h
diff --git a/drivers/staging/gpib/nec7210/nec7210.c b/drivers/gpib/nec7210/nec7210.c
similarity index 100%
rename from drivers/staging/gpib/nec7210/nec7210.c
rename to drivers/gpib/nec7210/nec7210.c
diff --git a/drivers/staging/gpib/ni_usb/Makefile b/drivers/gpib/ni_usb/Makefile
similarity index 100%
rename from drivers/staging/gpib/ni_usb/Makefile
rename to drivers/gpib/ni_usb/Makefile
diff --git a/drivers/staging/gpib/ni_usb/ni_usb_gpib.c b/drivers/gpib/ni_usb/ni_usb_gpib.c
similarity index 100%
rename from drivers/staging/gpib/ni_usb/ni_usb_gpib.c
rename to drivers/gpib/ni_usb/ni_usb_gpib.c
diff --git a/drivers/staging/gpib/ni_usb/ni_usb_gpib.h b/drivers/gpib/ni_usb/ni_usb_gpib.h
similarity index 100%
rename from drivers/staging/gpib/ni_usb/ni_usb_gpib.h
rename to drivers/gpib/ni_usb/ni_usb_gpib.h
diff --git a/drivers/staging/gpib/pc2/Makefile b/drivers/gpib/pc2/Makefile
similarity index 100%
rename from drivers/staging/gpib/pc2/Makefile
rename to drivers/gpib/pc2/Makefile
diff --git a/drivers/staging/gpib/pc2/pc2_gpib.c b/drivers/gpib/pc2/pc2_gpib.c
similarity index 100%
rename from drivers/staging/gpib/pc2/pc2_gpib.c
rename to drivers/gpib/pc2/pc2_gpib.c
diff --git a/drivers/staging/gpib/tms9914/Makefile b/drivers/gpib/tms9914/Makefile
similarity index 100%
rename from drivers/staging/gpib/tms9914/Makefile
rename to drivers/gpib/tms9914/Makefile
diff --git a/drivers/staging/gpib/tms9914/tms9914.c b/drivers/gpib/tms9914/tms9914.c
similarity index 100%
rename from drivers/staging/gpib/tms9914/tms9914.c
rename to drivers/gpib/tms9914/tms9914.c
diff --git a/drivers/staging/gpib/tnt4882/Makefile b/drivers/gpib/tnt4882/Makefile
similarity index 100%
rename from drivers/staging/gpib/tnt4882/Makefile
rename to drivers/gpib/tnt4882/Makefile
diff --git a/drivers/staging/gpib/tnt4882/mite.c b/drivers/gpib/tnt4882/mite.c
similarity index 100%
rename from drivers/staging/gpib/tnt4882/mite.c
rename to drivers/gpib/tnt4882/mite.c
diff --git a/drivers/staging/gpib/tnt4882/mite.h b/drivers/gpib/tnt4882/mite.h
similarity index 100%
rename from drivers/staging/gpib/tnt4882/mite.h
rename to drivers/gpib/tnt4882/mite.h
diff --git a/drivers/staging/gpib/tnt4882/tnt4882_gpib.c b/drivers/gpib/tnt4882/tnt4882_gpib.c
similarity index 100%
rename from drivers/staging/gpib/tnt4882/tnt4882_gpib.c
rename to drivers/gpib/tnt4882/tnt4882_gpib.c
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 075e775d3868..2f92cd698bef 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -48,6 +48,4 @@ source "drivers/staging/axis-fifo/Kconfig"
source "drivers/staging/vme_user/Kconfig"
-source "drivers/staging/gpib/Kconfig"
-
endif # STAGING
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index e681e403509c..f5b8876aa536 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -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/
diff --git a/drivers/staging/gpib/uapi/gpib.h b/include/uapi/linux/gpib.h
similarity index 100%
rename from drivers/staging/gpib/uapi/gpib.h
rename to include/uapi/linux/gpib.h
diff --git a/drivers/staging/gpib/uapi/gpib_ioctl.h b/include/uapi/linux/gpib_ioctl.h
similarity index 100%
rename from drivers/staging/gpib/uapi/gpib_ioctl.h
rename to include/uapi/linux/gpib_ioctl.h
--
2.51.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH V4 4/4] gpib: Destage gpib
2025-11-17 14:40 ` [PATCH V4 4/4] gpib: Destage gpib Dave Penkler
@ 2025-11-24 16:42 ` Greg KH
0 siblings, 0 replies; 7+ messages in thread
From: Greg KH @ 2025-11-24 16:42 UTC (permalink / raw)
To: Dave Penkler; +Cc: linux-staging, linux-kernel, johan
On Mon, Nov 17, 2025 at 03:40:21PM +0100, Dave Penkler wrote:
> 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
>
> As part of the 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.
>
> The gpib user space library needs the uapi header files in order to
> communicate with the drivers. Copy the common include files from
> staging/gpib/uapi to include/linux/uapi
>
> 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
> The gpib Kconfig menu has been added just after the related comedi
> drivers.
>
> MAINTAINERS: Change the gpib directory and add the uapi include files.
> Signed-off-by: Dave Penkler <dpenkler@gmail.com>
Nit, I think you merged 2 patches here together and didn't notice the
MAINTAINERS: line :)
I'll go fix this up when applying it now, no worries.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH V4 0/4] Destage gpib drivers
2025-11-17 14:40 [PATCH V4 0/4] Destage gpib drivers Dave Penkler
` (3 preceding siblings ...)
2025-11-17 14:40 ` [PATCH V4 4/4] gpib: Destage gpib Dave Penkler
@ 2025-11-24 16:53 ` Greg KH
4 siblings, 0 replies; 7+ messages in thread
From: Greg KH @ 2025-11-24 16:53 UTC (permalink / raw)
To: Dave Penkler; +Cc: linux-staging, linux-kernel, johan
On Mon, Nov 17, 2025 at 03:40:17PM +0100, Dave Penkler wrote:
> This patch series is for moving the gpib drivers out of the staging area.
>
> Patches 1-3 make some preliminary changes in staging to prepare for the move.
> Patch 4 does the move and completes the destage.
>
> Patch 1: Change // comments in uapi header file
> Patch 2: Remove comment item in TODO file
> Patch 3: Add SPDX syscall note to uapi gpib headers
> Patch 4: Complete the destaging of gpib
> - Remove gpib from Kconfig and Makefile in staging
> - Remove the gpib/uapi directory from include search path in Makefile
> - In the code change the uapi include file paths to <linux/xxx.h>
> - Move the common gpib/uapi headers to include/uapi/linux
> - Move the gpib tree out of staging
> - Delete the word Linux from gpib Kconfig file
> - Add gpib to Kconfig and Makefile in drivers
> - Update MAINTAINERS
Now queued up, nice work!
greg k-h
^ permalink raw reply [flat|nested] 7+ messages in thread