summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-08-23staging: bcm: fix coding style warnings and errors reported by checkpatch.pl ↵Kevin McKinney
tool Staging: bcm: Fix coding style errors reported by checkpatch.pl Fix multiple warnings and errors reported by checkpatch.pl Signed-off-by: Kevin McKinney<klmckinney1@gmail.com> Reviewed-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23Merge branch 'master' of ↵Larry Finger
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
2011-08-23staging: rtl8712: remove r8712_cmd_thread()->daemonize()Oleg Nesterov
daemonize() is only needed when a user-space task does kernel_thread(). r8712_cmd_thread() is kthread_create()'ed and thus it doesn't need the soon-to-be-deprecated daemonize(). It is the only caller of thread_enter() which actually does the call. Note: - we are going to remove the sigdelset(blocked) code from allow_signal(), this means that without this patch thread_enter() can't work after that. Not to mention daemonize() should be deprecated. - as a side effect, this patch changes ->comm. Hopefully this is fine, and padapter->pnetdev->name probably makes more sense anyway. Signed-off-by: Oleg Nesterov <oleg@redhat.com> Acked-by: Matt Fleming <matt.fleming@intel.com> Acked-by: Tejun Heo <tj@kernel.org> Acked-and-tested-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23rtl8712: don't just return -EFAULT in wpa_supplicant_ioctl()Dan Carpenter
There were some curly braces missing so the original code in wpa_supplicant_ioctl() pretty much always returned -EFAULT without doing anything. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23staging: vme: keep track of registered busesManohar Vanga
This patch adds a list which keeps track of all registered VME buses. This is required for adding refcounting later to bridge modules, something that is not currently implemented. This is based on the changes introduced by Emilio G. Cota in the patch: https://lkml.org/lkml/2010/10/25/486 Signed-off-by: Manohar Vanga <manohar.vanga@cern.ch> Acked-by: Martyn Welch <martyn.welch@ge.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23staging: vme: make [alloc|free]_consistent bridge specificManohar Vanga
Make PCI dependent functions ([alloc|free]_consistent() in 'vme.c') bridge specific. By removing the dependency of the VME bridge framework on PCI, this patch allows for addition of non-PCI based VME bridges. Signed-off-by: Manohar Vanga <manohar.vanga@cern.ch> Acked-by: Martyn Welch <martyn.welch@ge.com> Acked-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23staging: vme_user: change kmalloc+memset to kzallocManohar Vanga
Signed-off-by: Manohar Vanga <manohar.vanga@cern.ch> Acked-by: Martyn Welch <martyn.welch@ge.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23Staging: zcache: signedness bug in tmem_get()Dan Carpenter
"ret" needs to be signed for the error handling to work properly. Signed-off-by: Dan Carpenter <error27@gmail.com> Acked-by: Dan Magenheimer <dan.magenheimer@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23staging: zcache: fix crash on high memory swapSeth Jennings
zcache_put_page() was modified to pass page_address(page) instead of the actual page structure. In combination with the function signature changes to tmem_put() and zcache_pampd_create(), zcache_pampd_create() tries to (re)derive the page structure from the virtual address. However, if the original page is a high memory page (or any unmapped page), this virt_to_page() fails because the page_address() in zcache_put_page() returned NULL. This patch changes zcache_put_page() and zcache_get_page() to pass the page structure instead of the page's virtual address, which may or may not exist. Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com> Acked-by: Dan Magenheimer <dan.magenheimer@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23staging: zcache: fix typosSeth Jennings
The patch fixes two typos in zcache-main.c Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com> Acked-by: Dan Magenheimer <dan.magenheimer@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23staging: zcache: fix possible sleep under lockSeth Jennings
zcache_new_pool() calls kmalloc() with GFP_KERNEL which has __GFP_WAIT set. However, zcache_new_pool() gets called on a stack that holds the swap_lock spinlock, leading to a possible sleep-with-lock situation. The lock is obtained in enable_swap_info(). The patch replaces GFP_KERNEL with GFP_ATOMIC. v2: replace with GFP_ATOMIC, not GFP_IOFS Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com> Acked-by: Dan Magenheimer <dan.magenheimer@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23drivers/staging/rtl8192u: Don't pass huge struct by valueJesper Juhl
struct ieee80211_network is fairly large (more than half a kilobyte), so let's pass a pointer instead of passing the entire structure by value when ieee80211_is_54g() and ieee80211_is_shortslot() need to look at a few members. Also remove parentheses around the values being returned from those two functions - 'return' is not a function. Signed-off-by: Jesper Juhl <jj@chaosbits.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23drivers/staging/rtl8187se: Don't pass huge struct by valueJesper Juhl
struct ieee80211_network is fairly large (more than half a kilobyte), so let's pass a pointer instead of passing the entire structure by value when ieee80211_is_54g() and ieee80211_is_shortslot() need to look at a few members. Also remove parentheses around the values being returned from those two functions - 'return' is not a function. Signed-off-by: Jesper Juhl <jj@chaosbits.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23drivers/staging/usbip/userspace/libsrc/vhci_driver.c: test the ↵Julia Lawall
just-initialized value Test the just-initialized value rather than some other one. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r@ identifier x,y,f!={PTR_ERR,ERR_PTR,ERR_CAST}; statement S; @@ x = f(...); ( if (\(x == NULL\|IS_ERR(x)\)) S | *if (\(y == NULL\|IS_ERR(y)\)) { ... when != x return ...; } ) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Acked-by: David Chang <dchang@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23staging: usbip: Add header guards to stub.h and vhci.hTobias Klauser
stub.h and vhci.h are missing proper #ifndef/#define header guards, so add them. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23staging: usbip: add a usbip protocol documentMárton Németh
Initial version of USBIP protocol document. Signed-off-by: David Chang <dchang@suse.com> Acked-by: matt mooney <mfm@muteddisk.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23staging: usbip: userspace: Check return value for mkdir()Tobias Klauser
mkdir() could fail, so we should check its return value. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23Staging: usbip: Fix braces and spaces to match coding style.Akshay Joshi
Fix brace positioning and spaces at the start of lines in order to comply with the kernel coding style. Signed-off-by: Akshay Joshi <me@akshayjoshi.com> Acked-by: matt mooney <mfm@muteddisk.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23Staging: usbip: Remove trailing spaces.Akshay Joshi
Remove trailing spaces to comply with the kernel coding style. Signed-off-by: Akshay Joshi <me@akshayjoshi.com> Acked-by: matt mooney <mfm@muteddisk.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23Staging: keucr: fix comments, braces, whitespaces coding style issue in tm6000.hRuslan Pisarev
This is a patch to the smilsub.c file that fixed up comment, braces, whitespaces error found by the checkpatch.pl tools. Signed-off-by: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23Staging: keucr: Remove dead (comment) code in drivers/staging/keucr/smilsub.cRuslan Pisarev
Remove dead (comment) code in drivers/staging/keucr/smilsub.c Signed-off-by: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23Staging: keucr: Coding style fixes in scsiglue.cRuslan Pisarev
Fixed macros in scsiglue.c Signed-off-by: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23Staging: keucr: Coding style fixes in smil.hRuslan Pisarev
Fixed brace style in smil.h Signed-off-by: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23Staging: keucr: Coding style fixes in smscsi.cRuslan Pisarev
I fixed whitespace, brace style and commetnt in smscsi.c Signed-off-by: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23staging: olpc_dcon: replace remaining calls to i2c_smbus_read/writeAndres Salomon
Use dcon_read and dcon_write; shorter, and understands the dcon_priv struct. This transition was started long ago. This converts the last few i2c_smbus_* callers. Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23staging: olpc_dcon: drop support for DCON v1Andres Salomon
The v1 DCONs only existed for XO-1 prototypes (and even then, very very early prototypes). Drop support for v1 DCON. Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23staging: olpc_dcon: remove noinit module variableAndres Salomon
This came from Jordan's original 2007 gxfb_dcon commit. I've never seen or heard of it actually being used. Presumably it was once useful for skipping hardware initialization when reloading the module over and over during driver development.. Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23staging: vt6656: use %pM for printing MACsAndy Shevchenko
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23staging: vt6655: simplify MAC printing by using %pMAndy Shevchenko
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23staging: zram: make global var "num_devices" use unique nameNoah Watkins
The global variable "num_devices" is too general to be global. This patch switches the name to be "zram_num_devices". Signed-off-by: Noah Watkins <noahwatkins@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23staging: zram: make global var "devices" use unique nameNoah Watkins
The global variable "devices" is too general to be global. This patch switches the name to be "zram_devices". Signed-off-by: Noah Watkins <noahwatkins@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23staging: remove ath6klKalle Valo
ath6kl is now in drivers/net/wireless/ath so the staging driver is not supported anymore and should be removed. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23Staging: pohmelfs: Coding style fixes in trans.cRuslan Pisarev
I fixed whitespace in drivers/staging/pohmelfs/trans.c Signed-off-by: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23staging: xgifb: replace video_type with FB_TYPE_PACKED_PIXELSAaro Koskinen
Replace a global variable with a constant. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23staging: xgifb: probe: delete checks for mode "none"Aaro Koskinen
The driver does not allow selecting the mode "none", so no need to check for that in probe. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23staging: xgifb: eliminate #ifdef XGIFB_PANAaro Koskinen
XGIFB_PAN is always defined and checks can be eliminated. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23staging: xgifb: delete unused structsAaro Koskinen
Delete unused struct declarations. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23staging: xgifb: vb_table: delete unused dataAaro Koskinen
Delete unused data. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23staging: xgifb: delete unused definitionsAaro Koskinen
Delete some more unused definitions. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23staging: xgifb: delete duplicate #definesAaro Koskinen
Delete duplicate identical #defines. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23staging: xgifb: eliminate #ifdef NewScratchAaro Koskinen
NewScratch is always defined so all checks can be eliminated. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23Staging: xgifb: Delete define XGIINITSTATIC in XGI_main_26.c and XGI_main.hRuslan Pisarev
This is a patch to the XGI_main.h and XGI_main_26.c file that fixed up a define warrning found by the checkpatch.pl tools. Signed-off-by: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23Staging: xgifb: Fixed up a errors "do not initialise statics to 0 or NULL" ↵Ruslan Pisarev
in XGI_main_26.c This is a patch to the XGI_main_26.c file that fixed up a errors "do not initialise statics to 0 or NULL" found by the checkpatch.pl tools. Signed-off-by: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23Staging: xgifb: Fixed up a errors "do not initialise statics to 0 or NULL" ↵Ruslan Pisarev
in XGI_main.h This is a patch to the XGI_main.h file that fixed up a errors "do not initialise statics to 0 or NULL" found by the checkpatch.pl tools. Signed-off-by: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23IIO: ADC: New driver for AD7190/AD7192/AD7195 4 Channel SPI ADCMichael Hennerich
New driver for AD7190/AD7192/AD7195 4.8 kHz, Ultralow Noise, 24-Bit Sigma-Delta ADC with PGA These devices features a dual use data out ready DOUT/RDY output. In order to avoid contentions on the SPI bus, it's necessary to use spi bus locking. The DOUT/RDY output must also be wired to an interrupt capable GPIO. In INDIO_RING_TRIGGERED mode, this driver may block its SPI bus segment for an extended period of time. Changes since V1: Add missing documentation. Remove obsoleted include files. Fix typos and style issues. Fix buffer size. Split ad7192_show() into two functions. Avoid race condition add mutex. Abandon IIO_CHAN macro. Reorder elements in ad7192_platform_data. Remove driver bus type. 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>
2011-08-23staging:iio:imu:adis16344 supportJonathan Cameron
Simple device. Note the sparse scan mask used. Done from datasheet as very similar to existing parts. 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>
2011-08-23m68k: fix __page_to_pfn for a const struct page argumentIan Campbell
Fixes fallout due to the removal of the cast in commit aa462abe8aaf ("mm: fix __page_to_pfn for a const struct page argument") Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Cc: Andrew Morton <akpm@linux-foundation.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: linux-m68k@lists.linux-m68k.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-08-23STAGING:iio:light: fix ISL29018 init to handle brownoutGrant Grundler
After a voltage brownout, sensor will now operate correctly. Page 10 of ISL29018 data sheet and the Intersil Application Note 1534 describe the required initialization sequence: 1. Write 0x00 to register 0x08 (TEST) 2. Write 0x00 to register 0x00 (CMD1) 3. msleep(1) 4. program remaining registers as before Signed-off-by: Grant Grundler <grundler@chromium.org> Reviewed-by: Bryan Freed <bfreed@chromium.org> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23iio: impedance-analyzer: New driver for AD5933/4 Impedance Converter, ↵Michael Hennerich
Network Analyzer The AD5933 is a high precision impedance converter system solution that combines an on-board frequency generator with a 12-bit, 1 MSPS, analog-to-digital converter (ADC). The frequency generator allows an external complex impedance to be excited with a known frequency. The response signal from the impedance is sampled by the on-board ADC and a discrete Fourier transform (DFT) is processed by an on-chip DSP engine. The DFT algorithm returns a real (R) and imaginary (I) data-word at each output frequency. Changes since V1: Apply list review feedback: Consistently use poll_time_jiffies. Use be|le cpu endian helpers where applicable. Add various comments. Changes since V2: Fix KernelVersion tag in Documentation. Declare ad5933_default_pdata static. Fix typos. 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>
2011-08-23iio: adc: New driver for AD7280A Lithium Ion Battery Monitoring SystemMichael Hennerich
The AD7280A monitoring system contains all the functions required for general purpose monitoring and maintenance of stacked lithium ion batteries as used in hybrid electric vehicles, battery backup applications, etc. Changes since V1: Make cell channels all type IIO_IN_DIFF, update documentation accordingly. Remove unused and redundant defines. Use SI units where applicable. Remove unnecessary wrapper function. Remove redundant initialization. Add comments where requested. Revise event handler. Use const where applicable. Changes since V2: Remove redundant adc.h include file, scheduled for removal. 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>