mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
323,923 Commits 2 Branches 854 Tags
b0ba76785eef21ecfa3bcd2f6358f9cebbd8a9db
Commit Graph

323923 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
H Hartley Sweeten
77d2f7c247 staging: comedi: das800: 'dev->subdevices + 0' is already known 
There is no need to calculate the subdevice for the call to
das800_cancel. The variable 's' in this function is set to the
'dev->read_subdev' which is the same as 'dev->subdevices + 0'.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:03:55 -07:00
H Hartley Sweeten
92cfef5d90 staging: comedi: das6402: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:03:54 -07:00
H Hartley Sweeten
2e3d3cf5c7 staging: comedi: das1800: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:03:54 -07:00
H Hartley Sweeten
9b7beb6613 staging: comedi: das16m1: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:03:54 -07:00
H Hartley Sweeten
35d10629f1 staging: comedi: das16: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:03:54 -07:00
H Hartley Sweeten
2add117c2f staging: comedi: das08: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:03:54 -07:00
H Hartley Sweeten
b815357776 staging: comedi: daqboard2000: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:03:54 -07:00
H Hartley Sweeten
b31654fe4b staging: comedi: contec_pci_dio: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:03:54 -07:00
H Hartley Sweeten
713e5c35e1 staging: comedi: comedi_test: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:03:54 -07:00
H Hartley Sweeten
9da5ae29cd staging: comedi: comedi_parport: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:03:54 -07:00
H Hartley Sweeten
379585ab5c staging: comedi: comedi_bond: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:03:53 -07:00
H Hartley Sweeten
6807d64d21 staging: comedi: cb_pcimdda: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:03:53 -07:00
H Hartley Sweeten
13201d8811 staging: comedi: cb_pcimdas: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:03:53 -07:00
H Hartley Sweeten
fbe09e33f5 staging: comedi: cb_pcidio: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:03:53 -07:00
H Hartley Sweeten
82ec595aa0 staging: comedi: cb_pcidda: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:03:53 -07:00
H Hartley Sweeten
e4eb9523ef staging: comedi: cb_pcidas64: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:03:53 -07:00
H Hartley Sweeten
e89c61b989 staging: comedi: cb_pcidas: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:03:53 -07:00
H Hartley Sweeten
3d69288a5f staging: comedi: cb_das16_cs: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:03:53 -07:00
H Hartley Sweeten
0c2d3aacfe staging: comedi: c6xdigio: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:03:53 -07:00
H Hartley Sweeten
5bf4a7a708 staging: comedi: amplc_pci230: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:03:53 -07:00
H Hartley Sweeten
e11c07fe38 staging: comedi: amplc_pci224: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:03:52 -07:00
H Hartley Sweeten
d8029dcf1b staging: comedi: amplc_pc263: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:03:52 -07:00
H Hartley Sweeten
39d37be411 staging: comedi: amplc_pc236: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:01:37 -07:00
H Hartley Sweeten
6b680f90c3 staging: comedi: amplc_dio200: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Use a local variable for the subdevice pointer to keep the line
< 80 chars.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:01:37 -07:00
H Hartley Sweeten
40c4db8b6d staging: comedi: aio_iiro_16: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:01:37 -07:00
H Hartley Sweeten
ef83beae68 staging: comedi: aio_aio12_8: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:01:37 -07:00
H Hartley Sweeten
9e006a70e9 staging: comedi: adv_pci_dio: remove 'subdev' param from pci_dio_add_*() 
The subdevice index number is not used in the pci_dio_add_*()
functions. Just remove them.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:01:37 -07:00
H Hartley Sweeten
a2b7bcac20 staging: comedi: adv_pci_dio: clarify subdevice index in pci1760_attach() 
The subdevice index numbers are fixed when attaching to a pci1710 card.
Remove the subdev variable and just open code the array index numbers.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:01:37 -07:00
H Hartley Sweeten
2b36ab6c6f staging: comedi: adv_pci_dio: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:01:37 -07:00
H Hartley Sweeten
dd25ab4546 staging: comedi: adv_pci1723: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:01:37 -07:00
H Hartley Sweeten
5c60f867b1 staging: comedi: adv_pci1710: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:01:37 -07:00
H Hartley Sweeten
4fe92e1606 staging: comedi: adq12b: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:01:36 -07:00
H Hartley Sweeten
17c7ac9144 staging: comedi: adl_pci9118: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:01:36 -07:00
H Hartley Sweeten
573e31af7c staging: comedi: adl_pci9111: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:01:36 -07:00
H Hartley Sweeten
d1d7b20def staging: comedi: adl_pci9111: rename 'subdevice' variable to 's' 
Rename the variable used for the comedi_subdevice pointer from
'subdevice' to 's'. This is more typical in other comedi drivers
and helps when searching with grep.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:01:36 -07:00
H Hartley Sweeten
b23faec807 staging: comedi: adl_pci8164: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:01:36 -07:00
H Hartley Sweeten
2bac8ab3c3 staging: comedi: adl_pci7x3x: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:01:36 -07:00
H Hartley Sweeten
630b713b27 staging: comedi: adl_pci7296: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:01:36 -07:00
H Hartley Sweeten
1f6115a487 staging: comedi: adl_pci6208: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:01:36 -07:00
H Hartley Sweeten
b272f8cb32 staging: comedi: hwdrv_apci3200: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:01:36 -07:00
H Hartley Sweeten
ca0fceee36 staging: comedi: hwdrv_apci3120: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:01:35 -07:00
H Hartley Sweeten
4943374602 staging: comedi: hwdrv_APCI1710: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:01:35 -07:00
H Hartley Sweeten
3237c96413 staging: comedi: addi_common: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:01:35 -07:00
H Hartley Sweeten
6e269d7cac staging: comedi: acl7225b: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:01:35 -07:00
H Hartley Sweeten
5101b4d187 staging: comedi: 8255: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:01:35 -07:00
H Hartley Sweeten
5e4c58ce65 staging: comedi: drivers: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:01:35 -07:00
H Hartley Sweeten
b077f2cd9b staging: comedi: comedi_fops: remove subdevice pointer math 
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-09-05 20:01:35 -07:00
Linus Torvalds
0809095036 Merge tag 'mmc-fixes-for-3.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc 
Pull MMC fixes from Chris Ball:
 - a firmware bug on several Samsung MoviNAND eMMC models causes
   permanent corruption on the device when secure erase and secure trim
   requests are made, so we disable those requests on these eMMC devices.
 - atmel-mci: fix a hang with some SD cards by waiting for not-busy flag.
 - dw_mmc: low-power mode breaks SDIO interrupts; fix PIO error handling;
   fix handling of error interrupts.
 - mxs-mmc: fix deadlocks; fix compile error due to dma.h arch change.
 - omap: fix broken PIO mode causing memory corruption.
 - sdhci-esdhc: fix card detection.

* tag 'mmc-fixes-for-3.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
  mmc: omap: fix broken PIO mode
  mmc: card: Skip secure erase on MoviNAND; causes unrecoverable corruption.
  mmc: dw_mmc: Disable low power mode if SDIO interrupts are used
  mmc: dw_mmc: fix error handling in PIO mode
  mmc: dw_mmc: correct mishandling error interrupt
  mmc: dw_mmc: amend using error interrupt status
  mmc: atmel-mci: not busy flag has also to be used for read operations
  mmc: sdhci-esdhc: break out early if clock is 0
  mmc: mxs-mmc: fix deadlock caused by recursion loop
  mmc: mxs-mmc: fix deadlock in SDIO IRQ case
  mmc: bfin_sdh: fix dma_desc_array build error
 2012-09-05 19:41:58 -07:00
Miklos Szeredi
bc6c83641e uml: fix compile error in deliver_alarm() 
Fix the following compile error on UML.

  arch/um/os-Linux/time.c: In function 'deliver_alarm':
  arch/um/os-Linux/time.c:117:3: error: too few arguments to function 'alarm_handler'
  arch/um/os-Linux/internal.h:1:6: note: declared here

The error was introduced by commit d3c1cfcd ("um: pass siginfo to guest
process") in 3.6-rc1.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
CC: Martin Pärtel <martin.partel@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 2012-09-05 19:40:59 -07:00
Alan Cox
8a55ade765 dj: memory scribble in logi_dj 
Allocate a structure not a pointer to it !

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 2012-09-05 19:37:08 -07:00