linux.git/drivers/staging/comedi, branch v3.6-rc4

staging: comedi: usbduxfast: Declare MODULE_FIRMWARE usage

2012-08-16T18:28:36+00:00

Cc: Ian Abbott 
Cc: Mori Hess 
Cc: H Hartley Sweeten 
Cc: Ravishankar Karkala Mallikarjunayya 
Signed-off-by: Tim Gardner 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: usbdux: Declare MODULE_FIRMWARE usage

2012-08-16T18:28:35+00:00

Cc: Ian Abbott 
Cc: Mori Hess 
Cc: H Hartley Sweeten 
Signed-off-by: Tim Gardner 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: usbduxsigma: Declare MODULE_FIRMWARE usage

2012-08-16T18:28:35+00:00

Cc: Ian Abbott 
Cc: Mori Hess 
Cc: Bernd Porr 
Cc: Dan Carpenter 
Cc: H Hartley Sweeten 
Signed-off-by: Tim Gardner 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: Fix reversed test in comedi_device_attach()

2012-08-14T23:52:17+00:00

Commit 3902a370281d2f2b130f141e8cf94eab40125769 (staging: comedi:
refactor comedi_device_attach() a bit) by yours truly introduced an
inverted logic bug in comedi_device_attach() for the case where the
driver expects the device to be configured by driver name rather than
board name.  The result of a strcmp() is being tested incorrectly.  Fix
it.

Thanks to Stephen N Chivers for discovering the bug and suggesting the
fix.

Cc:  # 3.5.x
Signed-off-by: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: rtd520: ioremap'ed addresses are resource_size_t

2012-08-08T00:14:54+00:00

As mentioned by Ian Abbott, the pci address passed to ioremap
should be a resource_size_t not an unsigned long. Use a local
variable of that type to hold the pci_resource_start() that is
passed to ioremp().

Set the dev->iobase to a dummy non-zero value so that the "detach"
can use it as a flag to know that comedi_pci_disable() needs to
be called.

Reported-by: Ian Abbott 
Signed-off-by: H Hartley Sweeten 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: dt3000: ioremap'ed addresses are resource_size_t

2012-08-08T00:14:53+00:00

As mentioned by Ian Abbott, the pci address passed to ioremap
should be a resource_size_t not an unsigned long. Use a local
variable of that type to hold the pci_resource_start() that is
passed to ioremp().

Set the dev->iobase to a dummy non-zero value so that the "detach"
can use it as a flag to know that comedi_pci_disable() needs to
be called.

Reported-by: Ian Abbott 
Signed-off-by: H Hartley Sweeten 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: daqboard2000: ioremap'ed addresses are resource_size_t

2012-08-08T00:14:53+00:00

As mentioned by Ian Abbott, the pci address passed to ioremap
should be a resource_size_t not an unsigned long. Use a local
variable of that type to hold the pci_resource_start() that is
passed to ioremp().

Set the dev->iobase to a dummy non-zero value so that the "detach"
can use it as a flag to know that comedi_pci_disable() needs to
be called.

Reported-by: Ian Abbott 
Signed-off-by: H Hartley Sweeten 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: daqboard2000: add back subsystem_device check

2012-08-08T00:14:53+00:00

As mentioned by Ian Abbott, this driver originally checked
the pci_dev subsystem_device in order to make sure that the
pci_dev was compatible with this driver. The cleanup of the
"find pci device" code removed this check. Add it back.

Reported-by: Ian Abbott 
Signed-off-by: H Hartley Sweeten 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: remove pci_is_enabled() tests

2012-08-08T00:14:53+00:00

As mentioned by Ian Abbott, the comedi pci drivers that try to
locate an unused pci device with the pci_is_enabled() test
might actually skip over a perfectly good unused device. This
test is also not consistent with the other comedi pci drivers.

Remove the test from all the comedi pci drivers.

Reported-by: Ian Abbott 
Signed-off-by: H Hartley Sweeten 
Signed-off-by: Greg Kroah-Hartman

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

2012-07-26T18:14:49+00:00

Pull staging tree patches from Greg Kroah-Hartman:
 "Here's the big staging tree merge for the 3.6-rc1 merge window.

  There are some patches in here outside of drivers/staging/, notibly
  the iio code (which is still stradeling the staging / not staging
  boundry), the pstore code, and the tracing code.  All of these have
  gotten acks from the various subsystem maintainers to be included in
  this tree.  The pstore and tracing patches are related, and are coming
  here as they replace one of the android staging drivers.

  Otherwise, the normal staging mess.  Lots of cleanups and a few new
  drivers (some iio drivers, and the large csr wireless driver
  abomination.)

  Signed-off-by: Greg Kroah-Hartman "

Fixed up trivial conflicts in drivers/staging/comedi/drivers/s626.h and
drivers/staging/gdm72xx/netlink_k.c

* tag 'staging-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1108 commits)
  staging: csr: delete a bunch of unused library functions
  staging: csr: remove csr_utf16.c
  staging: csr: remove csr_pmem.h
  staging: csr: remove CsrPmemAlloc
  staging: csr: remove CsrPmemFree()
  staging: csr: remove CsrMemAllocDma()
  staging: csr: remove CsrMemCalloc()
  staging: csr: remove CsrMemAlloc()
  staging: csr: remove CsrMemFree() and CsrMemFreeDma()
  staging: csr: remove csr_util.h
  staging: csr: remove CsrOffSetOf()
  stating: csr: remove unneeded #includes in csr_util.c
  staging: csr: make CsrUInt16ToHex static
  staging: csr: remove CsrMemCpy()
  staging: csr: remove CsrStrLen()
  staging: csr: remove CsrVsnprintf()
  staging: csr: remove CsrStrDup
  staging: csr: remove CsrStrChr()
  staging: csr: remove CsrStrNCmp
  staging: csr: remove CsrStrCmp
  ...