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/include/uapi to include/linux/uapi
Move the gpib tree out of staging to drivers.
Add the gpib Kconfig menu and Makefile build rule. The gpib Kconfig
menu has been added just after the related comedi drivers.
Remove the word "Linux" from the gpib Kconfig option title as
it adds no information.
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 | 2 +-
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
{drivers/staging/gpib/uapi => include/uapi/linux}/gpib.h | 0
.../staging/gpib/uapi => include/uapi/linux}/gpib_ioctl.h | 0
71 files changed, 7 insertions(+), 2 deletions(-)
rename drivers/{staging => }/gpib/Kconfig (99%)
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%)
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..a6055a910be6 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 99%
rename from drivers/staging/gpib/Kconfig
rename to drivers/gpib/Kconfig
index aa01538d5beb..2f42aa2d55fd 100644
--- a/drivers/staging/gpib/Kconfig
+++ b/drivers/gpib/Kconfig
@@ -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
diff --git a/drivers/staging/gpib/Makefile b/drivers/gpib/Makefile
similarity index 100%
rename from drivers/staging/gpib/Makefile
rename to drivers/gpib/Makefile
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 100%
rename from drivers/staging/gpib/include/gpibP.h
rename to drivers/gpib/include/gpibP.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 100%
rename from drivers/staging/gpib/include/gpib_types.h
rename to drivers/gpib/include/gpib_types.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/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.2Hi Dave,
kernel test robot noticed the following build errors:
[auto build test ERROR on staging/staging-testing]
[also build test ERROR on staging/staging-next staging/staging-linus linus/master v6.18-rc5 next-20251113]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Dave-Penkler/staging-Remove-gpib-build-from-staging/20251113-185632
base: staging/staging-testing
patch link: https://lore.kernel.org/r/20251113104543.5875-7-dpenkler%40gmail.com
patch subject: [PATCH V3 6/6] gpib: Destage gpib
config: powerpc64-randconfig-002-20251114 (https://download.01.org/0day-ci/archive/20251114/202511141203.sbp27oAR-lkp@intel.com/config)
compiler: clang version 22.0.0git (https://github.com/llvm/llvm-project 0bba1e76581bad04e7d7f09f5115ae5e2989e0d9)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20251114/202511141203.sbp27oAR-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202511141203.sbp27oAR-lkp@intel.com/
All errors (new ones prefixed by >>):
In file included from <built-in>:1:
>> ./usr/include/linux/gpib_ioctl.h:43:21: error: // comments are not allowed in this language [-Werror,-Wcomment]
43 | __u8 padding[3]; // align to 32 bit boundary
| ^
1 error generated.
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
Hi Dave,
kernel test robot noticed the following build warnings:
[auto build test WARNING on staging/staging-testing]
[also build test WARNING on staging/staging-next staging/staging-linus linus/master v6.18-rc5 next-20251113]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Dave-Penkler/staging-Remove-gpib-build-from-staging/20251113-185632
base: staging/staging-testing
patch link: https://lore.kernel.org/r/20251113104543.5875-7-dpenkler%40gmail.com
patch subject: [PATCH V3 6/6] gpib: Destage gpib
config: nios2-allyesconfig (https://download.01.org/0day-ci/archive/20251114/202511141035.1unt5Lt7-lkp@intel.com/config)
compiler: nios2-linux-gcc (GCC) 11.5.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20251114/202511141035.1unt5Lt7-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202511141035.1unt5Lt7-lkp@intel.com/
All warnings (new ones prefixed by >>):
>> drivers/gpib/common/iblib.c:165:12: warning: 'autospoll_thread' defined but not used [-Wunused-function]
165 | static int autospoll_thread(void *board_void)
| ^~~~~~~~~~~~~~~~
vim +/autospoll_thread +165 drivers/gpib/common/iblib.c
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 164
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 @165 static int autospoll_thread(void *board_void)
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 166 {
840459da1574db drivers/staging/gpib/common/iblib.c Michael Rubin 2025-03-19 167 struct gpib_board *board = board_void;
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 168 int retval = 0;
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 169
a836d4ec8f83bb drivers/staging/gpib/common/iblib.c Dave Penkler 2024-11-04 170 dev_dbg(board->gpib_dev, "entering autospoll thread\n");
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 171
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 172 while (1) {
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 173 wait_event_interruptible(board->wait,
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 174 kthread_should_stop() ||
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 175 autospoll_wait_should_wake_up(board));
a836d4ec8f83bb drivers/staging/gpib/common/iblib.c Dave Penkler 2024-11-04 176 dev_dbg(board->gpib_dev, "autospoll wait satisfied\n");
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 177 if (kthread_should_stop())
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 178 break;
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 179
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 180 mutex_lock(&board->big_gpib_mutex);
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 181 /* make sure we are still good after we have lock */
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 182 if (board->autospollers <= 0 || board->master == 0) {
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 183 mutex_unlock(&board->big_gpib_mutex);
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 184 continue;
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 185 }
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 186 mutex_unlock(&board->big_gpib_mutex);
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 187
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 188 if (try_module_get(board->provider_module)) {
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 189 retval = autopoll_all_devices(board);
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 190 module_put(board->provider_module);
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 191 } else {
141765729ea7c8 drivers/staging/gpib/common/iblib.c Dave Penkler 2025-02-14 192 dev_err(board->gpib_dev, "try_module_get() failed!\n");
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 193 }
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 194 if (retval <= 0) {
141765729ea7c8 drivers/staging/gpib/common/iblib.c Dave Penkler 2025-02-14 195 dev_err(board->gpib_dev, "stuck SRQ\n");
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 196
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 197 atomic_set(&board->stuck_srq, 1); // XXX could be better
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 198 set_bit(SRQI_NUM, &board->status);
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 199 }
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 200 }
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 201 return retval;
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 202 }
9dde4559e93955 drivers/staging/gpib/common/iblib.c Dave Penkler 2024-09-18 203
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
Hi Dave,
kernel test robot noticed the following build errors:
[auto build test ERROR on staging/staging-testing]
[also build test ERROR on staging/staging-next staging/staging-linus linus/master v6.18-rc5 next-20251113]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Dave-Penkler/staging-Remove-gpib-build-from-staging/20251113-185632
base: staging/staging-testing
patch link: https://lore.kernel.org/r/20251113104543.5875-7-dpenkler%40gmail.com
patch subject: [PATCH V3 6/6] gpib: Destage gpib
config: s390-randconfig-001-20251114 (https://download.01.org/0day-ci/archive/20251114/202511140903.9SwzxDDp-lkp@intel.com/config)
compiler: s390-linux-gcc (GCC) 8.5.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20251114/202511140903.9SwzxDDp-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202511140903.9SwzxDDp-lkp@intel.com/
All error/warnings (new ones prefixed by >>):
drivers/gpib/eastwood/fluke_gpib.c: In function 'fluke_attach_impl':
>> drivers/gpib/eastwood/fluke_gpib.c:1002:23: error: implicit declaration of function 'ioremap'; did you mean 'iounmap'? [-Werror=implicit-function-declaration]
nec_priv->mmiobase = ioremap(e_priv->gpib_iomem_res->start,
^~~~~~~
iounmap
>> drivers/gpib/eastwood/fluke_gpib.c:1002:21: warning: assignment to 'void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
nec_priv->mmiobase = ioremap(e_priv->gpib_iomem_res->start,
^
drivers/gpib/eastwood/fluke_gpib.c:1036:33: warning: assignment to 'void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
e_priv->write_transfer_counter = ioremap(e_priv->write_transfer_counter_res->start,
^
cc1: some warnings being treated as errors
vim +1002 drivers/gpib/eastwood/fluke_gpib.c
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 962
4800ec89999049 drivers/staging/gpib/eastwood/fluke_gpib.c Michael Rubin 2025-04-08 963 static int fluke_attach_impl(struct gpib_board *board, const struct gpib_board_config *config,
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 964 unsigned int handshake_mode)
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 965 {
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 966 struct fluke_priv *e_priv;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 967 struct nec7210_priv *nec_priv;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 968 int isr_flags = 0;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 969 int retval;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 970 int irq;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 971 struct resource *res;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 972 dma_cap_mask_t dma_cap;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 973
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 974 if (!fluke_gpib_pdev) {
f2bda0b660bd37 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2025-02-14 975 dev_err(board->gpib_dev, "No fluke device was found, attach failed.\n");
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 976 return -ENODEV;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 977 }
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 978
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 979 retval = fluke_generic_attach(board);
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 980 if (retval)
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 981 return retval;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 982
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 983 e_priv = board->private_data;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 984 nec_priv = &e_priv->nec7210_priv;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 985 nec_priv->offset = fluke_reg_offset;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 986 board->dev = &fluke_gpib_pdev->dev;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 987
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 988 res = platform_get_resource(fluke_gpib_pdev, IORESOURCE_MEM, 0);
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 989 if (!res) {
f2bda0b660bd37 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2025-02-14 990 dev_err(&fluke_gpib_pdev->dev, "Unable to locate mmio resource\n");
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 991 return -ENODEV;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 992 }
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 993
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 994 if (request_mem_region(res->start,
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 995 resource_size(res),
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 996 fluke_gpib_pdev->name) == NULL) {
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 997 dev_err(&fluke_gpib_pdev->dev, "cannot claim registers\n");
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 998 return -ENXIO;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 999 }
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1000 e_priv->gpib_iomem_res = res;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1001
baf8855c916007 drivers/staging/gpib/eastwood/fluke_gpib.c Arnd Bergmann 2024-12-13 @1002 nec_priv->mmiobase = ioremap(e_priv->gpib_iomem_res->start,
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1003 resource_size(e_priv->gpib_iomem_res));
baf8855c916007 drivers/staging/gpib/eastwood/fluke_gpib.c Arnd Bergmann 2024-12-13 1004 if (!nec_priv->mmiobase) {
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1005 dev_err(&fluke_gpib_pdev->dev, "Could not map I/O memory\n");
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1006 return -ENOMEM;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1007 }
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1008
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1009 res = platform_get_resource(fluke_gpib_pdev, IORESOURCE_MEM, 1);
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1010 if (!res) {
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1011 dev_err(&fluke_gpib_pdev->dev, "Unable to locate mmio resource for gpib dma port\n");
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1012 return -ENODEV;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1013 }
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1014 if (request_mem_region(res->start,
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1015 resource_size(res),
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1016 fluke_gpib_pdev->name) == NULL) {
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1017 dev_err(&fluke_gpib_pdev->dev, "cannot claim registers\n");
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1018 return -ENXIO;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1019 }
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1020 e_priv->dma_port_res = res;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1021
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1022 res = platform_get_resource(fluke_gpib_pdev, IORESOURCE_MEM, 2);
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1023 if (!res) {
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1024 dev_err(&fluke_gpib_pdev->dev, "Unable to locate mmio resource for write transfer counter\n");
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1025 return -ENODEV;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1026 }
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1027
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1028 if (request_mem_region(res->start,
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1029 resource_size(res),
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1030 fluke_gpib_pdev->name) == NULL) {
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1031 dev_err(&fluke_gpib_pdev->dev, "cannot claim registers\n");
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1032 return -ENXIO;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1033 }
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1034 e_priv->write_transfer_counter_res = res;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1035
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1036 e_priv->write_transfer_counter = ioremap(e_priv->write_transfer_counter_res->start,
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1037 resource_size(e_priv->write_transfer_counter_res));
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1038 if (!e_priv->write_transfer_counter) {
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1039 dev_err(&fluke_gpib_pdev->dev, "Could not map I/O memory\n");
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1040 return -ENOMEM;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1041 }
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1042
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1043 irq = platform_get_irq(fluke_gpib_pdev, 0);
51ab134daf5b9b drivers/staging/gpib/eastwood/fluke_gpib.c Chen Ni 2025-04-07 1044 if (irq < 0)
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1045 return -EBUSY;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1046 retval = request_irq(irq, fluke_gpib_interrupt, isr_flags, fluke_gpib_pdev->name, board);
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1047 if (retval) {
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1048 dev_err(&fluke_gpib_pdev->dev,
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1049 "cannot register interrupt handler err=%d\n",
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1050 retval);
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1051 return retval;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1052 }
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1053 e_priv->irq = irq;
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1054
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1055 dma_cap_zero(dma_cap);
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1056 dma_cap_set(DMA_SLAVE, dma_cap);
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1057 e_priv->dma_channel = dma_request_channel(dma_cap, gpib_dma_channel_filter, NULL);
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1058 if (!e_priv->dma_channel) {
f2bda0b660bd37 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2025-02-14 1059 dev_err(board->gpib_dev, "failed to allocate a dma channel.\n");
073b54f342be3e drivers/staging/gpib/eastwood/fluke_gpib.c Paul Retourné 2025-04-11 1060 /*
073b54f342be3e drivers/staging/gpib/eastwood/fluke_gpib.c Paul Retourné 2025-04-11 1061 * we don't error out here because unaccel interface will still
073b54f342be3e drivers/staging/gpib/eastwood/fluke_gpib.c Paul Retourné 2025-04-11 1062 * work without dma
073b54f342be3e drivers/staging/gpib/eastwood/fluke_gpib.c Paul Retourné 2025-04-11 1063 */
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1064 }
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1065
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1066 return fluke_init(e_priv, board, handshake_mode);
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1067 }
55936779f49612 drivers/staging/gpib/eastwood/fluke_gpib.c Dave Penkler 2024-09-18 1068
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
© 2016 - 2026 Red Hat, Inc.