cascardo/linux.git
13 years agostaging: ft1000: Remove unused declaration in ft1000_usb.h.
Marek Belisko [Fri, 29 Apr 2011 05:41:05 +0000 (07:41 +0200)]
staging: ft1000: Remove unused declaration in ft1000_usb.h.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoIIO: GYRO: ADXRS450: Don't exit probe, in case the power on default is not met.
Michael Hennerich [Fri, 29 Apr 2011 12:17:04 +0000 (14:17 +0200)]
IIO: GYRO: ADXRS450: Don't exit probe, in case the power on default is not met.

If the part get's probed twice without hard reset in between, the power on default
register read-back can't be met. This shouldn't cause the second probe to fail.
So warn but don't exit.

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: GYRO: ADXRS450: Fix sign issues, properly shift results and limit values
Michael Hennerich [Fri, 29 Apr 2011 12:17:03 +0000 (14:17 +0200)]
IIO: GYRO: ADXRS450: Fix sign issues, properly shift results and limit values

RATE and QUADRATURE_CORRECTION data is formatted as a twos complement number,
and therefore must be handled as type signed short.

TEMP result should be properly shifted.

Dynamic Null Correction is a 10-bit signed number.

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: GYRO: ADXRS450: enforce sequential transfer delay of at least 0.1ms
Michael Hennerich [Fri, 29 Apr 2011 12:17:02 +0000 (14:17 +0200)]
IIO: GYRO: ADXRS450: enforce sequential transfer delay of at least 0.1ms

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: GYRO: ADXRS450: Add missing parity bit generation
Michael Hennerich [Fri, 29 Apr 2011 12:17:01 +0000 (14:17 +0200)]
IIO: GYRO: ADXRS450: Add missing parity bit generation

Add missing parity bit generation. Failure to add the parity bit
caused half of the register accesses to fail.

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: GYRO: ADXRS450: Cleanup result extraction and update license notice
Michael Hennerich [Fri, 29 Apr 2011 12:17:00 +0000 (14:17 +0200)]
IIO: GYRO: ADXRS450: Cleanup result extraction and update license notice

Cleanup result extraction and update license notice, no functional changes.

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: GYRO: ADXRS450: Don't issue two messages, use two transfers
Michael Hennerich [Fri, 29 Apr 2011 12:16:59 +0000 (14:16 +0200)]
IIO: GYRO: ADXRS450: Don't issue two messages, use two transfers

Don't issue the same message twice, use two transfers and group them together

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: DDS: AD9834: Add support for AD9837 and AD9838 DDS devices
Michael Hennerich [Wed, 27 Apr 2011 15:22:36 +0000 (17:22 +0200)]
IIO: DDS: AD9834: Add support for AD9837 and AD9838 DDS devices

Add support for AD9837 and AD9838 DDS devices
Update copyright and license notice
Fix typo

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: DAC: AD5791: Add support for the AD5760/AD5780 High Resolution DACs
Michael Hennerich [Wed, 27 Apr 2011 15:13:58 +0000 (17:13 +0200)]
IIO: DAC: AD5791: Add support for the AD5760/AD5780 High Resolution DACs

Add support for the AD5760/AD5780 High Resolution Voltage Output DACs

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: r8712u: Fix driver to support ad-hoc mode
Jeff Chua [Wed, 27 Apr 2011 16:25:14 +0000 (11:25 -0500)]
staging: r8712u: Fix driver to support ad-hoc mode

Driver r8712u is unable to handle ad-hoc mode. The issue is that when
the driver first starts, there will not be an SSID for association.
The fix is to always call the "select and join from scan" routine when
in ad-hoc mode.

Note: Ad-hoc mode worked intermittently before. If the driver had
previously been associated, then things were OK.

Signed-off-by: Jeff Chua <jeff.chua.linux@gmail.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: hv: Get rid of the priv pointer in struct hv_driver
K. Y. Srinivasan [Tue, 26 Apr 2011 16:20:27 +0000 (09:20 -0700)]
Staging: hv: Get rid of the priv pointer in struct hv_driver

Now that we have gotten rid of all uses of the priv element in
struct hv_driver, get rid of the priv pointer.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: hv: Cleanup vmbus_match()
K. Y. Srinivasan [Tue, 26 Apr 2011 16:20:24 +0000 (09:20 -0700)]
Staging: hv: Cleanup vmbus_match()

In preparation for getting rid of the priv element from struct hv_driver,
cleanup vmbus_match - the setting of the drv field in struct hv_device
is not needed.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: hv: Get rid of the references to the priv element of struct hv_driver in...
K. Y. Srinivasan [Tue, 26 Apr 2011 16:20:23 +0000 (09:20 -0700)]
Staging: hv: Get rid of the references to the priv element of struct hv_driver in storvsc_drv.c

In preparation for getting rid of the priv element from struct hv_driver,
get rid of the references to the priv element of struct
hv_driver in storvsc_drv.c.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: hv: Get rid of the references to the priv element of struct hv_driver in...
K. Y. Srinivasan [Tue, 26 Apr 2011 16:20:22 +0000 (09:20 -0700)]
Staging: hv: Get rid of the references to the priv element of struct hv_driver in net driver

In preparation for getting rid of the priv element from struct hv_driver,
get rid of the references to the priv element of struct
hv_driver in network driver.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: hv: Introduce a function to map a generic driver pointer to a pointer to...
K. Y. Srinivasan [Tue, 26 Apr 2011 16:20:21 +0000 (09:20 -0700)]
Staging: hv: Introduce a function to map a generic driver pointer to a pointer to struct netvsc_driver

In preparation for getting rid of the priv element from struct hv_driver,
introduce a function to map a generic driver pointer to a pointer to
struct netvsc_driver.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: hv: Get rid of the references to the priv element of struct hv_driver in...
K. Y. Srinivasan [Tue, 26 Apr 2011 16:20:20 +0000 (09:20 -0700)]
Staging: hv: Get rid of the references to the priv element of struct hv_driver in hv_mouse.c

In preparation for getting rid of the priv element from struct hv_driver,
get rid of the references to the priv element of struct hv_driver
in hv_mouse.c

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: hv: Get rid of the references to the priv element of struct hv_driver in...
K. Y. Srinivasan [Tue, 26 Apr 2011 16:20:19 +0000 (09:20 -0700)]
Staging: hv: Get rid of the references to the priv element of struct hv_driver in block driver

In preparation for getting rid of the priv element from struct hv_driver,
get rid of the references to the priv element of struct hv_driver
in blkvsc_drv.c and storvsc.c

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: hv: Introduce a function to map a generic driver pointer to a pointer to...
K. Y. Srinivasan [Tue, 26 Apr 2011 16:20:18 +0000 (09:20 -0700)]
Staging: hv: Introduce a function to map a generic driver pointer to a pointer to storvsc_driver_object

In preparation for getting rid of the priv element from struct hv_driver,
introduce a function that maps a generic struct driver pointer to struct
storvsc_driver_object.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: xgifb: Fixed style issues.
Kenji Toyama [Tue, 26 Apr 2011 04:13:43 +0000 (12:13 +0800)]
Staging: xgifb: Fixed style issues.

Not all warnings/errors were silenced, some of them are related to
simple printk() messages that imho should not be split across multiple
lines (it makes it harder to grep for example), and some of them are
related to long lines that are pretty much impossible to split without
proper code refactoring.

Resubmitting this patch because of conflicts.

Signed-off-by: Daniel Kenji Toyama <kenji.toyama@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: xgifb: Fixed style issues.
Kenji Toyama [Tue, 26 Apr 2011 04:12:39 +0000 (12:12 +0800)]
Staging: xgifb: Fixed style issues.

Now there's only 10 errors and 1 warning given by checkpatch.pl, and
these are related initialization of statics. The only warning left can
be safely ignored I believe.

I'm resending this patch as the previous one was conflicting with the
newer version updated by Aaro Koskinen.

Signed-off-by: Daniel Kenji Toyama <kenji.toyama@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: Remove si sb utils from brcmfmac
Franky Lin [Tue, 26 Apr 2011 02:34:08 +0000 (19:34 -0700)]
staging: brcm80211: Remove si sb utils from brcmfmac

si/sb utility is removed from Broadcom fullmac driver.
All unused files are removed.

Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: Remove siutils dependence from dhd_sdio.c
Franky Lin [Tue, 26 Apr 2011 02:34:07 +0000 (19:34 -0700)]
staging: brcm80211: Remove siutils dependence from dhd_sdio.c

Remove siutils related functions and resources from dhd_sdio.c

Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: Add dhdsdio_chip_detach in dhd_sdio.c
Franky Lin [Tue, 26 Apr 2011 02:34:06 +0000 (19:34 -0700)]
staging: brcm80211: Add dhdsdio_chip_detach in dhd_sdio.c

Add dhdsdio_chip_detach to replace si_detach for si/sb utils removal

Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: Move sdiod strength init to dhd_sdio.c
Franky Lin [Tue, 26 Apr 2011 02:34:05 +0000 (19:34 -0700)]
staging: brcm80211: Move sdiod strength init to dhd_sdio.c

Move si_sdiod_drive_strength_init to dhd_sdio and rename to
dhdsdio_sdiod_drive_strength_init for dhd_pmu.c removal

Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: Remove siutils dependency of dhdsdio_download_state
Franky Lin [Tue, 26 Apr 2011 02:34:04 +0000 (19:34 -0700)]
staging: brcm80211: Remove siutils dependency of dhdsdio_download_state

Use dhdsdio_chip_disablecore and dhd_sdio_chip_resetcore to replace
siutils functions used in dhdsdio_download_state

Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: xgifb: Fixed styles issues.
Kenji Toyama [Sun, 24 Apr 2011 05:55:49 +0000 (13:55 +0800)]
Staging: xgifb: Fixed styles issues.

All the warnings about styles have been removed.

Signed-off-by: Daniel Kenji Toyama <kenji.toyama@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: xgifb: Fixed style issues.
Kenji Toyama [Sun, 24 Apr 2011 05:46:25 +0000 (13:46 +0800)]
Staging: xgifb: Fixed style issues.

Now checkpatch.pl doesn't complain about vgatypes.h.

Signed-off-by: Daniel Kenji Toyama <kenji.toyama@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: xgifb: Fixed header file.
Kenji Toyama [Sun, 24 Apr 2011 05:35:35 +0000 (13:35 +0800)]
Staging: xgifb: Fixed header file.

As suggested by checkpatch.pl, <linux/io.h> should be used instead of
<asm/io.h>.

Signed-off-by: Daniel Kenji Toyama <kenji.toyama@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: xgifb: Removed thousands of warnings.
Kenji Toyama [Sun, 24 Apr 2011 03:37:17 +0000 (11:37 +0800)]
Staging: xgifb: Removed thousands of warnings.

This is a big patch to remove all the warnings given by checkpatch.pl.
There were 13348 errors and  3112 warnings, but now there's nothing.
I've compiled the files dependent on this header and they seem alright.

Signed-off-by: Daniel Kenji Toyama <kenji.toyama@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: xgifb: Fixed almost all style warnings.
Kenji Toyama [Sat, 23 Apr 2011 13:54:07 +0000 (21:54 +0800)]
Staging: xgifb: Fixed almost all style warnings.

I've removed all the warnings except one that I believe is a false
positive. The original author has used a macro to #define EXTERN to be
'extern', so in this case 'extern' is not used to define the storage
class of anything, but just the value of the macro. We can safely ignore
this warning.

Signed-off-by: Daniel Kenji Toyama <kenji.toyama@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: xgifb: Fixed lots of coding style issues.
Kenji Toyama [Sat, 23 Apr 2011 11:36:49 +0000 (19:36 +0800)]
Staging: xgifb: Fixed lots of coding style issues.

There were hundreds of warnings and errors given by checkpatch.pl but
now it's down to 20. These ones that were left in the code need some
more attention, cause I reckon the functions are overly nested leading
to a mess of code in a traditional 80 character screen. I'm sure this code
can be refactored into something more visually pleasing (things like
compressing two nested if's into a single if with an AND would help a
lot already).

Signed-off-by: Daniel Kenji Toyama <kenji.toyama@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: xgifb: Fixed coding style issues in vb_setmode.h
Kenji Toyama [Sat, 23 Apr 2011 08:14:34 +0000 (16:14 +0800)]
Staging: xgifb: Fixed coding style issues in vb_setmode.h

All the warnings in vb_setmode.h given by checkpatch.pl were removed.

Signed-off-by: Daniel Kenji Toyama <kenji.toyama@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: xgifb: Fixed lots of coding style issues.
Kenji Toyama [Sat, 23 Apr 2011 04:11:16 +0000 (12:11 +0800)]
Staging: xgifb: Fixed lots of coding style issues.

There were hundreds of warnings, but now there's only four. These are
related to the 'volatile' keyword and printk(), which I think should be
left to the maintainers to modify if deemed necessary.

Signed-off-by: Daniel Kenji Toyama <kenji.toyama@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: xgifb: Fixed coding style issues.
Kenji Toyama [Sat, 23 Apr 2011 00:27:48 +0000 (08:27 +0800)]
Staging: xgifb: Fixed coding style issues.

Not all warnings were silenced. One of them is a typedef in vb_ext.h
which I think seems alright.
The other warnings in vb_ext.c I left there because that would involve
changing a bit of the logic in the code. IMHO though I think the
functions are too complicated (i.e. the if/else are too deep within a
big function.) and can probably be split.

Signed-off-by: Daniel Kenji Toyama <kenji.toyama@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoStaging: xgifb: Fixed coding style issues in vb_def.h
Kenji Toyama [Fri, 22 Apr 2011 23:02:49 +0000 (07:02 +0800)]
Staging: xgifb: Fixed coding style issues in vb_def.h

I've removed all the warnings given by checkpatch.pl in vb_def.h and
also changed the indentation of pretty much the entire file so that it
is more consistent.

Signed-off-by: Daniel Kenji Toyama <kenji.toyama@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: xgifb: main: make internal functions static
Aaro Koskinen [Mon, 18 Apr 2011 19:14:08 +0000 (22:14 +0300)]
staging: xgifb: main: make internal functions static

Make remaining non-static internal functions static.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: xgifb: main: delete unused functions
Aaro Koskinen [Mon, 18 Apr 2011 19:14:07 +0000 (22:14 +0300)]
staging: xgifb: main: delete unused functions

Delete unused/dead code.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: xgifb: main: delete redudant extern declarations
Aaro Koskinen [Mon, 18 Apr 2011 19:14:06 +0000 (22:14 +0300)]
staging: xgifb: main: delete redudant extern declarations

Delete redudant declarations and include proper .h files.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: xgifb: main: move functions to avoid forward declarations
Aaro Koskinen [Mon, 18 Apr 2011 19:14:05 +0000 (22:14 +0300)]
staging: xgifb: main: move functions to avoid forward declarations

Move functions so that all forward declarations of internal functions
can be deleted.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: xgifb: delete unused register I/O functions
Aaro Koskinen [Mon, 18 Apr 2011 19:14:04 +0000 (22:14 +0300)]
staging: xgifb: delete unused register I/O functions

Delete unused register I/O functions.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: xgifb: delete unused register I/O macros
Aaro Koskinen [Mon, 18 Apr 2011 19:14:03 +0000 (22:14 +0300)]
staging: xgifb: delete unused register I/O macros

Delete unused register I/O macros.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: xgifb: replace setXGIIDXREG() with xgifb_reg_and_or()
Aaro Koskinen [Mon, 18 Apr 2011 19:14:02 +0000 (22:14 +0300)]
staging: xgifb: replace setXGIIDXREG() with xgifb_reg_and_or()

Replace setXGIIDXREG() with xgifb_reg_and_or().

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: xgifb: replace andXGIIDXREG() with xgifb_reg_and()
Aaro Koskinen [Mon, 18 Apr 2011 19:14:01 +0000 (22:14 +0300)]
staging: xgifb: replace andXGIIDXREG() with xgifb_reg_and()

Replace andXGIIDXREG() with xgifb_reg_and().

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: xgifb: replace orXGIIDXREG() with xgifb_reg_or()
Aaro Koskinen [Mon, 18 Apr 2011 19:14:00 +0000 (22:14 +0300)]
staging: xgifb: replace orXGIIDXREG() with xgifb_reg_or()

Replace orXGIIDXREG() with xgifb_reg_or().

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: xgifb: replace outXGIIDXREG() with xgifb_reg_set()
Aaro Koskinen [Mon, 18 Apr 2011 19:13:59 +0000 (22:13 +0300)]
staging: xgifb: replace outXGIIDXREG() with xgifb_reg_set()

Replace outXGIIDXREG() with xgifb_reg_set().

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: xgifb: replace inXGIIDXREG() with xgifb_reg_get()
Aaro Koskinen [Mon, 18 Apr 2011 19:13:58 +0000 (22:13 +0300)]
staging: xgifb: replace inXGIIDXREG() with xgifb_reg_get()

Replace inXGIIDXREG() with xgifb_reg_get().

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: xgifb: replace outXGIREG() with outb()
Aaro Koskinen [Mon, 18 Apr 2011 19:13:57 +0000 (22:13 +0300)]
staging: xgifb: replace outXGIREG() with outb()

Replace outXGIREG() with outb().

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: rts_pstor: clear error when read sd lba0 fail
wwang [Wed, 20 Apr 2011 07:14:05 +0000 (15:14 +0800)]
staging: rts_pstor: clear error when read sd lba0 fail

Call rtsx_clear_sd_error if sd_read_data fail when reading sd lba0.

Signed-off-by: wwang <wei_wang@realsil.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: octeon-ethernet: remove .get_sg, etc. ethtool_ops
Michał Mirosław [Wed, 20 Apr 2011 16:27:09 +0000 (18:27 +0200)]
staging: octeon-ethernet: remove .get_sg, etc. ethtool_ops

Driver sets .get_sg and .get_tx_csum ethtool_ops to their default
values anyway. Those fields are deprecated, starting in 2.6.39.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging:iio:ade7758 replace unnecessary event line registration.
Jonathan Cameron [Mon, 18 Apr 2011 11:59:06 +0000 (12:59 +0100)]
staging:iio:ade7758 replace unnecessary event line registration.

This was only used for triggering and hence should never have been
done this way in the first place.  Needs to go prior to cleaning
out some of the registration functions.

Untested but identical in form to those that have been.

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:adis16209 replace unnecessary event line registration.
Jonathan Cameron [Mon, 18 Apr 2011 11:59:05 +0000 (12:59 +0100)]
staging:iio:adis16209 replace unnecessary event line registration.

Untested but identical in form to those that have been.

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:adis16240 replace unnecessary event line registration.
Jonathan Cameron [Mon, 18 Apr 2011 11:59:04 +0000 (12:59 +0100)]
staging:iio:adis16240 replace unnecessary event line registration.

Untested but identical in form to those that have been.

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:adis16201 replace unnecessary event line registration.
Jonathan Cameron [Mon, 18 Apr 2011 11:59:03 +0000 (12:59 +0100)]
staging:iio:adis16201 replace unnecessary event line registration.

Untested but identical in form to those that have been.

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:adis16204 replace unnecessary event line registration.
Jonathan Cameron [Mon, 18 Apr 2011 11:59:02 +0000 (12:59 +0100)]
staging:iio:adis16204 replace unnecessary event line registration.

Whilst the adis16204 does indeed support events, currently the driver
does not.  The trigger code should never use that infrastructure.

Untested but identical in form to those that have been.

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:adis16203 replace unnecessary event line registration.
Jonathan Cameron [Mon, 18 Apr 2011 11:59:01 +0000 (12:59 +0100)]
staging:iio:adis16203 replace unnecessary event line registration.

Whilst the adis16203 does indeed support events, currently the driver
does not.  The trigger code should never use that infrastructure.

Untested, but identical in form to those that have been so should be fine.

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:adis16260 replace unnecessary event line registration.
Jonathan Cameron [Mon, 18 Apr 2011 11:59:00 +0000 (12:59 +0100)]
staging:iio:adis16260 replace unnecessary event line registration.

Whilst the adis16260 does indeed support events, currently the driver
does not.  The trigger code should never use that infrastructure.

Untested - but identical in form to those that have been.

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:adis16400 replace unnecessary event line registration.
Jonathan Cameron [Mon, 18 Apr 2011 11:58:59 +0000 (12:58 +0100)]
staging:iio:adis16400 replace unnecessary event line registration.

Whilst the adis16400 does indeed support events, currently the driver
does not.  The trigger code should never use that infrastructure.

Tested indirectly via the IMU driver merge to follow.

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:adis16350 replace unnecessary event line registration.
Jonathan Cameron [Mon, 18 Apr 2011 11:58:58 +0000 (12:58 +0100)]
staging:iio:adis16350 replace unnecessary event line registration.

Whilst the adis163500 does indeed support events, currently the driver
does not.  The trigger code should never use that infrastructure.

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:adis16300 replace unnecessary event line registration.
Jonathan Cameron [Mon, 18 Apr 2011 11:58:57 +0000 (12:58 +0100)]
staging:iio:adis16300 replace unnecessary event line registration.

Whilst the adis16300 does indeed support events, currently the driver
does not.  The trigger code should never use that infrastructure.

Tested indirectly via the IMU driver merge to follow.

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:light:tsl2563 constify gain level table.
Jonathan Cameron [Mon, 18 Apr 2011 11:58:56 +0000 (12:58 +0100)]
staging:iio:light:tsl2563 constify gain level table.

Trivial cleanup.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging:iio:tsl2563 take advantage of new iio_device_allocate private data.
Jonathan Cameron [Mon, 18 Apr 2011 11:58:55 +0000 (12:58 +0100)]
staging:iio:tsl2563 take advantage of new iio_device_allocate private data.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging:iio:documentation make read_size signed to allow for errors.
Jonathan Cameron [Fri, 15 Apr 2011 17:56:00 +0000 (18:56 +0100)]
staging:iio:documentation make read_size signed to allow for errors.

Without this all hell breaks loose if you have no data.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging:iio:max1363 take advantage of new iio_device_allocate private data.
Jonathan Cameron [Fri, 15 Apr 2011 17:55:59 +0000 (18:55 +0100)]
staging:iio:max1363 take advantage of new iio_device_allocate private data.

The only fiddly bit in here was ensuring the regulator was available until after
the free had occured.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging:iio:adc: max1363 dev_info -> indio_dev in naming for consistency
Jonathan Cameron [Fri, 15 Apr 2011 17:55:58 +0000 (18:55 +0100)]
staging:iio:adc: max1363 dev_info -> indio_dev in naming for consistency

Either name is fine, so went with the most common.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging:iio:adc:max1363 fix timestamp handling.
Jonathan Cameron [Fri, 15 Apr 2011 17:55:57 +0000 (18:55 +0100)]
staging:iio:adc:max1363 fix timestamp handling.

Not only was this not compliant with the abi, it was also missconfiguring
the buffer.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging:iio: Add ability to allocate private data space to iio_allocate_device
Jonathan Cameron [Fri, 15 Apr 2011 17:55:56 +0000 (18:55 +0100)]
staging:iio: Add ability to allocate private data space to iio_allocate_device

Suggested by Arnd Bergmann.  Note this will break ALL drivers that
are out of mainline.  The fix is trivial change of
iio_allocate_device() -> iio_allocate_device(0)
Sorry if this causes issues for any one!

V2: Include new drivers in the update

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging:iio: replace rip_lots naming with read_first_n
Jonathan Cameron [Fri, 15 Apr 2011 17:55:55 +0000 (18:55 +0100)]
staging:iio: replace rip_lots naming with read_first_n

Change suggested by Arnd Bergmann, Related patch to remove
pointless (now) dead_offset parameter will have await
proper fix for the sca3000 driver.  That depends on
some intermediate patches so may be a little while.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging:iio: iio_trigger_unregister - remove rather strange search for what we alread...
Jonathan Cameron [Fri, 15 Apr 2011 17:55:54 +0000 (18:55 +0100)]
staging:iio: iio_trigger_unregister - remove rather strange search for what we already have.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging:iio:trigger remove export of iio_trigger_find_by_name, use sysfs_streq for...
Jonathan Cameron [Fri, 15 Apr 2011 17:55:53 +0000 (18:55 +0100)]
staging:iio:trigger remove export of iio_trigger_find_by_name, use sysfs_streq for matching

Trivial reorganization.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: IIO: DAC: AD5446 add support for AD5541A devices
Michael Hennerich [Fri, 15 Apr 2011 11:51:07 +0000 (13:51 +0200)]
staging: IIO: DAC: AD5446 add support for AD5541A devices

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: iio: TAOS tsl258x: Device driver
Jon Brenner [Fri, 15 Apr 2011 17:38:43 +0000 (18:38 +0100)]
staging: iio: TAOS tsl258x: Device driver

Added suspend/resume functions.
Changed attribute names to match existing where applicable and updated
or documented new ABI as discussed.
Changed integration time ABI from using index (0 to 3) to use actual
gain values (1x,8x, etc.).
Removed various unused variables, declarations, and functions.
Revised code to accommodate different endianess (le16_to_cpu).
Updated error return codes in various functions.
Changed from mdelay to msleep after determining that longer wait would
be acceptable.

V5: Makefile and Kconfig cleanups by Jonathan Cameron.

Signed-off-by: Jon August Brenner <jbrenner@taosinc.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: IIO: DAC: New driver for AD5791/AD5781 High Resolution Voltage Output DACs
Michael Hennerich [Mon, 18 Apr 2011 07:40:58 +0000 (09:40 +0200)]
staging: IIO: DAC: New driver for AD5791/AD5781 High Resolution Voltage Output DACs

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 agogma500: allow non stolen page backed framebuffer
Alan Cox [Tue, 19 Apr 2011 14:28:45 +0000 (15:28 +0100)]
gma500: allow non stolen page backed framebuffer

For Moorestown at least we may not have stolen RAM with which to back the
initial framebuffer. Allow a GEM backing.

At this point we should have all the bits in place needed to make it work once
it has been debugged.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agogma500: prune some unused variables
Alan Cox [Tue, 19 Apr 2011 14:28:32 +0000 (15:28 +0100)]
gma500: prune some unused variables

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agogma500: GEM - now we have the basics we shall stick pins in it
Alan Cox [Tue, 19 Apr 2011 14:28:21 +0000 (15:28 +0100)]
gma500: GEM - now we have the basics we shall stick pins in it

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agogma500: GEMify the frame buffer base bits
Alan Cox [Tue, 19 Apr 2011 14:28:03 +0000 (15:28 +0100)]
gma500: GEMify the frame buffer base bits

This then kills off the old bo_ interfaces

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agogma500: Begin the GEMification of the cursor code
Alan Cox [Tue, 19 Apr 2011 14:27:53 +0000 (15:27 +0100)]
gma500: Begin the GEMification of the cursor code

Do a first pass over the cursor code and rework it to use GEM objects for
the cursor buffer as we need.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agogma500: Add support for inserting and removing pages from the GART
Alan Cox [Tue, 19 Apr 2011 14:27:43 +0000 (15:27 +0100)]
gma500: Add support for inserting and removing pages from the GART

There are two chunks of code we need to do this. The first one is the code
to insert and remove the pages from the GART, the second is the code to build
page table lists from the GEM object. Surprisingly this latter one doesn't seem
to have a nice GEM helper.

While we are at it we can begin dismantling the semi redundant struct pg,
and finish pruning out the old now unused gtt code as well as the last bits
of helper glue from the old driver base.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agogma500: begin adding GEM
Alan Cox [Tue, 19 Apr 2011 14:27:28 +0000 (15:27 +0100)]
gma500: begin adding GEM

This puts in place the infrastructure for GEM allocators. Our implementation
is fairly simplistic at this point and we don't deal with things like
evicting objects from the GART to make space, nor compaction.

We extent our gtt_range struct to include a GEM object and that allows GEM
to do all the handle management and most of the memory mapping work for us.

This patch also doesn't load GEM pages into the GART so the GEM side isn't
very useful. Before we can do that a fair bit of work is needed reworking the
internal GTT code.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agogma500: add the ability to request backed space or not
Alan Cox [Tue, 19 Apr 2011 14:27:10 +0000 (15:27 +0100)]
gma500: add the ability to request backed space or not

We will will need this for doing a GEM allocator. It should also avoid any
crashes with the current code if the stolen area is too small.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agogma500: Tidy up the allocations
Alan Cox [Wed, 13 Apr 2011 09:37:24 +0000 (10:37 +0100)]
gma500: Tidy up the allocations

Now we can do allocations we need to shuffle the fb resource into the fb so
we can one day have multiple frame buffer objects.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agogma500: Add a gtt allocator
Alan Cox [Wed, 13 Apr 2011 09:37:03 +0000 (10:37 +0100)]
gma500: Add a gtt allocator

At the moment we don't do any page backing for the GTT so only the stolen
area pages will actually work. That is fine for our initial framebuffer and
a bit of testing but will need resolution (including alternate mmap methods
and the like for s/g areas) eventually.

Rather than use some of the overcomplex stuff in the DRM we use the existing
Linux resource allocators to hand out framebuffers and the like. This also has
the nice result that /proc/iomem shows the allocations.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agogma500: backlight warning
Alan Cox [Wed, 13 Apr 2011 09:36:19 +0000 (10:36 +0100)]
gma500: backlight warning

The current bl code checks for backlight types and warns if they are not
properly set. Set ours to avoid the warning spew

(This one alone is probably 2.6.39 candidate)

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agogma500: prepare to do some actual memory management
Alan Cox [Wed, 13 Apr 2011 09:35:50 +0000 (10:35 +0100)]
gma500: prepare to do some actual memory management

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agogma500: ioctl first pass
Alan Cox [Wed, 13 Apr 2011 09:35:39 +0000 (10:35 +0100)]
gma500: ioctl first pass

Go through the remaining ioctls and check they make sense

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: comedi: fix a typo
Weiping Pan(潘卫平) [Mon, 11 Apr 2011 10:15:31 +0000 (18:15 +0800)]
staging: comedi: fix a typo

replace tranmitted with transmitted.

Signed-off-by: Weiping Pan(潘卫平) <panweiping3@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: olpc_dcon: fix space and coding issues
Stefan Brähler [Tue, 12 Apr 2011 17:53:31 +0000 (19:53 +0200)]
staging: olpc_dcon: fix space and coding issues

Fix the whitespace and coding style issues in olpc_dcon metioned by
checkpatch.

Signed-off-by: Stefan Brähler <Stefan.Braehler@gmail.com>
Acked-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: sep: resolve issue with false zero length of page
Mark Allyn [Mon, 11 Apr 2011 00:03:28 +0000 (17:03 -0700)]
staging: sep: resolve issue with false zero length of page

Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: Remove unnecessary semicolons when switch (foo) {...};
Joe Perches [Sun, 10 Apr 2011 21:31:35 +0000 (14:31 -0700)]
staging: Remove unnecessary semicolons when switch (foo) {...};

Done via perl script:

$ cat remove_semi_switch.pl
my $match_balanced_parentheses = qr/(\((?:[^\(\)]++|(?-1))*\))/;
my $match_balanced_braces      = qr/(\{(?:[^\{\}]++|(?-1))*\})/;

foreach my $file (@ARGV) {
    my $f;
    my $text;
    my $oldtext;

    next if ((-d $file));

    open($f, '<', $file)
or die "$P: Can't open $file for read\n";
    $oldtext = do { local($/) ; <$f> };
    close($f);

    next if ($oldtext eq "");

    $text = $oldtext;

    my $count = 0;
    do {
$count = 0;
$count += $text =~ s@\b(switch\s*${match_balanced_parentheses}\s*)${match_balanced_braces}\s*;@"$1$3"@egx;
    } while ($count > 0);

    if ($text ne $oldtext) {
my $newfile = $file;

open($f, '>', $newfile)
    or die "$P: Can't open $newfile for write\n";
print $f $text;
close($f);
    }
}

$

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: Remove unnecessary semicolons when for (foo) {...};
Joe Perches [Sun, 10 Apr 2011 21:31:34 +0000 (14:31 -0700)]
staging: Remove unnecessary semicolons when for (foo) {...};

Done via perl script:

$ cat remove_semi_for.pl
my $match_balanced_parentheses = qr/(\((?:[^\(\)]++|(?-1))*\))/;
my $match_balanced_braces      = qr/(\{(?:[^\{\}]++|(?-1))*\})/;

foreach my $file (@ARGV) {
    my $f;
    my $text;
    my $oldtext;

    next if ((-d $file));

    open($f, '<', $file)
or die "$P: Can't open $file for read\n";
    $oldtext = do { local($/) ; <$f> };
    close($f);

    next if ($oldtext eq "");

    $text = $oldtext;

    my $count = 0;
    do {
$count = 0;
$count += $text =~ s@\b(for\s*${match_balanced_parentheses}\s*)${match_balanced_braces}\s*;@"$1$3"@egx;
    } while ($count > 0);

    if ($text ne $oldtext) {
my $newfile = $file;

open($f, '>', $newfile)
    or die "$P: Can't open $newfile for write\n";
print $f $text;
close($f);
    }
}

$

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: Remove unnecessary semicolons when while (foo) {...};
Joe Perches [Sun, 10 Apr 2011 21:31:33 +0000 (14:31 -0700)]
staging: Remove unnecessary semicolons when while (foo) {...};

Done via perl script:

$ cat remove_semi_while.pl
my $match_balanced_parentheses = qr/(\((?:[^\(\)]++|(?-1))*\))/;
my $match_balanced_braces      = qr/(\{(?:[^\{\}]++|(?-1))*\})/;

foreach my $file (@ARGV) {
    my $f;
    my $text;
    my $oldtext;

    next if ((-d $file));

    open($f, '<', $file)
or die "$P: Can't open $file for read\n";
    $oldtext = do { local($/) ; <$f> };
    close($f);

    next if ($oldtext eq "");

    $text = $oldtext;

    my $count = 0;
    do {
$count = 0;
$count += $text =~ s@\b(while\s*${match_balanced_parentheses}\s*)${match_balanced_braces}\s*;@"$1$3"@egx;
    } while ($count > 0);

    if ($text ne $oldtext) {
my $newfile = $file;

open($f, '>', $newfile)
    or die "$P: Can't open $newfile for write\n";
print $f $text;
close($f);
    }
}

$

One false positive removed.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: Remove unnecessary semicolons when if (foo) {...};
Joe Perches [Sun, 10 Apr 2011 21:31:32 +0000 (14:31 -0700)]
staging: Remove unnecessary semicolons when if (foo) {...};

Done via perl script:

$ cat remove_semi_if.pl
my $match_balanced_parentheses = qr/(\((?:[^\(\)]++|(?-1))*\))/;
my $match_balanced_braces      = qr/(\{(?:[^\{\}]++|(?-1))*\})/;

foreach my $file (@ARGV) {
    my $f;
    my $text;
    my $oldtext;

    next if ((-d $file));

    open($f, '<', $file)
or die "$P: Can't open $file for read\n";
    $oldtext = do { local($/) ; <$f> };
    close($f);

    next if ($oldtext eq "");

    $text = $oldtext;

    my $count = 0;
    do {
$count = 0;
$count += $text =~ s@\b(if\s*${match_balanced_parentheses}\s*)${match_balanced_braces}\s*;@"$1$3"@egx;
    } while ($count > 0);

    if ($text ne $oldtext) {
my $newfile = $file;

open($f, '>', $newfile)
    or die "$P: Can't open $newfile for write\n";
print $f $text;
close($f);
    }
}

$

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/linux-staging into stagi...
Greg Kroah-Hartman [Mon, 25 Apr 2011 23:55:53 +0000 (16:55 -0700)]
Merge git://git./linux/kernel/git/lwfinger/linux-staging into staging-next

* git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/linux-staging:
  staging: rt2860sta and rt2870sta: Remove drivers replaced in net/wireless

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: istallion: fix arbitrary kernel memory reads/writes
Vasiliy Kulikov [Thu, 14 Apr 2011 15:56:25 +0000 (19:56 +0400)]
staging: istallion: fix arbitrary kernel memory reads/writes

stli_brdstats is defined as global variable.  After de-BKL-ization in
the patch b4eda9cb48eac1b7 an access to the variable is not serialized
anymore.  This leads to the race window between the check and the use
in stli_getbrdstats():

        if (copy_from_user(&stli_brdstats, bp, sizeof(combrd_t)))
                return -EFAULT;
        if (stli_brdstats.brd >= STL_MAXBRDS) <<<
                return -ENODEV;
        brdp = stli_brds[stli_brdstats.brd];  <<<

If one process calls COM_GETBRDSTATS ioctl() with sane .brd, second
process calls COM_GETBRDSTATS ioctl() with invalid .brd, and the
second process' copy_from_user() executes exactly between the check and
stli_brds[] indexation of the first process, then the first process gets
contents of memory at *stli_brds[stli_brdstats.brd] address.  Also
the resulting .nrpanels field may be too big, in this case
stli_brdstats.panels array overflows.

Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agomodules: Enabled dynamic debugging for staging modules
Roland Vossen [Thu, 7 Apr 2011 09:20:58 +0000 (11:20 +0200)]
modules: Enabled dynamic debugging for staging modules

Driver modules from the staging directory are marked 'tainted'
by module.c. Subsequently, tainted modules are denied dynamic
debugging. This is unwanted behavior, since staging modules should
be able to use the dynamic debugging mechanism.

Please merge this also into the staging-linus branch.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Acked-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: Add dhdsdio_chip_attach in dhd_sdio.c
Franky Lin [Mon, 25 Apr 2011 22:45:08 +0000 (15:45 -0700)]
staging: brcm80211: Add dhdsdio_chip_attach in dhd_sdio.c

dhdsdio_chip_attach and it sub functions are added for si/sb utils removal.
It will replace si_attach in following patches.

Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: Add bcmchip.h
Franky Lin [Mon, 25 Apr 2011 22:45:07 +0000 (15:45 -0700)]
staging: brcm80211: Add bcmchip.h

bcmchip.h contains chip specific core register base address and
address translation macro for core register access. This is
introduced for si/sb utils dependence removal in fullmac driver.

Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: remove unnecessary include from nvram_ro.c
Arend van Spriel [Thu, 14 Apr 2011 14:53:29 +0000 (16:53 +0200)]
staging: brcm80211: remove unnecessary include from nvram_ro.c

Source file included bcmotp.h but did not use any declared item
from that include file so it can safely be removed.

Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Henry Ptasinski <henryp@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: bugfix for div by zero in minstrel_ht_tx_status
Roland Vossen [Tue, 12 Apr 2011 12:34:41 +0000 (14:34 +0200)]
staging: brcm80211: bugfix for div by zero in minstrel_ht_tx_status

Caused by brcmsmac.ko suppling a 0 value to Mac80211. Mac80211 subsequently
divides by this number. Bug only occurred on AMPDU traffic. This is a fix
for https://bugzilla.kernel.org/show_bug.cgi?id=32032, titled
'Divide error in minstrel_ht_tx_status followed by hang', reported by
Wouter Cloetens.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
13 years agostaging: brcm80211: replaced BCME_OK by 0
Roland Vossen [Mon, 11 Apr 2011 13:16:24 +0000 (15:16 +0200)]
staging: brcm80211: replaced BCME_OK by 0

Code cleanup.

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>