GitHub/MotorolaMobilityLLC/kernel-slsi.git
13 years agostaging:iio:adc:ad7476 allocate state with iio_dev and use iio_priv to access.
Jonathan Cameron [Mon, 27 Jun 2011 12:07:18 +0000 (13:07 +0100)]
staging:iio:adc:ad7476 allocate state with iio_dev and use iio_priv to access.

Reg handling is a little fiddly given the ordering of calls.

All part of getting rid of iio_dev->dev_data

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging:iio:accel:kxsd9: allocate state with iio_dev and use iio_priv to access.
Jonathan Cameron [Mon, 27 Jun 2011 12:17:56 +0000 (13:17 +0100)]
staging:iio:accel:kxsd9: allocate state with iio_dev and use iio_priv to access.

V2: Actually allocate the storage.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging:iio:accel:sca3000: allocate state in iio_dev and use iio_priv to access.
Jonathan Cameron [Mon, 27 Jun 2011 12:07:16 +0000 (13:07 +0100)]
staging:iio:accel:sca3000: allocate state in iio_dev and use iio_priv to access.

Mechanical change.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging:iio:accel:adis16220 allocate tx and rx in state plus state via iio_priv
Jonathan Cameron [Mon, 27 Jun 2011 12:07:15 +0000 (13:07 +0100)]
staging:iio:accel:adis16220 allocate tx and rx in state plus state via iio_priv

Few other misc cleanups.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging:iio:accel:adis16240 allocate tx and rx in state plus state via iio_priv
Jonathan Cameron [Mon, 27 Jun 2011 12:07:14 +0000 (13:07 +0100)]
staging:iio:accel:adis16240 allocate tx and rx in state plus state via iio_priv

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging:iio:accel:adis16209 allocate tx and rx in state plus state via iio_priv
Jonathan Cameron [Mon, 27 Jun 2011 12:07:13 +0000 (13:07 +0100)]
staging:iio:accel:adis16209 allocate tx and rx in state plus state via iio_priv

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging:iio:accel:adis16204 allocate tx and rx in state plus state via iio_priv
Jonathan Cameron [Mon, 27 Jun 2011 12:07:12 +0000 (13:07 +0100)]
staging:iio:accel:adis16204 allocate tx and rx in state plus state via iio_priv

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging:iio:accel:adis16203 move buffers into state and use iio_priv to avoid allocat...
Jonathan Cameron [Mon, 27 Jun 2011 12:07:11 +0000 (13:07 +0100)]
staging:iio:accel:adis16203 move buffers into state and use iio_priv to avoid allocating state separately.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoiio: industrialio-core: iio_write_channel_info accept IIO_VAL_INT_PLUS_NANO
Michael Hennerich [Mon, 27 Jun 2011 12:07:10 +0000 (13:07 +0100)]
iio: industrialio-core: iio_write_channel_info accept IIO_VAL_INT_PLUS_NANO

Allow iio_write_channel_info() to accept IIO_VAL_INT_PLUS_NANO

Changes since V1:
use callback to query expected format/precision

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoiio: trigger: Add filter callback
Michael Hennerich [Mon, 27 Jun 2011 12:07:09 +0000 (13:07 +0100)]
iio: trigger: Add filter callback

Allow devices to reject triggers and vice versa.

Changes since V1:
Added kernel-doc
Moved callback into iio_info
Changed function naming
Revised return value passing
Add forward declaration to avoid warnings

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoiio: trigger: Move declaration of struct iio_poll_func to avoid warnings
Michael Hennerich [Mon, 27 Jun 2011 12:07:08 +0000 (13:07 +0100)]
iio: trigger: Move declaration of struct iio_poll_func to avoid warnings

Move declaration of struct iio_poll_func to avoid warnings

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoiio: industrialio-core: introduce IIO_VAL_INT_PLUS_NANO
Michael Hennerich [Mon, 27 Jun 2011 12:07:07 +0000 (13:07 +0100)]
iio: industrialio-core: introduce IIO_VAL_INT_PLUS_NANO

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: speakup: Use kstrtoul_from_user
Peter Huewe [Mon, 6 Jun 2011 19:32:32 +0000 (21:32 +0200)]
staging: speakup: Use kstrtoul_from_user

This patch replaces the code for getting an unsigned long from a
userspace buffer by a simple call to kstroul_from_user.
This makes it easier to read and less error prone.

Kernel Version: staging of 20110606

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: Winbond: Fix assorted spacing issues.
Akshay Joshi [Tue, 7 Jun 2011 08:51:55 +0000 (04:51 -0400)]
Staging: Winbond: Fix assorted spacing issues.

Fix the phy_calibration.c file's spacing issues and convert the spaces
to tabs. This reduces the number of errors and warnings returned by
checkpatch.pl.

Signed-off-by: Akshay Joshi <me@akshayjoshi.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: et131x: Removing '_t' from ce_stats_t struct
Mark Einon [Mon, 6 Jun 2011 18:07:04 +0000 (19:07 +0100)]
staging: et131x: Removing '_t' from ce_stats_t struct

Removing '_t' from ce_stats_t struct name and renaming et131x_adapter ce_stats member from
 'Stats' to 'stats'

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: et131x: Fixes multiple 'WARNING: do not add new typedefs'.
Mark Einon [Mon, 6 Jun 2011 18:07:03 +0000 (19:07 +0100)]
staging: et131x: Fixes multiple 'WARNING: do not add new typedefs'.

Removes unions, and uses definitions for bit manipulations.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: et131x: et131x_netdev.c checkpatch fixes
Mark Einon [Mon, 6 Jun 2011 18:07:02 +0000 (19:07 +0100)]
staging: et131x: et131x_netdev.c checkpatch fixes

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: et131x: et131x_initpci.c checkpatch fixes
Mark Einon [Mon, 6 Jun 2011 18:07:01 +0000 (19:07 +0100)]
staging: et131x: et131x_initpci.c checkpatch fixes

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: et131x: et131x_adapter.h checkpatch fixes
Mark Einon [Mon, 6 Jun 2011 18:07:00 +0000 (19:07 +0100)]
staging: et131x: et131x_adapter.h checkpatch fixes

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: et131x: et1310_rx.c checkpatch fixes
Mark Einon [Mon, 6 Jun 2011 18:06:59 +0000 (19:06 +0100)]
staging: et131x: et1310_rx.c checkpatch fixes

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: et131x: checkpatch fixes for et1310_address_map.h (All 'do not add new typed...
Mark Einon [Mon, 6 Jun 2011 18:06:58 +0000 (19:06 +0100)]
staging: et131x: checkpatch fixes for et1310_address_map.h (All 'do not add new typedefs')

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: rtl8192e: Fixed numerous coding style issues
Ken O'Brien [Sun, 5 Jun 2011 17:24:33 +0000 (18:24 +0100)]
Staging: rtl8192e: Fixed numerous coding style issues

Fixed all coding style issues thrown by checkpatch.pl.

Signed-off-by: Ken O'Brien <kernel@kenobrien.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: rtl8192e: Fixed numerous coding style issues
Ken O'Brien [Sun, 5 Jun 2011 17:24:32 +0000 (18:24 +0100)]
Staging: rtl8192e: Fixed numerous coding style issues

Coding style review: fixed all warnings, and all but three
typedef errors.

Signed-off-by: Ken O'Brien <kernel@kenobrien.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: wlan-ng: fix brace coding style issue in prism2fw.c
Joseph Salisbury [Sun, 5 Jun 2011 16:28:12 +0000 (17:28 +0100)]
Staging: wlan-ng: fix brace coding style issue in prism2fw.c

This is a patch to the prism2fw.c file that fixes up a brace
warning found by the checkpatch.pl tool.

Signed-off-by: Joseph Salisbury <salisbury.joseph@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: octeon: use printk_ratelimited instead of printk_ratelimit
Christian Dietrich [Sat, 4 Jun 2011 15:35:58 +0000 (17:35 +0200)]
staging: octeon: use printk_ratelimited instead of printk_ratelimit

As per printk_ratelimit comment, it should not be used

Signed-off-by: Christian Dietrich <christian.dietrich@informatik.uni-erlangen.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: tty: epca: fixing return code-style issue
Aviv Ben-Yosef [Sat, 4 Jun 2011 12:09:33 +0000 (05:09 -0700)]
Staging: tty: epca: fixing return code-style issue

Fixed a coding-style issue, ``return'' with parens.

Signed-off-by: Aviv Ben-Yosef <aviv.by@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: msm: Use angle brackets for system includes
Joe Perches [Fri, 3 Jun 2011 09:28:50 +0000 (02:28 -0700)]
staging: msm: Use angle brackets for system includes

Use the normal include style.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agotm6000: Cleaned up code style in tm6000-alsa.c
Curtis McEnroe [Fri, 3 Jun 2011 00:33:34 +0000 (20:33 -0400)]
tm6000: Cleaned up code style in tm6000-alsa.c

Fixed all errors but one (possibly a mistake by the checker) reported by
the checker.

Signed-off-by: Curtis McEnroe <programble@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agotm6000: Clean up code style in tm6000-input.c
Curtis McEnroe [Fri, 3 Jun 2011 00:33:33 +0000 (20:33 -0400)]
tm6000: Clean up code style in tm6000-input.c

Removed unnecessary braces.

Signed-off-by: Curtis McEnroe <programble@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agotm6000: Cleaned up code style in tm6000-i2c.c
Curtis McEnroe [Fri, 3 Jun 2011 00:33:32 +0000 (20:33 -0400)]
tm6000: Cleaned up code style in tm6000-i2c.c

Replaced __FUNCTION__ with __func__

Signed-off-by: Curtis McEnroe <programble@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agotm6000: Cleaned up code style in tm6000-dbv.c
Curtis McEnroe [Fri, 3 Jun 2011 00:33:31 +0000 (20:33 -0400)]
tm6000: Cleaned up code style in tm6000-dbv.c

Replaced usage of __FUNCTION__ with __func__

Signed-off-by: Curtis McEnroe <programble@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agogma500: Fix uninitialized variable and style issues
Andre Bartke [Thu, 16 Jun 2011 16:07:45 +0000 (17:07 +0100)]
gma500: Fix uninitialized variable and style issues

The return variable of psb_gtt_pin() may be used
uninitialized. Also fixed some coding style issues.

Signed-off-by: Andre Bartke <andre.bartke@gmail.com>
[Reapplied by hand due to other changes]
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agogma500: Set the correct bits according to the pipe
Alan Cox [Thu, 16 Jun 2011 16:07:27 +0000 (17:07 +0100)]
gma500: Set the correct bits according to the pipe

Squash a hardcoded assumption we shouldn't really make

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agogma500: Make GTT pages uncached
Alan Cox [Thu, 16 Jun 2011 16:06:31 +0000 (17:06 +0100)]
gma500: Make GTT pages uncached

Clean up the GTT code a bit, make the pages uncached and go via the proper
interfaces. This avoids any aliasing problems.

On the CPU side we need to access the pages via their true addresses not via
the GTT. This is fine for GEM created fb objects for X. For the kernel fb
when not in stolen RAM we are going to need to use vm_map_ram() and hope we
have enough virtual address space to steal.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agogma500: fix warnings
Alan Cox [Thu, 16 Jun 2011 16:06:09 +0000 (17:06 +0100)]
gma500: fix warnings

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: VME: Introduce IOCTL to generate VME interrupts.
Vincent Bossier [Thu, 9 Jun 2011 13:49:30 +0000 (15:49 +0200)]
Staging: VME: Introduce IOCTL to generate VME interrupts.

The vme_irq_set is oblviously not needed (a remnant from old tests) and the
IOCTL exchange types have been updated following Greg's comments.

Allow the IOCTL call to generate VME interrupts when called on the vme/ctl
device with the right arguments.

Signed-off-by: Vincent Bossier <vincent.bossier@gmail.com>
Acked-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: VME: Fix ca91cx42 VME interrupt generation.
Vincent Bossier [Thu, 9 Jun 2011 07:59:43 +0000 (08:59 +0100)]
Staging: VME: Fix ca91cx42 VME interrupt generation.

The wait_event_interruptible call requires a condition as second argument that
needs to be true sometimes, which is obviously not the case with '0'. The new
logic is inspired from the tsi148 driver and takes into account Universe II chip
specifics.

Signed-off-by: Vincent Bossier <vincent.bossier@gmail.com>
Acked-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: VME: Make vme/ctl device available for IOCTL operations only.
Vincent Bossier [Thu, 9 Jun 2011 08:20:31 +0000 (09:20 +0100)]
Staging: VME: Make vme/ctl device available for IOCTL operations only.

Resurrect the vme/ctl device by allowing to open it even if it has no resources
and make related read/write/llseek operations dummy.

Signed-off-by: Vincent Bossier <vincent.bossier@gmail.com>
Acked-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: VME: Fix Universe II int ack logic.
Vincent Bossier [Thu, 2 Jun 2011 10:30:02 +0000 (12:30 +0200)]
Staging: VME: Fix Universe II int ack logic.

The driver must acknowledge the interrupts that have been actually serviced, not
the ones active. The current code could acknowledge an interrupt that has not
been serviced at all.

Signed-off-by: Vincent Bossier <vincent.bossier@gmail.com>
Acked-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging VME: Fix remaining checkpatch.pl errors.
Vincent Bossier [Fri, 3 Jun 2011 09:07:39 +0000 (10:07 +0100)]
Staging VME: Fix remaining checkpatch.pl errors.

This patch solves all the existing issues reported by checkpatch.pl in the VME
sub-system.

Signed-off-by: Vincent Bossier <vincent.bossier@gmail.com>
Acked-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: tm6000: cleaned up code in tm6000-video.c according to coding style
Curtis McEnroe [Thu, 2 Jun 2011 02:21:56 +0000 (22:21 -0400)]
staging: tm6000: cleaned up code in tm6000-video.c according to coding style

Fixed all errors reported by the checker in tm6000-video.c mostly relating
to whitespace.

Signed-off-by: Curtis McEnroe <programble@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: comedi (adv_pci1723): coding style, fix whitespace before quoted newline
Matt Billenstein [Wed, 1 Jun 2011 09:17:06 +0000 (09:17 +0000)]
staging: comedi (adv_pci1723): coding style, fix whitespace before quoted newline

Small fix in adv_pci1723.c for a "whitespace before quoted newline" warning
from checkpatch.pl

Signed-off-by: Matt Billenstein <matt@vazor.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: intel_sst: Fix memory leak
Andre Bartke [Tue, 31 May 2011 19:03:56 +0000 (21:03 +0200)]
staging: intel_sst: Fix memory leak

In case of an error stream_bufs is not freed here.

Signed-off-by: Andre Bartke <andre.bartke@gmail.com>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: altera-stapl: Fix memory leak of altera_init()
Peter Huewe [Mon, 30 May 2011 23:11:17 +0000 (01:11 +0200)]
staging: altera-stapl: Fix memory leak of altera_init()

In case kzalloc() fails the second or third time
we should free the previous allocated resources.
In order to keep one return point and to keep the cleanup code to one
place, some reordering was necessary.

Also while at it, removed the *sizeof(char) - to quote Linus:
"" Also removed the silly "* sizeof(u8)".  If that isn't 1, we have way
   deeper problems than a simple multiplication can fix. """

Reported-by: Andre Bartke <andre.bartke@gmail.com>
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: use videobuf2 framework for drivers/staging/dt3155v4l driver
Marin Mitov [Sat, 28 May 2011 18:45:27 +0000 (21:45 +0300)]
staging: use videobuf2 framework for drivers/staging/dt3155v4l driver

This patch transforms drivers/staging/dt3155v4l driver to use videobuf2 framework.
Tested and works with "xawtv -f".

Either streaming API or read method should be selected during kernel configuration.

If both are selected into the driver (not possible without another patching),
either due to my misunderstanding or problems in xawtv (or both), I get kernel panic
after some start/stop of xawtv (not strictly reproducible).

Signed-off-by: Marin Mitov <mitov@issp.bas.bg>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: synaptics: Implement error handling for rmi4 touch regulator
Naveen Kumar Gaddipati [Mon, 30 May 2011 12:16:50 +0000 (14:16 +0200)]
staging: synaptics: Implement error handling for rmi4 touch regulator

Implement the error handling for regulator in synaptics
rmi4 touch screen

Signed-off-by: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: sep: fix function name in kernel-doc
Jonathan Neuschäfer [Mon, 30 May 2011 18:41:02 +0000 (20:41 +0200)]
staging: sep: fix function name in kernel-doc

Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: sep: clean up some checkpatch.pl issues
Tim Retout [Sun, 29 May 2011 18:38:32 +0000 (19:38 +0100)]
staging: sep: clean up some checkpatch.pl issues

Use consistent spacing in array indexing, and a whitespace fix.

Signed-off-by: Tim Retout <tim@retout.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: Convert vmalloc/memset to vzalloc
Joe Perches [Sat, 28 May 2011 17:36:31 +0000 (10:36 -0700)]
staging: Convert vmalloc/memset to vzalloc

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: tty: fixed some whitespace coding style issues
Ralf Thielow [Fri, 27 May 2011 23:38:18 +0000 (01:38 +0200)]
staging: tty: fixed some whitespace coding style issues

Fixed some whitespace coding style issues.

Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: comedi: fixed a declaration coding style issue
Ralf Thielow [Fri, 27 May 2011 23:37:03 +0000 (01:37 +0200)]
staging: comedi: fixed a declaration coding style issue

Fixed a declaration coding style issue.

Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoRemove unneeded version.h include from drivers/staging/mei/main.c
Jesper Juhl [Thu, 23 Jun 2011 22:54:52 +0000 (00:54 +0200)]
Remove unneeded version.h include from drivers/staging/mei/main.c

It was pointed out by 'make versioncheck' that include of
linux/version.h is not needed in drivers/staging/mei/main.c .
This patch removes it.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: mei: fix possible usage of uninitialized variable
Tomas Winkler [Wed, 15 Jun 2011 21:46:03 +0000 (00:46 +0300)]
staging: mei: fix possible usage of uninitialized variable

Fix warning: reported in http://marc.info/?l=linux-kernel&m=130812960402606&w=2

drivers/staging/mei/interrupt.c: warning: 'buffer' may be used uninitialized in this function:  => 198

It is a real issue and wrong path in execution is taken when
list is empty or (cl && _mei_irq_thread_state_ok(cl, mei_hdr))
evaluates to false

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: mei: io_list functions revamp
Tomas Winkler [Mon, 6 Jun 2011 07:44:34 +0000 (10:44 +0300)]
staging: mei: io_list functions revamp

1. remove list used for loop. There were only 2 loops used in non
   time critical places so we can safely unroll them
2. normalize functions names operating on io_list to mei_io_list_<op>
3. rename mei_fe_same_id to mei_cl_cmp_id  used for comparing list
   elements containing struct mei_cl
4. group together  io_list functions in the header file

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Oren Weil <oren.jer.weil@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: mei: rename num_mei_me_clients to me_clients_num
Tomas Winkler [Mon, 6 Jun 2011 07:44:33 +0000 (10:44 +0300)]
staging: mei: rename num_mei_me_clients to me_clients_num

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Oren Weil <oren.jer.weil@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: mei: mei_dev - kill unused members
Tomas Winkler [Wed, 25 May 2011 14:28:23 +0000 (17:28 +0300)]
staging: mei: mei_dev - kill unused members

remove write only/unsed variables
mei_dev.write_hang and mei_io_lis.tdevice_extension

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Oren Weil <oren.jer.weil@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: mei: mei_dev - use type bool instead of int
Tomas Winkler [Wed, 25 May 2011 14:28:22 +0000 (17:28 +0300)]
staging: mei: mei_dev - use type bool instead of int

use type bool for boolean variables in struct mei_dev
this should save some space providing boolean is 8 bits

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Oren Weil <oren.jer.weil@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: mei: fix mei driver namespace
Tomas Winkler [Wed, 25 May 2011 14:28:21 +0000 (17:28 +0300)]
staging: mei: fix mei driver namespace

All global functions must start with mei_ to reduce the risk of name colisions

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Oren Weil <oren.jer.weil@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: mei: mei_dev.h: don't break lines where not needed.
Tomas Winkler [Wed, 25 May 2011 14:28:20 +0000 (17:28 +0300)]
staging: mei: mei_dev.h: don't break lines where not needed.

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Oren Weil <oren.jer.weil@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoath6kl: Add PMKSA cache management commands
Jouni Malinen [Mon, 27 Jun 2011 15:33:40 +0000 (18:33 +0300)]
ath6kl: Add PMKSA cache management commands

Implement cfg80211_ops set_pmksa, del_pmksa, and flush_pmksa to enable
PMKSA caching support.

kvalo: backported from ath6kl-cleanup tree

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoath6kl: testmode support
Kalle Valo [Mon, 13 Jun 2011 09:08:39 +0000 (12:08 +0300)]
ath6kl: testmode support

Add testmode support for running low level hardware tests. The testmode
is enabled by setting testmode module parameter to 1.

For now only a simple command passing is supported. More advanced
support will be implemented later.

Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoath6kl: export firmware version to user space
Kalle Valo [Mon, 13 Jun 2011 09:08:28 +0000 (12:08 +0300)]
ath6kl: export firmware version to user space

cfg80211 exports wiphy->fw_version to user space via ethtool interface.

The obligatory screenshot:

$ sudo ethtool -i wlan0
driver: ath6kl_hifdev
version: 2.6.39-rc4+
firmware-version: 3:1:1:149
bus-info: mmc0:0001:1
$

Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoRemove unneeded version.h includes from drivers/staging/ath6kl/
Jesper Juhl [Thu, 23 Jun 2011 22:42:09 +0000 (00:42 +0200)]
Remove unneeded version.h includes from drivers/staging/ath6kl/

It was pointed out by 'make versioncheck' that some includes of
linux/version.h are not needed in drivers/staging/ath6kl/.
This patch removes them.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoath6kl: cache firmware
Kalle Valo [Mon, 13 Jun 2011 08:54:18 +0000 (11:54 +0300)]
ath6kl: cache firmware

Drivers should not request firmware during resume. Fix ath6kl to
cache the firmware instead.

Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Cc: stable <stable@kernel.org> [3.0]
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoath6kl: fix crash when interface is closed but scan is ongoing
Kalle Valo [Mon, 13 Jun 2011 08:54:06 +0000 (11:54 +0300)]
ath6kl: fix crash when interface is closed but scan is ongoing

When ath6kl module was resumed while a scan was ongoing, for example during
suspend, the driver would crash in ar6k_cfg80211_scanComplete_event():

[26581.586440] Call Trace:
[26581.586440]  [<f99ffeda>] ? ar6k_cfg80211_scanComplete_event+0xaa/0xaa [ath6kl]
[26581.586440]  [<f9a0a020>] wmi_iterate_nodes+0xb/0xd [ath6kl]
[26581.586440]  [<f99ffe78>] ar6k_cfg80211_scanComplete_event+0x48/0xaa [ath6kl]
[26581.586440]  [<f9a038ae>] ar6000_close+0x77/0x7e [ath6kl]
[26581.586440]  [<c139c25d>] __dev_close_many+0x87/0xab
[26581.586440]  [<c139c30a>] dev_close_many+0x54/0xab
[26581.586440]  [<c139c437>] rollback_registered_many+0xa5/0x19e
[26581.586440]  [<c139c595>] rollback_registered+0x23/0x2f
[26581.586440]  [<c139c5ed>] unregister_netdevice_queue+0x4c/0x69
[26581.586440]  [<c139c6b2>] unregister_netdev+0x18/0x1f
[26581.586440]  [<f9a00d4c>] ar6000_destroy+0xf8/0x115 [ath6kl]
[26581.586440]  [<f9a0c765>] ar6k_cleanup_module+0x20/0x29 [ath6kl]
[26581.586440]  [<c1062843>] sys_delete_module+0x181/0x1d9
[26581.586440]  [<c105876b>] ? lock_release_holdtime+0x2b/0xcd
[26581.586440]  [<c10b55dc>] ? sys_munmap+0x3b/0x42
[26581.586440]  [<c14a99dc>] ? restore_all+0xf/0xf
[26581.586440]  [<c14aeb6c>] sysenter_do_call+0x12/0x32
[26581.586440] Code: 89 53 6c 75 07 89 d8 e8 c0 ff ff ff 89 f0 e8 2c f2 a9 c7 5b 5e 5d c3 55 89 e5 57 56 53 89 c3 83 ec 08 89 55 f0 8d 78 04 89 4d ec <8b> b0 b8 00 00 00 46 89 b0 b8 00 00 00 89 f8 e8 ae ed a9 c7 8b

Fix the function not to iterate nodes when the scan is aborted. The nodes
are already freed when the module is being unloaded. Patch "ath6kl: Fix a
kernel panic furing suspend/resume" tried to fix this already but it wasn't
enough as a pointer was still used even after the null check. This patch
removes the null check entirely as the wmi structure is not accessed anymore
during module unload.

Also fix a bug where the status was checked as a bitfield with '&' operator.
But it's not a bitfield, just a regular (enum like) value.

Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Cc: stable <stable@kernel.org> [3.0]
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: remove unnecessary code
Greg Dietsche [Mon, 13 Jun 2011 18:11:47 +0000 (13:11 -0500)]
staging: remove unnecessary code

Compile tested.
remove unnecessary code that matches this coccinelle pattern
if (...)
return ret;
return ret;

Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu>
Acked-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: change wl_cfg80211_suspend corresponding to cfg80211
Roland Vossen [Thu, 9 Jun 2011 14:45:01 +0000 (16:45 +0200)]
staging: brcm80211: change wl_cfg80211_suspend corresponding to cfg80211

Change wl_cfg80211_suspend in fullmac to meet cfg80211 interface update.

Signed-off-by: Franky Lin <frankyl@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: fix checkpatch errors in brcmsmac driver
Arend van Spriel [Thu, 9 Jun 2011 14:45:00 +0000 (16:45 +0200)]
staging: brcm80211: fix checkpatch errors in brcmsmac driver

Several source files in brcmsmac driver have checkpatch errors that
have been removed (see below).

ERROR: spaces required around that ':' (ctx:VxV)
+           (u8)NPHY_RSSI_SEL_TSSI_5G:(u8)NPHY_RSSI_SEL_TSSI_2G;
--
ERROR: code indent should use tabs where possible
+ ^Ierr = initvars_table(base, vp, vars, count);$
--

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: fix checkpatch errors from main.c
Arend van Spriel [Thu, 9 Jun 2011 14:44:59 +0000 (16:44 +0200)]
staging: brcm80211: fix checkpatch errors from main.c

The softmac source file main.c was passed through checkpatch to see
what issues against coding style are still present. This patch removes
the checkpatch errors listed below.

ERROR: trailing whitespace
+^Imemcpy(wlc->default_bss->rateset.rates, rs.rates, $
--
ERROR: spaces required around that ':' (ctx:VxV)
+       pval = arg ? (int *)arg:NULL;
--

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: remove checkpatch errors found in fullmac
Arend van Spriel [Thu, 9 Jun 2011 14:44:58 +0000 (16:44 +0200)]
staging: brcm80211: remove checkpatch errors found in fullmac

A checkpatch run was done over the complete source files to determine
how much coding style issues there are in the driver. This patch fixes
the checkpatch errors in fullmac driver brcmfmac listed below.

ERROR: do not initialise globals to 0 or NULL
+uint dhd_poll = false;
--
ERROR: do not use assignment in if condition
+       if (!ifp && !(ifp = kmalloc(sizeof(dhd_if_t), GFP_ATOMIC))) {
--
ERROR: do not use assignment in if condition
+       if (unlikely(!(wl_cfg80211_dev &&                               \
--
ERROR: do not initialise statics to 0 or NULL
+       static bool iscan_pass_abort = false;
--

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: replaced wlc_ by brcms_c_, part 2
Roland Vossen [Thu, 9 Jun 2011 14:44:57 +0000 (16:44 +0200)]
staging: brcm80211: replaced wlc_ by brcms_c_, part 2

Code cleanup. Function renaming. Triggered by feedback comment from John
Linville, just like the other function renames that preceded this patch.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: further replaced wlc_ by brcmsmac_c_
Roland Vossen [Thu, 9 Jun 2011 14:44:56 +0000 (16:44 +0200)]
staging: brcm80211: further replaced wlc_ by brcmsmac_c_

Code cleanup. Renamed functions.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: removed superfluous forward struct declarations
Roland Vossen [Thu, 9 Jun 2011 14:44:55 +0000 (16:44 +0200)]
staging: brcm80211: removed superfluous forward struct declarations

Code cleanup.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reported-by: Julian Calaby <julian.calaby@gmail.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: replaced wlc_ by brcms_c_
Roland Vossen [Thu, 9 Jun 2011 14:44:54 +0000 (16:44 +0200)]
staging: brcm80211: replaced wlc_ by brcms_c_

Code cleanup.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: replaced bmac acronym by brcms_b_
Roland Vossen [Thu, 9 Jun 2011 14:44:53 +0000 (16:44 +0200)]
staging: brcm80211: replaced bmac acronym by brcms_b_

Code cleanup.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: Fix for suspend issue in brcmfmac driver
Sukesh Srikakula [Thu, 9 Jun 2011 14:44:51 +0000 (16:44 +0200)]
staging: brcm80211: Fix for suspend issue in brcmfmac driver

Issue with disconnect at the time of suspend is fixed by properly setting
connection status bits maintained by brcmfmac driver.

Signed-off-by: Sukesh Srikakula <sukeshs@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: fixed double #include problem
Roland Vossen [Thu, 9 Jun 2011 14:44:50 +0000 (16:44 +0200)]
staging: brcm80211: fixed double #include problem

Code cleanup. Removed one redundant include and reshuffled #include order as
to include Linux header files first.

Reported-by: julie Sullivan <kernelmail.jms@gmail.com>
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: remove unused fields from struct si_info
Arend van Spriel [Thu, 9 Jun 2011 14:44:49 +0000 (16:44 +0200)]
staging: brcm80211: remove unused fields from struct si_info

Two fields were not used in the driver code so they have been removed
from struct si_info definition.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: remove device id parameter from ai_attach()
Arend van Spriel [Thu, 9 Jun 2011 14:44:48 +0000 (16:44 +0200)]
staging: brcm80211: remove device id parameter from ai_attach()

The device id is passed to ai_attach() and subsequent functions
without actually being used. It can be removed.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: remove d11regs_t parameter from wlc_tbtt function
Arend van Spriel [Thu, 9 Jun 2011 14:44:47 +0000 (16:44 +0200)]
staging: brcm80211: remove d11regs_t parameter from wlc_tbtt function

The function wlc_tbtt() has variable regs as parameter, but it is
not used. Parameter has been removed from the function.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: remove regs variable from brcms_ioctl function
Arend van Spriel [Thu, 9 Jun 2011 14:44:46 +0000 (16:44 +0200)]
staging: brcm80211: remove regs variable from brcms_ioctl function

This variable was declared and initialized but never used so it has
been removed.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: remove 'used' keyword from function ai_ispcie()
Arend van Spriel [Thu, 9 Jun 2011 14:44:45 +0000 (16:44 +0200)]
staging: brcm80211: remove 'used' keyword from function ai_ispcie()

The function ai_ispcie() is a static function that is currently being
called from the c sources in the driver. Side-effect of the keyword
is that warning will suppressed when this function is no longer used.
As there is no assembly code using this function, the keyword is removed.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: Remove flags from wl_is_nonetwork
Franky Lin [Thu, 9 Jun 2011 14:44:44 +0000 (16:44 +0200)]
staging: brcm80211: Remove flags from wl_is_nonetwork

Remove this debug only variable in fullmace driver to avoid compile
warning when BCMDBG is off

Signed-off-by: Franky Lin <frankyl@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: #include reduction
Roland Vossen [Thu, 9 Jun 2011 14:44:43 +0000 (16:44 +0200)]
staging: brcm80211: #include reduction

Code cleanup. Number of includes has been reduced by only including what
is necessary.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: cleaned brcmu_utils.h
Roland Vossen [Thu, 9 Jun 2011 14:44:42 +0000 (16:44 +0200)]
staging: brcm80211: cleaned brcmu_utils.h

Code cleanup. Moved softmac specific definitions into brcmsmac/types.h
Removed unused definitions.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: moved typedefs to decrease header file dependencies
Roland Vossen [Thu, 9 Jun 2011 14:44:41 +0000 (16:44 +0200)]
staging: brcm80211: moved typedefs to decrease header file dependencies

Code cleanup. Moved the typedefs to brcmsmac/types.h for source files that
only require opaque pointer definitions. Next patches will decrease the
number of #includes for each file.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoMerge Linus's tree into staging-next
Greg Kroah-Hartman [Thu, 9 Jun 2011 20:49:02 +0000 (13:49 -0700)]
Merge Linus's tree into staging-next

This was done to resolve the conflicts that were in a number of files
due to changes done upstream with others done in the staging-next
branch.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: brcm80211: disable drivers for PPC platforms
Greg Kroah-Hartman [Thu, 9 Jun 2011 20:16:13 +0000 (13:16 -0700)]
Staging: brcm80211: disable drivers for PPC platforms

Right now, bad things happen if you try to build these drivers for the
PPC platform as it seems that the code only has been tested and built on
the MIPS big endian platform.

So disable it on the PPC32 and PPC64 platforms for now, hopefully this
will be resolved in the future as I'm sure someone will want to use
these chips with that platform someday.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoMerge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
Linus Torvalds [Thu, 9 Jun 2011 20:09:07 +0000 (13:09 -0700)]
Merge branch 'staging-linus' of git://git./linux/kernel/git/gregkh/staging-2.6

* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  staging: iio: max517: Fix iio_info changes
  Staging: mei: fix debug code
  Staging: cx23885: fix include of altera.h
  staging: iio: error case memory leak fix
  staging: ath6kl: Fix a kernel panic during suspend/resume
  staging: gma500: get control from firmware framebuffer if conflicts
  staging: gma500: Skip bogus LVDS VBT mode and check for LVDS before adding backlight
  staging: usbip: bugfix prevent driver unbind
  staging: iio: industrialio-trigger: set iio_poll_func private_data
  staging: rts_pstor: use bitwise operator instead of logical one
  staging: fix ath6kl build when CFG80211 is not enabled
  staging: brcm80211: fix for 'multiple definition of wl_msg_level' build err
  staging: fix olpc_dcon build, needs BACKLIGHT_CLASS_DEVICE
  Staging: remove STAGING_EXCLUDE_BUILD option
  Staging: altera: move .h file to proper place

13 years agoMerge branch 'stable/xen-swiotlb.bugfix' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Thu, 9 Jun 2011 19:52:44 +0000 (12:52 -0700)]
Merge branch 'stable/xen-swiotlb.bugfix' of git://git./linux/kernel/git/konrad/swiotlb-2.6

* 'stable/xen-swiotlb.bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6:
  swiotlb: Export swioltb_nr_tbl and utilize it as appropiate.

13 years agoMerge branch 'stable/broadcom.ibft-bugfixes' of git://git.kernel.org/pub/scm/linux...
Linus Torvalds [Thu, 9 Jun 2011 19:52:30 +0000 (12:52 -0700)]
Merge branch 'stable/broadcom.ibft-bugfixes' of git://git./linux/kernel/git/konrad/ibft-2.6

* 'stable/broadcom.ibft-bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6:
  iscsi_ibft: iscsi_ibft_find unused variable i

13 years agoMerge branch 'unicore32' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux...
Linus Torvalds [Thu, 9 Jun 2011 19:52:05 +0000 (12:52 -0700)]
Merge branch 'unicore32' of git://git./linux/kernel/git/epip/linux-2.6-unicore32

* 'unicore32' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32:
  unicore32: using generic-y format for one line asm-generic files
  unicore32: change PERCPU to PERCPU_SECTION
  unicore32: add KBUILD_DEFCONFIG with unicore32_defconfig (old debug_defconfig)
  unicore32: change zImage physical address, though it's PIC codes
  unicore32: move rtc-puv3.c to drivers/rtc directory

13 years agovsprintf: Update %pI6c to not compress a single 0
Joe Perches [Thu, 9 Jun 2011 18:23:37 +0000 (11:23 -0700)]
vsprintf: Update %pI6c to not compress a single 0

RFC 5952 (http://tools.ietf.org/html/rfc5952) mandates that 2 or more
consecutive 0's are required before using :: compression.

Update ip6_compressed_string to match the RFC and update the http
reference as well.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
13 years agoexec: delay address limit change until point of no return
Mathias Krause [Thu, 9 Jun 2011 18:05:18 +0000 (20:05 +0200)]
exec: delay address limit change until point of no return

Unconditionally changing the address limit to USER_DS and not restoring
it to its old value in the error path is wrong because it prevents us
using kernel memory on repeated calls to this function.  This, in fact,
breaks the fallback of hard coded paths to the init program from being
ever successful if the first candidate fails to load.

With this patch applied switching to USER_DS is delayed until the point
of no return is reached which makes it possible to have a multi-arch
rootfs with one arch specific init binary for each of the (hard coded)
probed paths.

Since the address limit is already set to USER_DS when start_thread()
will be invoked, this redundancy can be safely removed.

Signed-off-by: Mathias Krause <minipli@googlemail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
13 years agoStaging: comedi: add #include <linux/io.h> to a bunch of drivers
Greg Kroah-Hartman [Thu, 9 Jun 2011 19:20:28 +0000 (12:20 -0700)]
Staging: comedi: add #include <linux/io.h> to a bunch of drivers

On some arches the function virt_to_bus() wasn't being pulled in due to
include chains being different.  So, as we are explicitly calling this
function, explicitly include the proper header file so all will build
properly.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: comedi: drivers.c: fix PAGE_KERNEL_NOCACHE issue
Greg Kroah-Hartman [Thu, 9 Jun 2011 19:13:08 +0000 (12:13 -0700)]
Staging: comedi: drivers.c: fix PAGE_KERNEL_NOCACHE issue

Not all arches have PAGE_KERNEL_NOCACHE, so use the "normal" PAGE_KERNEL
on those that do not have it.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: iio: max517: Fix iio_info changes
Roland Stigge [Thu, 9 Jun 2011 14:21:00 +0000 (16:21 +0200)]
staging: iio: max517: Fix iio_info changes

struct iio_info introduced a bug where the second channel of a MAX518 can't be
used. This commit fixes the typo (using max518 instead of the max517 struct).

Signed-off-by: Roland Stigge <stigge@antcom.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: mei: fix debug code
Dan Carpenter [Thu, 9 Jun 2011 07:18:23 +0000 (10:18 +0300)]
Staging: mei: fix debug code

! has higher precedence than !=.  H_RDY is 8 and since neither 0 nor
1 are equal to 8 the original condition was always true.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoiscsi_ibft: iscsi_ibft_find unused variable i
Connor Hansen [Sun, 5 Jun 2011 10:35:09 +0000 (03:35 -0700)]
iscsi_ibft: iscsi_ibft_find unused variable i

int i is only needed if CONFIG_ACPI is set
so move it within a new ifdef so kernels without ACPI
don't allocate space for nothing. Fixes warning too.

Signed-off-by: Connor Hansen <cmdkhh@gmail.com>
Signed-off-by: Peter Jones <pjones@redhat.com>
[v2: Fixed warning when CONFIG_ACPI was defined]
Signed-off-by: Konrad Rzeszutek Wilk <konrad@kernel.org>
13 years agounicore32: using generic-y format for one line asm-generic files
Guan Xuetao [Thu, 26 May 2011 10:17:43 +0000 (18:17 +0800)]
unicore32: using generic-y format for one line asm-generic files

The patch adds one-line asm-generic files in arch/unicore32/include/asm/Kbuild
Also, remove the old implementation in arch/unicore32/Makefile
see commit from Sam Ravnborg <d8ecc5cd8e227bc318513b5306ae88a474b8886d>
  kbuild: asm-generic support

Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
Acked-by: Arnd Bergmann <arnd@arndb.de>