kernel/kernel-generic.git
12 years agostaging: comedi vmk80xx: lock held on error path
Dan Carpenter [Fri, 20 Apr 2012 11:46:27 +0000 (14:46 +0300)]
staging: comedi vmk80xx: lock held on error path

If the user passes an invalid command, then we don't drop the lock
before returning.  The check for invalid commands doesn't need to be
done under lock so I moved it forward a couple lines.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agodrivers/staging/wlags49_h2/wl_pci.c: add missing wl_device_dealloc and wl_remove
Julia Lawall [Thu, 19 Apr 2012 11:03:58 +0000 (13:03 +0200)]
drivers/staging/wlags49_h2/wl_pci.c: add missing wl_device_dealloc and wl_remove

The need for wl_device_dealloc is motivated by the error-handling code for
the failure of wl_adapter_insert.  The need for wl_remove in the third case
is motivated by the code in the definition of wl_pci_remove.

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: iio: light: convert multiple spaces to tab
Laxman Dewangan [Thu, 19 Apr 2012 08:59:34 +0000 (14:29 +0530)]
staging: iio: light: convert multiple spaces to tab

Using tab inplace of multiple spaces for indenting.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: ni_tio_internal.h: checkpatch.pl cleanups
W. Trevor King [Thu, 19 Apr 2012 01:30:28 +0000 (21:30 -0400)]
staging: comedi: ni_tio_internal.h: checkpatch.pl cleanups

* No braces for single statement blocks.

Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: ni_tio_internal.h: checkpatch.pl line wrapping
W. Trevor King [Thu, 19 Apr 2012 01:30:27 +0000 (21:30 -0400)]
staging: comedi: ni_tio_internal.h: checkpatch.pl line wrapping

Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agodrivers: staging: rtl8172: Remove unneeded include of version.h
Marcos Paulo de Souza [Wed, 18 Apr 2012 04:30:11 +0000 (01:30 -0300)]
drivers: staging: rtl8172: Remove unneeded include of version.h

The output of "make versioncheck" told us that:

drivers/staging/rtl8712/osdep_service.h: 32 linux/version.h not needed.
drivers/staging/rtl8712/rtl871x_ioctl_linux.c: 46 linux/version.h not needed.

If we take a look at these files, we will agree to remove it.

Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Cc: <devel@driverdev.osuosl.org>
Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
ACKed-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: wlan-ng: off by one in prism2mgmt_scan_results()
Dan Carpenter [Wed, 18 Apr 2012 06:48:59 +0000 (09:48 +0300)]
Staging: wlan-ng: off by one in prism2mgmt_scan_results()

Count is used to cap "req->bssindex.data" which is used as an offset
into the hw->scanresults->info.hscanresult.result[] array.  The array
has only HFA384x_SCANRESULT_MAX (31) elements so the 32 is off by one.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agodrivers: staging: media: as102: as102fe.c: Remove include of version.h
Marcos Paulo de Souza [Wed, 18 Apr 2012 04:30:08 +0000 (01:30 -0300)]
drivers: staging: media: as102: as102fe.c: Remove include of version.h

The output of "make versioncheck" told us that:

drivers/staging/media/as102/as102_fe.c: 20 linux/version.h not needed.

If we take a look at the code, we can agree to remove this include.

Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: <linux-media@vger.kernel.org>
Cc: <devel@driverdev.osuosl.org>
Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agodrivers: staging: media: as102: as102_usb_drv.h: Remove include of version.h
Marcos Paulo de Souza [Wed, 18 Apr 2012 04:30:09 +0000 (01:30 -0300)]
drivers: staging: media: as102: as102_usb_drv.h: Remove include of version.h

The output of "make versioncheck" told us that:

drivers/staging/media/as102/as102_usb_drv.h: 20 linux/version.h not
needed.

If we take a look at the code, we can agree to remove it.

Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: <linux-media@vger.kernel.org>
Cc: <devel@driverdev.osuosl.org >
Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agodrivers: staging: media: easycap: easycap_ioctl: Include version.h header
Marcos Paulo de Souza [Wed, 18 Apr 2012 04:30:10 +0000 (01:30 -0300)]
drivers: staging: media: easycap: easycap_ioctl: Include version.h header

The output of "make versioncheck" told us that:

drivers/staging/media/easycap/easycap_ioctl.c: 2442: need
linux/version.h

If we take a look at the code, we will see the macro KERNEL_VERSION be
used. So, we need this include.

Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: <linux-media@vger.kernel.org>
Cc: <devel@driverdev.osuosl.org >
Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agodrivers: staging: vme: devices: Remove unneeded include version.h
Marcos Paulo de Souza [Wed, 18 Apr 2012 04:30:12 +0000 (01:30 -0300)]
drivers: staging: vme: devices: Remove unneeded include version.h

The output of "make versioncheck" told us that:

drivers/staging/vme/devices/vme_pio2_core.c: 13 linux/version.h not needed.
drivers/staging/vme/devices/vme_pio2_gpio.c: 13 linux/version.h not needed.

If we take a look at these files, we will agree to remove it.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: <devel@driverdev.osuosl.org>
Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: wlags49_h2: reading past the end of array
Dan Carpenter [Tue, 17 Apr 2012 06:47:25 +0000 (09:47 +0300)]
Staging: wlags49_h2: reading past the end of array

The original code had some confusion about the dimensions of the array.
It should have been an array of 2 element arrays but it was declared as
an array of 50 element arrays.

The limitter on the outside array should have been
ARRAY_SIZE(chan_freq_list) or 26 but instead 50 was used.  It meant that
we read past the end.  It's probably harmless but it's obviously worth
fixing.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoDrivers: Staging: Comedi: comedi_fops: Fixed a code style issue
Benedikt Bergenthal [Mon, 16 Apr 2012 10:40:22 +0000 (12:40 +0200)]
Drivers: Staging: Comedi: comedi_fops: Fixed a code style issue

Fixed a code style issue.

Signed-off-by: Benedikt Bergenthal <benedikt@kdrennert.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: r8192e: Fix possible error in configuration
Larry Finger [Mon, 16 Apr 2012 21:06:18 +0000 (16:06 -0500)]
staging: r8192e: Fix possible error in configuration

It is possible to misconfigure a kernel by selecting the rtllib crypto
routines without enabling the underlying support from the crypto library.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Acked-by: Sean MacLennan <seanm@seanm.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: rtl8192e: remove some dead code
Dan Carpenter [Tue, 17 Apr 2012 06:45:59 +0000 (09:45 +0300)]
Staging: rtl8192e: remove some dead code

We don't use the rxcmdpkt[] counters at all and we can remove them.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
ACKed-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: rtl8192u: fix some memory corruption
Dan Carpenter [Tue, 17 Apr 2012 20:37:31 +0000 (23:37 +0300)]
Staging: rtl8192u: fix some memory corruption

When we received a command we incremented a stat counter depending on
the type of message.  The problem is there were 8 types of commands but
there were only 4 counters allocated so it corrupted memory past the
end of the rxcmdpkt[] array.

The fix is just to remove the counters because they aren't used.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
ACKed-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: rtl8187se: Fix typos.
Justin P. Mattock [Tue, 17 Apr 2012 13:56:43 +0000 (06:56 -0700)]
Staging: rtl8187se: Fix typos.

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: fix android alarm.c printk format warnings
Randy Dunlap [Tue, 17 Apr 2012 01:01:24 +0000 (18:01 -0700)]
staging: fix android alarm.c printk format warnings

Fix printk format warnings by using 't' modifier for ptrdiff_t.

drivers/staging/android/alarm.c:344:2: warning: format '%ld' expects type 'long int', but argument 2 has type 'int'
drivers/staging/android/alarm.c:367:3: warning: format '%ld' expects type 'long int', but argument 2 has type 'int'

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: Brian Swetland <swetland@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: Fix typo within android drivers.
Masanari Iida [Mon, 16 Apr 2012 15:26:29 +0000 (00:26 +0900)]
staging: Fix typo within android drivers.

Fix spelling typo in comments within android drivers.

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio: drop procesed_val element of chan_spec.
Jonathan Cameron [Sun, 15 Apr 2012 16:41:31 +0000 (17:41 +0100)]
staging:iio: drop procesed_val element of chan_spec.

There is no longer any need for this as we have separate
info_mask elements for raw and processed value reads.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio: Make read / write attributes for channel values optional.
Jonathan Cameron [Sun, 15 Apr 2012 16:41:30 +0000 (17:41 +0100)]
staging:iio: Make read / write attributes for channel values optional.

Until now all channels have had read/write attributes. This patch
allows for channels where we can't actually read the value (or for
output devices, write it!)

v2 introduces separate elements for processed and raw thus removing
some special case code from the core.  Thanks to Lars-Peter for an
excellent suggestion!

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:isl29028 Add IIO_CHAN_INFO_RAW/PROCESSED entries
Jonathan Cameron [Sun, 15 Apr 2012 16:41:29 +0000 (17:41 +0100)]
staging:iio:isl29028 Add IIO_CHAN_INFO_RAW/PROCESSED entries

Precursor to making value read / write attribute optional.
This one stands along as it merged just before the series
doing all the other drivers.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:meter Add IIO_CHAN_INFO_RAW entries to all drivers.
Lars-Peter Clausen [Sun, 15 Apr 2012 16:41:28 +0000 (17:41 +0100)]
staging:iio:meter Add IIO_CHAN_INFO_RAW entries to all drivers.

Precursor to making value read / write attribute optional.
No processed values in resolvers at the moment.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio: Add IIO_CHAN_INFO_RAW entries to the dummy driver
Lars-Peter Clausen [Sun, 15 Apr 2012 16:41:27 +0000 (17:41 +0100)]
staging:iio: Add IIO_CHAN_INFO_RAW entries to the dummy driver

Precursor to making value read / write attribute optional.
No processed values in resolvers at the moment.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:cdc Add IIO_CHAN_INFO_RAW/PROCESSED entries to all drivers.
Jonathan Cameron [Sun, 15 Apr 2012 16:41:26 +0000 (17:41 +0100)]
staging:iio:cdc Add IIO_CHAN_INFO_RAW/PROCESSED entries to all drivers.

Precursor to making value read / write attribute optional.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:impedance Add IIO_CHAN_INFO_RAW/PROCESSED entries to all drivers.
Jonathan Cameron [Sun, 15 Apr 2012 16:41:25 +0000 (17:41 +0100)]
staging:iio:impedance Add IIO_CHAN_INFO_RAW/PROCESSED entries to all drivers.

Precursor to making value read / write attribute optional.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:resolver Add IIO_CHAN_INFO_RAW entries to all drivers.
Jonathan Cameron [Sun, 15 Apr 2012 16:41:24 +0000 (17:41 +0100)]
staging:iio:resolver Add IIO_CHAN_INFO_RAW entries to all drivers.

Precursor to making value read / write attribute optional.
No processed values in resolvers at the moment.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:magnetometer Add IIO_CHAN_INFO_RAW entries to all drivers.
Jonathan Cameron [Sun, 15 Apr 2012 16:41:23 +0000 (17:41 +0100)]
staging:iio:magnetometer Add IIO_CHAN_INFO_RAW entries to all drivers.

Precursor to making value read / write attribute optional.
No processed values for magnetometers.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:light Add IIO_CHAN_INFO_RAW/PROCESSED entries to all drivers.
Jonathan Cameron [Sun, 15 Apr 2012 16:41:22 +0000 (17:41 +0100)]
staging:iio:light Add IIO_CHAN_INFO_RAW/PROCESSED entries to all drivers.

Precursor to making value read / write attribute optional.
Note that minimal change route taken here. The read_raw callbacks
in both drivers could do fewer checks to identify the channel than
they now do.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:imu Add IIO_CHAN_INFO_RAW entries to all drivers.
Jonathan Cameron [Sun, 15 Apr 2012 16:41:21 +0000 (17:41 +0100)]
staging:iio:imu Add IIO_CHAN_INFO_RAW entries to all drivers.

Precursor to making value read / write attribute optional.
No processed values in IMU.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:gyro Add IIO_CHAN_INFO_RAW entries to all drivers.
Jonathan Cameron [Sun, 15 Apr 2012 16:41:20 +0000 (17:41 +0100)]
staging:iio:gyro Add IIO_CHAN_INFO_RAW entries to all drivers.

Precursor to making value read / write attribute optional.
No processed values in gyroscopes.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:dac Add IIO_CHAN_INFO_RAW entries to all drivers.
Jonathan Cameron [Sun, 15 Apr 2012 16:41:19 +0000 (17:41 +0100)]
staging:iio:dac Add IIO_CHAN_INFO_RAW entries to all drivers.

Precursor to making value read / write attribute optional.
No processed versions in DACs.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:adc Add IIO_CHAN_INFO_RAW entries to all drivers.
Jonathan Cameron [Sun, 15 Apr 2012 16:41:18 +0000 (17:41 +0100)]
staging:iio:adc Add IIO_CHAN_INFO_RAW entries to all drivers.

Precursor to making value read / write attribute optional.
No processed values for adc's.

Updated to include the spear adc driver (hence introducing a
dependency on the patch that adds that driver).

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:accel Add IIO_CHAN_INFO_RAW entries to all drivers.
Jonathan Cameron [Sun, 15 Apr 2012 16:41:17 +0000 (17:41 +0100)]
staging:iio:accel Add IIO_CHAN_INFO_RAW entries to all drivers.

Precursor to making value read / write attribute optional.
No processed values in accelerometers.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio: add a raw and processed elements to info_mask
Jonathan Cameron [Sun, 15 Apr 2012 16:41:16 +0000 (17:41 +0100)]
staging:iio: add a raw and processed elements to info_mask

This will allow us to have drivers where the channel value
may not be read or written but other information is available.
Also adds the ability to have both processed and raw access
to a given channel, though in most cases this doesn't make
sense.

Ultimately will lead to simpler code by allowing us to drop
the special case handling for the value reading cases.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: COMEDI_CB_EOA is also used to report end-of-output.
W. Trevor King [Mon, 16 Apr 2012 17:25:18 +0000 (13:25 -0400)]
staging: comedi: COMEDI_CB_EOA is also used to report end-of-output.

Update comments in comedi.h accordingly.

Signed-off-by: W. Trevor King <wking@drexel.edu>
Acked-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: iio: light: isl29028: fix correct mask value
Laxman Dewangan [Mon, 16 Apr 2012 15:57:42 +0000 (21:27 +0530)]
staging: iio: light: isl29028: fix correct mask value

The mask value in the read_raw/write_raw is absolute
value, not the bit position value.
Fixing this in the implemented function to check value,
not with the bit position value.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: as102: Remove redundant NULL check before release_firmware() and pointless...
Jesper Juhl [Mon, 9 Apr 2012 20:51:48 +0000 (22:51 +0200)]
staging: as102: Remove redundant NULL check before release_firmware() and pointless comments

release_firmware() deals gracefullt with NULL pointers - it's
redundant to check for them before calling the function.

Also remove a few pointless comments - it's rather obvious from the
code that kfree() free's a buffer and that release_firmware() releases
firmware - comments just stating that add no value.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: vt6656: Don't needlessly test for NULL before release_firmware()
Jesper Juhl [Mon, 9 Apr 2012 20:51:58 +0000 (22:51 +0200)]
staging: vt6656: Don't needlessly test for NULL before release_firmware()

Checking for a NULL pointer before calling release_firmware() is
redundant since the function does that check itself.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: Add kernel config for default buffer sizes
Ian Abbott [Fri, 13 Apr 2012 13:12:54 +0000 (14:12 +0100)]
staging: comedi: Add kernel config for default buffer sizes

Allow the default values for the module parameters for the default
initial buffer size and default maximum buffer size to be specified in
the kernel configuration.

I'm not sure what the defaults for the defaults for the defaults should
be, but 64 KiB seems to small, so I used values suggested by Bernd Porr,
which are 2048 KiB for the default initial buffer size and 20480 for the
default maximum buffer size.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Cc: Bernd Porr <berndporr@f2s.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: Add module parameters for default buffer size
Ian Abbott [Fri, 13 Apr 2012 13:12:53 +0000 (14:12 +0100)]
staging: comedi: Add module parameters for default buffer size

For comedi subdevices that support asynchronous transfer commands, the
initial buffer size and maximum buffer size for the transfer are both
set to 64 KiB when the comedi device is "attached" to the hardware
device.  For many applications with reasonable fast sample rates and
slow user-space (e.g. Python) these sizes are a bit too small.

A task with CAP_SYS_ADMIN privileges can change the maximum buffer size
for a comedi subdevice with an ioctl call or by writing to a device
attribute file in sysfs, but that's not very convenient.  For comedi
devices attached during system startup, this could be done by a start-up
script, but for hot-plugged devices it would require scripts run by udev
rules, etc.

Rather than use hardwired values, this patch introduces a couple of
module parameters to set the defaults for the initial buffer size
(comedi_default_buf_size_kb) and maximum buffer size
(comedi_default_buf_maxsize_kb).  These values are applied in place of
the previous hard-wired values when the comedi device is "attached".
The module parameter values are in units of KiB for consistency with the
existing device attribute files.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:adc: Add SPEAr ADC driver
Stefan Roese [Thu, 12 Apr 2012 09:05:35 +0000 (11:05 +0200)]
staging:iio:adc: Add SPEAr ADC driver

This patch implements the basic single data conversion support for
the SPEAr600 SoC ADC. The register layout of SPEAr600 differs a bit
from other SPEAr SoC variants (e.g. SPEAr3xx). These differences are
handled via DT compatible testing. Resulting in a multi-arch binary.

This driver is currently tested only on SPEAr600. Future patches may add
support for other SoC variants (SPEAr3xx) and features like software
buffer or DMA.

Signed-off-by: Stefan Roese <sr@denx.de>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Viresh Kumar <viresh.kumar@st.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: iio: add driver for isl29028
Laxman Dewangan [Fri, 13 Apr 2012 10:33:32 +0000 (16:03 +0530)]
staging: iio: add driver for isl29028

Intersil's ISL29028 is concurrent Ambient Light and
Proximity Sensor device.
Add driver to access the light and IR intensity and
proximity value via iio interface.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: iio: add channel info for sampling frequency
Laxman Dewangan [Fri, 13 Apr 2012 10:33:31 +0000 (16:03 +0530)]
staging: iio: add channel info for sampling frequency

Adding channel info IIO_CHAN_INFO_SAMP_FREQ to select
different sampling frequency per channel wise.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:core drop the IIO_CHAN macro for ease of maintenance.
Jonathan Cameron [Fri, 13 Apr 2012 09:43:00 +0000 (10:43 +0100)]
staging:iio:core drop the IIO_CHAN macro for ease of maintenance.

I was warned long ago that this macro would cause trouble but didn't
heed the advice, hence I'm unwinding it now!

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:meter:ade7758 unwind use of IIO_CHAN macro.
Jonathan Cameron [Fri, 13 Apr 2012 09:42:59 +0000 (10:42 +0100)]
staging:iio:meter:ade7758 unwind use of IIO_CHAN macro.

This macro is being removed to simplify ongoing maintenance
so we need to unwind and remaining users.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:impedance-analyzer:ad5933 unwind use of IIO_CHAN macro.
Jonathan Cameron [Fri, 13 Apr 2012 09:42:58 +0000 (10:42 +0100)]
staging:iio:impedance-analyzer:ad5933 unwind use of IIO_CHAN macro.

This macro is being removed to simplify ongoing maintenance
so we need to unwind and remaining users.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:gyro:adis16260 unwind use of IIO_CHAN macro.
Jonathan Cameron [Fri, 13 Apr 2012 09:42:57 +0000 (10:42 +0100)]
staging:iio:gyro:adis16260 unwind use of IIO_CHAN macro.

This macro is being removed to simplify ongoing maintenance
so we need to unwind and remaining users.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:accel:ad7780 unwind use of IIO_CHAN macro.
Jonathan Cameron [Fri, 13 Apr 2012 09:42:56 +0000 (10:42 +0100)]
staging:iio:accel:ad7780 unwind use of IIO_CHAN macro.

This macro is being removed to simplify ongoing maintenance
so we need to unwind and remaining users.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:adc:ad7476 unwind use of IIO_CHAN macro.
Jonathan Cameron [Fri, 13 Apr 2012 09:42:55 +0000 (10:42 +0100)]
staging:iio:adc:ad7476 unwind use of IIO_CHAN macro.

This macro is being removed to simplify ongoing maintenance
so we need to unwind and remaining users.

V2 has the cleanup Lars-Peter suggested.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:adc:ad7298 unwind use of IIO_CHAN macro.
Jonathan Cameron [Fri, 13 Apr 2012 09:42:54 +0000 (10:42 +0100)]
staging:iio:adc:ad7298 unwind use of IIO_CHAN macro.

This macro is being removed to simplify ongoing maintenance
so we need to unwind and remaining users.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:accel:sca3000 unwind use of IIO_CHAN macro.
Jonathan Cameron [Fri, 13 Apr 2012 09:42:53 +0000 (10:42 +0100)]
staging:iio:accel:sca3000 unwind use of IIO_CHAN macro.

This macro is being removed to simplify ongoing maintenance
so we need to unwind and remaining users.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Reviewed-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:accel:lis3l02dq unwind use of IIO_CHAN macro.
Jonathan Cameron [Fri, 13 Apr 2012 09:42:52 +0000 (10:42 +0100)]
staging:iio:accel:lis3l02dq unwind use of IIO_CHAN macro.

This macro is being removed to simplify ongoing maintenance
so we need to unwind and remaining users.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Reviewed-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:accel:adis16240 unwind use of IIO_CHAN macro.
Jonathan Cameron [Fri, 13 Apr 2012 09:42:51 +0000 (10:42 +0100)]
staging:iio:accel:adis16240 unwind use of IIO_CHAN macro.

This macro is being removed to simplify ongoing maintenance
so we need to unwind and remaining users.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:accel:adis16209 unwind use of IIO_CHAN macro.
Jonathan Cameron [Fri, 13 Apr 2012 09:42:50 +0000 (10:42 +0100)]
staging:iio:accel:adis16209 unwind use of IIO_CHAN macro.

This macro is being removed to simplify ongoing maintenance
so we need to unwind and remaining users.

Note the addition of extend_name = "supply" for the supply voltage
adc.  This brings this driver into line with the other adis parts.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:accel:adis16204 unwind use of IIO_CHAN macro.
Jonathan Cameron [Fri, 13 Apr 2012 09:42:49 +0000 (10:42 +0100)]
staging:iio:accel:adis16204 unwind use of IIO_CHAN macro.

This macro is being removed to simplify ongoing maintenance
so we need to unwind and remaining users.

Note that previously the supply was not indexed. I have made
it indexed for consistency with other similar devices and
for internal consistency with the aux adc port.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:accel:adis16203 unwind use of IIO_CHAN macro.
Jonathan Cameron [Fri, 13 Apr 2012 09:42:48 +0000 (10:42 +0100)]
staging:iio:accel:adis16203 unwind use of IIO_CHAN macro.

This macro is being removed to simplify ongoing maintenance
so we need to unwind and remaining users.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:accel:adis16201 unwind use of IIO_CHAN macro.
Jonathan Cameron [Fri, 13 Apr 2012 09:42:47 +0000 (10:42 +0100)]
staging:iio:accel:adis16201 unwind use of IIO_CHAN macro.

This macro is being removed to simplify ongoing maintenance
so we need to unwind and remaining users.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio: chan_spec - take extend_name constant.
Jonathan Cameron [Fri, 13 Apr 2012 09:24:21 +0000 (10:24 +0100)]
staging:iio: chan_spec - take extend_name constant.

I can't envision a case where this is not constant and we
don't seem to have any in tree, so lets clear up this loose
end.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:iio_core.h make less dependent on other included headers
Jonathan Cameron [Fri, 13 Apr 2012 09:24:20 +0000 (10:24 +0100)]
staging:iio:iio_core.h make less dependent on other included headers

There are a lot of pointers to structures used in here that are not
declared unless a particular header is included first.  Deal with
the IIO specific ones by putting in forward declarations and the
other ones by including kernel.h and device.h.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:Documentation: Fix a cut and paste error.
Jonathan Cameron [Fri, 13 Apr 2012 09:24:19 +0000 (10:24 +0100)]
staging:iio:Documentation: Fix a cut and paste error.

falling is repeated in some entries instead of 1x falling and 1x rising
for the entry.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:light:tsl2563 channel spec buglet / always reading same adc.
Jonathan Cameron [Fri, 13 Apr 2012 09:24:18 +0000 (10:24 +0100)]
staging:iio:light:tsl2563 channel spec buglet / always reading same adc.

The IIO_LIGHT channel was not marked as being a processed_val despite
clearly being in lux.

The IIO_INTENSITY channel reads were dependent on channel and that isn't
specified for either adc (as they now use modifiers).  Hence use the
modifier instead.

Reported-by: Jon Brenner <jbrenner@taosinc.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoNET: pc300, move to staging as it is broken
Jiri Slaby [Wed, 11 Apr 2012 09:14:57 +0000 (11:14 +0200)]
NET: pc300, move to staging as it is broken

It was marked as BROKEN back in 2008. It is because the tty handling
in the driver is really broken.

There was some activity in January 2012 to fix the driver, but the
patch was commented to be bogus:
  https://lkml.org/lkml/2012/1/29/160
and we have not heard back from the author since then:
  https://lkml.org/lkml/2012/3/28/412

So since nobody stepped in and rewrote the driver, it is time to move
it out of line now. And drop it some time later if nobody comes up
with patches to fix the driver in staging.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Acked-by: David S. Miller <davem@davemloft.net>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Andrea Shepard <andrea@persephoneslair.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: replace open-coded ARRAY_SIZEs
Jim Cromie [Tue, 10 Apr 2012 22:06:41 +0000 (16:06 -0600)]
staging: replace open-coded ARRAY_SIZEs

spatch http://coccinelle.lip6.fr/rules/array.cocci did these.

Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio: use spi->irq valid rather than querying available modes
Jonathan Cameron [Tue, 10 Apr 2012 20:11:09 +0000 (21:11 +0100)]
staging:iio: use spi->irq valid rather than querying available modes

Given these drivers only try to add the trigger if a valid
irq is present it is clearer to check the same condition when
deciding whether to remove it on a later trigger.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:accel:lis3l02dq add symmetry to check for presence of trigger.
Jonathan Cameron [Tue, 10 Apr 2012 20:11:08 +0000 (21:11 +0100)]
staging:iio:accel:lis3l02dq add symmetry to check for presence of trigger.

Checking indio_dev->modes is uggly and not symmetric with the conditions
on whether triggers are allowed in the first place.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:max1363 enable use with inkernel interfaces.
Jonathan Cameron [Tue, 10 Apr 2012 20:11:07 +0000 (21:11 +0100)]
staging:iio:max1363 enable use with inkernel interfaces.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio fill in some missing docs
Jonathan Cameron [Tue, 10 Apr 2012 20:11:06 +0000 (21:11 +0100)]
staging:iio fill in some missing docs

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:adc:max1363 fix missing update_scan_mask callback.
Jonathan Cameron [Tue, 10 Apr 2012 20:11:05 +0000 (21:11 +0100)]
staging:iio:adc:max1363 fix missing update_scan_mask callback.

When moving over to the new sw_ring_preenable I managed to add
this callback to only one of the two iio_info structures. As
such only some devices will currently work.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:iio:buffer example fix typos
Jonathan Cameron [Tue, 10 Apr 2012 20:11:04 +0000 (21:11 +0100)]
staging:iio:buffer example fix typos

I have no idea how I managed to munge the previous
patch related to this.  Sorry all.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: evict abandoned 68360serial.c driver from the kernel
Paul Gortmaker [Tue, 27 Mar 2012 23:07:11 +0000 (19:07 -0400)]
staging: evict abandoned 68360serial.c driver from the kernel

commit 3a0db7215c88077b61a673215756ec4a0dc0c7a5

    "TTY: serial, move 68360 driver to staging"

did so because the driver had remained broken since 2008.  It also
added this text to the TODO file:

   "If no one steps up to adopt any of these drivers, they will
    be removed in the 3.4 release."

A quick search on the internet doesn't reveal anyone actively
trying to update/fix this driver, so follow through on the above
and remove it from the pending 3.4 release.

Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: drm/omap: dmabuf/prime support
Rob Clark [Tue, 10 Apr 2012 18:19:55 +0000 (13:19 -0500)]
staging: drm/omap: dmabuf/prime support

For now just implementing the exporting APIs, not yet importing.  And
kmap is rejected on tiled buffers (although the usefulness of that seems
questionable, but could be added later if needed).

Signed-off-by: Rob Clark <rob@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: usbdux: remove an unnecessary dev_info()
Ian Abbott [Mon, 2 Apr 2012 11:00:59 +0000 (12:00 +0100)]
staging: comedi: usbdux: remove an unnecessary dev_info()

usbdux_attach_common() prints two messages via dev_info() that shows a
device has been attached.  The first of these messages includes an index
into a static array that the function determines by pointer subtraction,
assuming the pointer passed to the function points to an element of the
array.  Dan Carpenter pointed out that this was kind of ugly.  Since the
dev_info() that prints the array index doesn't add anything useful
(since no other messages print the array index and nothing else uses
it), let's just get rid of it.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: usbdux: use attach_usb() hook
Ian Abbott [Fri, 30 Mar 2012 16:15:05 +0000 (17:15 +0100)]
staging: comedi: usbdux: use attach_usb() hook

Change the usbdux driver to use the new attach_usb() hook in struct
comedi_driver to auto-configure probed USB devices after the firmware is
loaded.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: amplc_pci224: use attach_pci() hook
Ian Abbott [Fri, 30 Mar 2012 16:15:04 +0000 (17:15 +0100)]
staging: comedi: amplc_pci224: use attach_pci() hook

Change the amplc_pci224 driver to use the new attach_pci() hook in
struct comedi_driver to auto-configure probed PCI devices.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: restrict comedi_auto_config() to single driver
Ian Abbott [Fri, 30 Mar 2012 16:15:03 +0000 (17:15 +0100)]
staging: comedi: restrict comedi_auto_config() to single driver

comedi_auto_config() only needs to consider a single struct
comedi_driver object, but it currently calls comedi_device_attach()
which looks at all struct comedi_driver objects registered with the
Comedi core.

Instead, call the recently added comedi_auto_config_helper() with a new
wrapper comedi_auto_config_wrapper() to mimic the effect of
comedi_device_attach() for a single struct comedi_driver.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: pass struct comedi_driver * to comedi_auto_config()
Ian Abbott [Fri, 30 Mar 2012 16:15:02 +0000 (17:15 +0100)]
staging: comedi: pass struct comedi_driver * to comedi_auto_config()

Pass a pointer to the struct comedi_driver to comedi_auto_config()
instead of the driver name.  comedi_auto_config() will be changed to
make use of this.  It currently calls comedi_device_attach() which
examines the whole list of struct comedi_driver objects.  It will be
changed to restrict itself to just the supplied struct comedi_driver
object.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: add bus-type-specific attach hooks for PCI and USB
Ian Abbott [Fri, 30 Mar 2012 16:15:01 +0000 (17:15 +0100)]
staging: comedi: add bus-type-specific attach hooks for PCI and USB

The Comedi auto-configuration mechanism used to bind hardware devices to
comedi devices automatically is pretty kludgy.  It fakes a "manual"
configuration of the comedi device as though the COMEDI_DEVCONFIG ioctl
(or the 'comedi_config' utility) were used.  In particular, the
low-level comedi driver's '->attach()' routine is called with a pointer
to the struct comedi_device being attached and a pointer to a 'struct
devconfig' containing a device name string and a few integer options to
help the attach routine locate the device being attached.  In the case
of PCI devices, these integer options are the PCI bus and slot numbers.
In the case of USB devices, there are no integer options and it relies
more on pot luck to attach the correct device.

This patch adds a couple of bus-type-specific attach routine hooks to
the struct comedi_driver, which a low-level driver can optionally fill
in if it supports auto-configuration.

A low-level driver that supports auto-configuration of {PCI,USB} devices
calls the existing comedi_{pci,usb}_auto_config() when it wishes to
auto-configure a freshly probed device (maybe after loading firmware).
This will call the new '->attach_{pci,usb}()' hook if the driver has
defined it, otherwise it will fall back to calling the '->attach()' hook
as before.  The '->attach_{pci,usb}()' hook gets a pointer to the struct
comedi_device and a pointer to the struct {pci_dev,usb_interface} and
can figure out the {PCI,USB} device details for itself.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: refactor comedi_device_attach() a bit
Ian Abbott [Fri, 30 Mar 2012 16:15:00 +0000 (17:15 +0100)]
staging: comedi: refactor comedi_device_attach() a bit

Split the post-config part of comedi_device_attach() into new function
comedi_device_postconfig() and rearrange the rest of the function a bit.

The new comedi_device_postconfig() function will be called by some new
bus-type-specific auto-attach functions.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: pass usb interface to comedi_usb_auto_config
Ian Abbott [Fri, 30 Mar 2012 16:14:59 +0000 (17:14 +0100)]
staging: comedi: pass usb interface to comedi_usb_auto_config

The comedi_usb_auto_config() and comedi_usb_auto_unconfig() functions
currently take a 'struct usb_device *'.  It makes more sense to pass a
'struct usb_interface *' to allow for composite USB devices.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: don't hijack hardware device private data
Ian Abbott [Fri, 30 Mar 2012 16:14:58 +0000 (17:14 +0100)]
staging: comedi: don't hijack hardware device private data

comedi_auto_config() associates a Comedi minor device number with an
auto-configured hardware device and comedi_auto_unconfig() disassociates
it.  Currently, these use the hardware device's private data pointer to
point to some allocated storage holding the minor device number.  This
is a bit of a waste of the hardware device's private data pointer,
preventing it from being used for something more useful by the low-level
comedi device drivers.  For example, it would make more sense if
comedi_usb_auto_config() was passed a pointer to the struct
usb_interface instead of the struct usb_device, but this cannot be done
currently because the low-level comedi drivers already use the private
data pointer in the struct usb_interface for something more useful.

This patch stops the comedi core hijacking the hardware device's private
data pointer.  Instead, comedi_auto_config() stores a pointer to the
hardware device's struct device in the struct comedi_device_file_info
associated with the minor device number, and comedi_auto_unconfig()
calls new function comedi_find_board_minor() to recover the minor device
number associated with the hardware device.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: don't disable IRQ for comedi_file_info_table_lock
Ian Abbott [Fri, 30 Mar 2012 16:14:57 +0000 (17:14 +0100)]
staging: comedi: don't disable IRQ for comedi_file_info_table_lock

None of the functions that acquire the comedi_file_info_table_lock
spin-lock need to disable interrupts.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: pass 'struct comedi_driver *' to comedi_..._auto_config
Ian Abbott [Fri, 30 Mar 2012 16:14:56 +0000 (17:14 +0100)]
staging: comedi: pass 'struct comedi_driver *' to comedi_..._auto_config

The comedi_pci_auto_config() and comedi_usb_auto_config() functions
currently take a board name parameter which is actually a driver name
parameter.  Replace it with a pointer to the struct comedi_driver.  This
will allow comedi_pci_auto_config() and comedi_usb_auto_config() to call
bus-type-specific auto-configuration hooks in the struct comedi_driver
if they exist (they don't yet).  The idea is that these
bus-type-specific auto-configuration hooks won't have to search the bus
for the device being auto-configured like 'attach()' hook has to.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: das08: separately configure ISA and PCI
Ian Abbott [Mon, 26 Mar 2012 15:57:29 +0000 (16:57 +0100)]
staging: comedi: das08: separately configure ISA and PCI

The das08 driver supports both ISA and PCI cards, but currently is
configured outside the ISA and PCI comedi driver sections.  The module
is also used by the das08_cs driver.  This patch splits the
configuration to make the ISA and PCI parts separately selectable, and
changes the driver to only include the selected ISA and/or PCI board
types.  Also, if neither the ISA or PCI parts are selected, and the
module is only needed for the das08_cs driver, don't register the driver
as a comedi driver as it doesn't have any boards to support.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: amplc_pc263: separately configure ISA and PCI
Ian Abbott [Mon, 26 Mar 2012 15:57:28 +0000 (16:57 +0100)]
staging: comedi: amplc_pc263: separately configure ISA and PCI

The amplc_pc263 driver supports both ISA and PCI cards, but currently
it is only possible to select the driver if PCI is configured.  This
patch splits the configuration to make the ISA and PCI parts seperately
selectable, and changes the driver to only include the selected ISA
and/or PCI board types.

Also fix a conditionally mismatched brace in pc263_detach().

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: amplc_pc236: separately configure ISA and PCI
Ian Abbott [Mon, 26 Mar 2012 15:57:27 +0000 (16:57 +0100)]
staging: comedi: amplc_pc236: separately configure ISA and PCI

The amplc_pc236 driver supports both ISA and PCI cards, but currently
it is only possible to select the driver if PCI is configured.  This
patch splits the configuration to make the ISA and PCI parts seperately
selectable, and changes the driver to only include the selected ISA
and/or PCI board types.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: amplc_dio200: separately configure ISA and PCI
Ian Abbott [Mon, 26 Mar 2012 15:57:26 +0000 (16:57 +0100)]
staging: comedi: amplc_dio200: separately configure ISA and PCI

The amplc_dio200 driver supports both ISA and PCI cards, but currently
it is only possible to select the driver if PCI is configured.  This
patch splits the configuration to make the ISA and PCI parts seperately
selectable, and changes the driver to only include the selected ISA
and/or PCI board types.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: VME: Ensure TSI148 link list descriptors are written big endian
Martyn Welch [Thu, 22 Mar 2012 13:27:30 +0000 (13:27 +0000)]
Staging: VME: Ensure TSI148 link list descriptors are written big endian

The DMA functionality fails to work on little endian processors, such as
found on x86 based platforms. The DMA engine copies the link list
descriptors from memory into big endian registers. On little endian systems
this results in the values being byte swapped. This patch uses standard
kernel functionality to ensure that the descriptors are stored in big
endian format.

Signed-off-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: VME: Convert TSI148 to use dma_map_single
Martyn Welch [Thu, 22 Mar 2012 13:27:29 +0000 (13:27 +0000)]
Staging: VME: Convert TSI148 to use dma_map_single

The DMA functionality fails to work on some Intel based platforms. Some
recent Intel platforms have an IOMMU. Transferring the DMA descriptors,
which were mapped using virt_to_phys(), failed. This patch updates the
driver to use dma_map_single().

Signed-off-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: bcm: IPv6Protocol.c: coding style fix
Max Tottenham [Tue, 3 Apr 2012 11:35:31 +0000 (12:35 +0100)]
Staging: bcm: IPv6Protocol.c: coding style fix

Eighth patch in a series to fix coding style in IPv6Protocol.c
This patch removes some uneeded braces around single line if/for statements

Signed-off-by: Max Tottenham <mtottenh@gmail.com>
Acked-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: bcm: IPv6Protocol.c: coding style fix
Max Tottenham [Tue, 3 Apr 2012 11:35:30 +0000 (12:35 +0100)]
Staging: bcm: IPv6Protocol.c: coding style fix

Seventh patch in a series of patches to fix coding style in IPv6Protocol.c
this patch makes the file mostly conform to the 80 char line limit
there are some exceptions to this rule I have left in to aid readability

Signed-off-by: Max Tottenham <mtottenh@gmail.com>
Acked-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: bcm: IPv6Protocol.c coding style fix
Max Tottenham [Tue, 3 Apr 2012 11:35:29 +0000 (12:35 +0100)]
Staging: bcm: IPv6Protocol.c coding style fix

Sixth in a series of patche to fix coding style in IPv6Protocol.c
This patch changes the format of if statments from:
if (#VALUE == variable)
to:
if (variable == #VALUE)

Signed-off-by: Max Tottenham <mtottenh@gmail.com>
Acked-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: bcm: IPv6Protocol.c coding style fix
Max Tottenham [Tue, 3 Apr 2012 11:35:28 +0000 (12:35 +0100)]
Staging: bcm: IPv6Protocol.c coding style fix

Fith in a series of patche to fi coding syle in IPv6Protocol.c
Fixed trailing whitespaces and replaced spaces with tabs
in code indents

Signed-off-by: Max Tottenham <mtottenh@gmail.com>
Acked-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: bcm: IPv6Protocol.c coding style fix
Max Tottenham [Tue, 3 Apr 2012 11:35:27 +0000 (12:35 +0100)]
Staging: bcm: IPv6Protocol.c coding style fix

Fourth patch in a series of patches to fix  coding style in IPv6Protocol.c
Continuation of fixing spacing arount ','

Signed-off-by: Max Tottenham <mtottenh@gmail.com>
Acked-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: bcm: IPv6Protocol.c fix coding style
Max Tottenham [Tue, 3 Apr 2012 11:35:26 +0000 (12:35 +0100)]
Staging: bcm: IPv6Protocol.c fix coding style

Third in a series of patches to fix coding style in Ipv6Protocol.c
This patch fixes the spacing around ',' in function calls.

Signed-off-by: Max Tottenham <mtottenh@gmail.com>
Acked-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: bcm: IPv6Protocol.c coding style fix
Max Tottenham [Tue, 3 Apr 2012 11:35:25 +0000 (12:35 +0100)]
Staging: bcm: IPv6Protocol.c coding style fix

Second in a set of patches to fix coding style in IPv6Protocol.c
This patch changes the commenting style

Signed-off-by: Max Tottenham <mtottenh@gmail.com>
Acked-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: bcm: IPv6Protocol.c: Fix coding style
Max Tottenham [Tue, 3 Apr 2012 11:35:24 +0000 (12:35 +0100)]
Staging: bcm: IPv6Protocol.c: Fix coding style

The first in a series of 8 patches to fix IPv6Protocol.c
This first patch fixes formatting issues for braced statements
(e.g. if/for/while)

Signed-off-by: Max Tottenham <mtottenh@gmail.com>
Acked-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:ramster Fix typos in staging:ramster
Justin P. Mattock [Mon, 9 Apr 2012 14:48:57 +0000 (07:48 -0700)]
staging:ramster Fix typos in staging:ramster

The below patch fixes some typos that I found while reading.

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging:omapdrm Fix typos in drivers:omapdrm
Justin P. Mattock [Mon, 2 Apr 2012 14:25:19 +0000 (07:25 -0700)]
staging:omapdrm Fix typos in drivers:omapdrm

The below patch fixes some typos that I found while reading.  Note: I
was told to hold off sending anything until *rc1 so hopefully now its
alright.(wasnt sure what kernel *rc*)

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: Fix typo in multiple files
Masanari Iida [Fri, 6 Apr 2012 14:33:52 +0000 (23:33 +0900)]
staging: Fix typo in multiple files

Collect spelling typo in multiple files within staging directory.

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>