Commit 91fff6fa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-6.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging driver fixes from Greg KH:
 "Here are some small staging driver fixes that resolve some reported
  issues and have been in my tree for too long due to the holiday break.
  They resolve the following issues:

   - lots of gpib build-time fixes as reported by testers and 0-day

   - gpib logical fixes

   - mailmap fix

  All of these have been in linux-next for a while, with no reported
  issues other than the duplicated change"

* tag 'staging-6.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: gpib: mite: remove unused global functions
  staging: gpib: refer to correct config symbol in tnt4882 Makefile
  mailmap: update Bingwu Zhang's email address
  staging: gpib: fix address space mixup
  staging: gpib: use ioport_map
  staging: gpib: fix pcmcia dependencies
  staging: gpib: add module author and description fields
  staging: gpib: fix Makefiles
  staging: gpib: make global 'usec_diff' functions static
  staging: gpib: Modify mismatched function name
  staging: gpib: Add lower bound check for secondary address
  staging: gpib: Fix erroneous removal of blank before newline
parents 4bd9e3b4 6f79db02

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -121,6 +121,8 @@ Ben Widawsky <bwidawsk@kernel.org> <benjamin.widawsky@intel.com> 
Benjamin Poirier <benjamin.poirier@gmail.com> <bpoirier@suse.de>

Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@gmail.com>

Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@redhat.com>

Bingwu Zhang <xtex@aosc.io> <xtexchooser@duck.com>

Bingwu Zhang <xtex@aosc.io> <xtex@xtexx.eu.org>

Bjorn Andersson <andersson@kernel.org> <bjorn@kryo.se>

Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@linaro.org>

Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@sonymobile.com>

drivers/staging/gpib/Kconfig

+6 −2
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ config GPIB_NI_PCI_ISA 
	depends on ISA_BUS || PCI || PCMCIA

	depends on HAS_IOPORT

	depends on !X86_PAE

	depends on PCMCIA || !PCMCIA

	depends on HAS_IOPORT_MAP

	select GPIB_COMMON

	select GPIB_NEC7210

	help
@@ -89,6 +91,7 @@ config GPIB_CB7210 
	depends on HAS_IOPORT

	depends on ISA_BUS || PCI || PCMCIA

	depends on !X86_PAE

	depends on PCMCIA || !PCMCIA

       select GPIB_COMMON

	select GPIB_NEC7210

       help
@@ -177,6 +180,7 @@ config GPIB_HP82341 
config GPIB_INES

       tristate "INES"

	depends on PCI || ISA_BUS || PCMCIA

	depends on PCMCIA || !PCMCIA

	depends on HAS_IOPORT

	depends on !X86_PAE

       select GPIB_COMMON
@@ -199,8 +203,8 @@ config GPIB_INES 
	  called cb7210.



config GPIB_PCMCIA

       bool "PCMCIA/Cardbus support for NI MC and Ines boards"

       depends on PCCARD && (GPIB_NI_PCI_ISA || GPIB_CB7210 || GPIB_INES)

       def_bool y

       depends on PCMCIA && (GPIB_NI_PCI_ISA || GPIB_CB7210 || GPIB_INES)

       help

         Enable PCMCIA/CArdbus support for National Instruments,

	 measurement computing boards and Ines boards.

drivers/staging/gpib/agilent_82350b/Makefile

+1 −1
Original line number Diff line number Diff line 


obj-m += agilent_82350b.o
 
obj-$(CONFIG_GPIB_AGILENT_82350B) += agilent_82350b.o

drivers/staging/gpib/agilent_82350b/agilent_82350b.c

+2 −2
Original line number Diff line number Diff line
@@ -700,7 +700,7 @@ static int agilent_82350b_generic_attach(gpib_board_t *board, const gpib_board_c 
							     GPIB_82350A_REGION));

		dev_dbg(board->gpib_dev, "%s: gpib base address remapped to 0x%p\n",

			driver_name, a_priv->gpib_base);

		tms_priv->iobase = a_priv->gpib_base + TMS9914_BASE_REG;

		tms_priv->mmiobase = a_priv->gpib_base + TMS9914_BASE_REG;

		a_priv->sram_base = ioremap(pci_resource_start(a_priv->pci_device,

							       SRAM_82350A_REGION),

					    pci_resource_len(a_priv->pci_device,
@@ -724,7 +724,7 @@ static int agilent_82350b_generic_attach(gpib_board_t *board, const gpib_board_c 
					    pci_resource_len(a_priv->pci_device, GPIB_REGION));

		dev_dbg(board->gpib_dev, "%s: gpib base address remapped to 0x%p\n",

			driver_name, a_priv->gpib_base);

		tms_priv->iobase = a_priv->gpib_base + TMS9914_BASE_REG;

		tms_priv->mmiobase = a_priv->gpib_base + TMS9914_BASE_REG;

		a_priv->sram_base = ioremap(pci_resource_start(a_priv->pci_device, SRAM_REGION),

					    pci_resource_len(a_priv->pci_device, SRAM_REGION));

		dev_dbg(board->gpib_dev, "%s: sram base address remapped to 0x%p\n",

drivers/staging/gpib/agilent_82357a/Makefile

+1 −1
Original line number Diff line number Diff line 


obj-m += agilent_82357a.o

obj-$(CONFIG_GPIB_AGILENT_82357A) += agilent_82357a.o