summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-09-04staging: nvec: use system_nrt_wq instead of custom oneTejun Heo
There isn't much reason to use custom workqueue in nvec. It can use system_nrt_wq instead and cancel the two work items on removal. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Marc Dietrich <marvin24@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: nvec: do not depend on MACH_PAZ00Marc Dietrich
With the removal of board files on the tegra arch, drivers can now only be instantiated via device tree. Consequently, all MACH_<board> config variables are removed. As a temporary solution always enable building for the (up to now) only supported paz00 board until nvec is full ported to device tree. Signed-off-by: Marc Dietrich <marvin24@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: nvec: release sync write lock in error caseMarc Dietrich
We forgot to release the sync write lock in case the async write fails. Found by rpiloose on IRC. Signed-off-by: Marc Dietrich <marvin24@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: nvec: fix clock setupMarc Dietrich
commit 30b68231 "ARM: tegra: clock: add i2c fast clock entry in clock table" added a new clock for the i2c controllers, so clock requests are no longer conclusive. Fix this by specifying "div-clk" explicitly. Signed-off-by: Marc Dietrich <marvin24@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: wlags49_h2: use is_broadcast_ether_addr() instead of memcmp()Wei Yongjun
Using is_broadcast_ether_addr() instead of directly use memcmp() to determine if the ethernet address is broadcast address. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: wlags49_h2: Fix typo in staging/wlags49_h2 driverMasanari Iida
Correct spelling typo in staging/wlags49_h2 Signed-off-by: Masanari Iida <standby24x7@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: wlagn49_h2: move open brace of if from below to beside of if statementDevendra Naga
the opening brace of the if statement should be beside to it, not below to it. Signed-off-by: Devendra Naga <develkernel412222@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: wlags49_h2: remove return statements at the end of all void functionsDevendra Naga
this patch removes the return statement at the end of all void functions, since the function returning void no need to have a return at the end of the function. Signed-off-by: Devendra Naga <develkernel412222@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: wlagn49_h2: fix the checkpatch warning about the space after the ↵Devendra Naga
open paranthesis the following fix is done in the wl_wds_netif_carrier_off function: wl_netdev.c:1764: ERROR: space prohibited after that open parenthesis '(' wl_netdev.c:1764: ERROR: space prohibited before that close parenthesis ')' wl_netdev.c:1768: ERROR: space prohibited after that open parenthesis '(' wl_netdev.c:1768: ERROR: space prohibited before that close parenthesis ')' wl_netdev.c:1768: ERROR: space required before the open parenthesis '(' wl_netdev.c:1769: ERROR: space prohibited after that open parenthesis '(' wl_netdev.c:1769: ERROR: space prohibited before that close parenthesis ')' wl_netdev.c:1769: ERROR: space required before the open parenthesis '(' wl_netdev.c:1770: ERROR: space prohibited after that open parenthesis '(' wl_netdev.c:1770: ERROR: space prohibited before that close parenthesis ')' wl_netdev.c:1770: ERROR: space required before the open parenthesis '(' wl_netdev.c:1771: ERROR: space prohibited after that open parenthesis '(' wl_netdev.c:1771: ERROR: space prohibited before that close parenthesis ')' Signed-off-by: Devendra Naga <develkernel412222@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: wlags49_h2: style fix in w1_wds_netif_carrier_offDevendra Naga
whitespaces at beginning of the line are removed and are replaced with the tabs Signed-off-by: Devendra Naga <develkernel412222@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: wlags49_h2: remove unneded return in wl_wds_netif_carrier_offDevendra Naga
the return is at the end of void function, which is not needed as this function returns void. Signed-off-by: Devendra Naga <develkernel412222@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: wlags49_h2: coding style fix at wl_wds_netif_carrier_offDevendra Naga
no braces needed for single statement if block Signed-off-by: Devendra Naga <develkernel412222@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: ozwpan: remove pointless conditional before kfree_skb()Wei Yongjun
Remove pointless conditional before kfree_skb(). Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Acked-by: Rupesh Gujare <rgujare@ozmodevices.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: ozwpan: Fix typo in staging/ozwpanMasanari Iida
Fix spelling typo in staging/ozwpan Signed-off-by: Masanari Iida <standby24x7@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04Staging: asus_oled: Add suspend/resume callbacksJonathan Brett
- Add simple suspend/resume PM callbacks to disable oled display on suspend and return to previous state on resume Signed-off-by: Jonathan Brett <jonbrett.dev@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging/rts_pstor: remove braces {} in rtsx_chip.cToshiaki Yamane
fixed below checkpatch warnings. -WARNING: braces {} are not necessary for single statement blocks -WARNING: braces {} are not necessary for any arm of this statement Signed-off-by: Toshiaki Yamane <yamanetoshi@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging/rts_pstor: remove braces {} in rtsx_transport.cToshiaki Yamane
fixed below checkpatch warnings. -WARNING: braces {} are not necessary for single statement blocks -WARNING: braces {} are not necessary for any arm of this statement Signed-off-by: Toshiaki Yamane <yamanetoshi@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging/rts_pstor: remove braces {} in rtsx_card.cToshiaki Yamane
fixed below checkpatch warnings. -WARNING: braces {} are not necessary for single statement blocks -WARNING: braces {} are not necessary for any arm of this statement Signed-off-by: Toshiaki Yamane <yamanetoshi@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: rts_pstor: Fix invalid checkAlan Cox
As noted by David Binderman Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=46581 Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: drm/omap: invert dimensions on crtc when rotatedRob Clark
If rotated 90 or 270, we need to invert the dimensions used by drm core for calculating if the dimensions of an attached fb are correct. Signed-off-by: Rob Clark <rob@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: omapdrm: use alloc_ordered_workqueue() instead of UNBOUND w/ ↵Tejun Heo
max_active = 1 This is an equivalent conversion and will ease scheduled removal of WQ_NON_REENTRANT. Only compile tested. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Rob Clark <rob@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: drm/omap: Add error handlingEmil Goode
This patch adds fail checks for kmalloc and kzalloc calls and also adds a error path that frees allocated pages by introducing a call to _drm_gem_put_pages. Signed-off-by: Emil Goode <emilgoode@gmail.com> Signed-off-by: Rob Clark <rob@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04Merge tag 'iio-for-v3.7b' of ↵Greg Kroah-Hartman
git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into work-next Second set of IIO rework and new drivers for the 3.7 cycle. Firstly we have the second half of a series reworking support for the various sigma delta ADCs from Analog. The first half was fixes that have already merged in the v3.6 cycle. Other than some little cleanups this mainly consists of a unifying library module that the various drivers can then use. Another new driver is using this undergoing revisions and the code reduction already seen from this is considerable. A nice piece of work. Secondly we have a good number of tidying up patches from various sources doing things like adding include guards and removing unintended header ordering requirements. Also a mass annotation of missing __devinit/exit. Peter Meerwald has been getting around with cleanup of lis3l02dq, documentation fixes, white space clenaups and a small issue with my spelling ;) Thirdly we have some improvements to our kfifo usage that have been around for a while but are now suddenly in demand from a number of users. Forth we have some clk_prepare_enable and clk_prepare_disable cleanups. Fifth is the addition of i2c dacs to the ad5446 driver Finally we have some email address updates. I'll do the MAINTAINERS one separately. So a general mixed bag but nothing terribly controversial or 'exciting'.
2012-09-04staging: comedi: das08: abbreviate IS_ENABLED()Ian Abbott
The `IS_ENABLED(CONFIG_COMEDI_DAS08_ISA)` and `IS_ENABLED(CONFIG_COMEDI_DAS08_PCI)` macro calls are a bit long-winded. Define a couple of macros `DO_ISA` and `DO_PCI` as abbreviations for them. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: comedi: das08: Add helper functions to check bus typeIan Abbott
Add inline helper function `is_isa_board(board)` to check if the driver supports ISA boards and this is an ISA board, and `is_pci_board(board)` to check if the driver supports PCI boards and this is a PCI board. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: comedi: das08: Don't report iobase for PCI deviceIan Abbott
Don't bother reporting the I/O base address for PCI devices as it's not very interesting. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: comedi: das08: absorb das08_pci_attach_common()Ian Abbott
Absorb `das08_pci_attach_common()` into `das08_attach_pci()` since that's the only place it was called from. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: comedi: das08: Remove manual configuration of PCI boardsIan Abbott
Remove the code that allows PCI boards to be manually attached by the `COMEDI_DEVCONFIG` ioctl (or the `comedi_config` application). Supported PCI boards will be attached automatically at probe time via `comedi_pci_auto_config()` and the `attach_pci` hook in the `struct comedi_driver`. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: comedi: das08: Support read-back of AO subdeviceIan Abbott
Stash the last value written to each AO channel in private data and support the INSN_READ instruction to read it back. Don't bother setting the SDF_READABLE subdevice flag though as the hardware isn't really readable - we're just faking it. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: comedi: das08: Initialize AO channelsIan Abbott
Initialize the AO subdevice channels to mid-range data value so they are in a known state. This allows us to support reading back the current value in a later patch. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: comedi: das08: Rearrange AO write functionsIan Abbott
Combine the AO write functions for 'JR' boards and other boards into a single function and factor out the data writing from the comedi instruction handling so it can be called from elsewhere in a later patch. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: comedi: das08: Unmark some __maybe_unused functionsIan Abbott
The `das08jr_di_rbits()`, `das08jr_do_wbits()`, `das08jr_ao_winsn()` and `das08ao_ao_winsn()` static functions are currently marked as `__maybe_unused` as they were formerly only referred to by possibly conditionally compiled out code. This is no longer the case (they are referred to by `das08_common_attach()`) so their `__maybe_unused` tags can be removed. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: comedi: das08: No need to check insn->n for counter configIan Abbott
There is no need to check the value of `insn->n` is correct in `das08_counter_config()` as the core comedi module will have already checked it. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: comedi: das08: Remove i8254_iobase from private dataIan Abbott
The I/O port base address for the counter subdevice doesn't need to be stored in the private data. It can be calculated on the fly using the offset in the static board data. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: comedi: das08: Remove pci_iobase from private dataIan Abbott
The `pci_iobase` I/O port registers from PCI BAR 1 are never accessed, so don't bother storing this base address in `struct das08_private_struct`. The `pci_iobase` member was checked for non-zero in `das08_detach()` but we can check `dev->iobase` is non-zero instead. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: comedi: das08: Remove dead codeIan Abbott
Remove the code that has been in `#if 0` for a long time. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: comedi: das08,das08_cs: Move das08_cs_boards[]Ian Abbott
Move `das08_cs_boards[]` from "das08.c" to "das08_cs.c" and make it static const. It no longer refers to anything in "das08.c" and no longer needs to be exported. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: comedi: das08: Avoid zero initializers in board structureIan Abbott
Don't bother initializing the `i8255_offset` and/or `i8254_offset` members of `struct das08_board_struct` in `das08_boards[]` and `das08_cs_boards[]` if they are zero as they are implicitly initialized to zero anyway, and zero means the corresponding subdevices are absent. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: comedi: das08: Remove function pointers from board structureIan Abbott
Remove the `ai`, `ao`, `di` and `do` pointers from `struct das08_board_struct`. These were initialized in `das08_boards[]` and `das08_cs_boards[]` to point to comedi instruction handler functions for the subdevice, but there are only two sets of functions depending on whether the `is_jr` member is true or false, and some of the functions will be NULL if the corresponding `ai_nbits`, `ao_nbits`, `di_nchan` and `do_nchan` members are zero. Determine which handler functions to use in das08_common_attach(). One element of `das08_boards[]` had `ao` set to NULL and `ao_nbits` set to 12. Set `ao_nbits` to 0 in this case to let das08_common_attach() know this board has no AO subdevice. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: comedi: das08: Mark 'JR' boards in board dataIan Abbott
Add a bool member `is_jr` to `struct das08_board_struct` and initialize it to `true` in those elements of `das08_boards[]` corresponding to the 'JR' board models. This will be used by a following patch that removes the `ai`, `ao`, `di` and `do` members from `struct das08_board_struct`. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: comedi: das08: Add number of DI channels in board structureIan Abbott
Add member `di_nchan` to `struct das08_board_struct` to set the number of digital input channels explicitly. Currently, the code determines the number of channels to 3 or 8 depending on what function the `di` member points to, which is not very elegant. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: comedi: das08: Remove pc104 bustype valueIan Abbott
Remove the `pc104` value from `enum das08_bustype` and replace occurrences of it in the code and data with the `isa` value. The code treats them as equivalent anyway with expressions like `(thisboard->bustype == isa || thisboard->bustype == pc104)`. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04Merge branch 'staging-linus' into staging-nextGreg Kroah-Hartman
Pick up 2 more comedi patches from Ian that are needed for other changes in the future. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: comedi: das08: Correct AO output for das08jr-16-aoIan Abbott
Don't zero out bits 15..12 of the data value in `das08jr_ao_winsn()` as that knobbles the upper three-quarters of the output range for the 'das08jr-16-ao' board. Cc: stable <stable@vger.kernel.org> Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: comedi: das08: Correct AI encoding for das08jr-16-aoIan Abbott
The element of `das08_boards[]` for the 'das08jr-16-ao' board has the `ai_encoding` member set to `das08_encode12`. It should be set to `das08_encode16` same as the 'das08jr/16' board. After all, this board has 16-bit AI resolution. The description of the A/D LSB register at offset 0 seems incorrect in the user manual "cio-das08jr-16-ao.pdf" as it implies that the AI resolution is only 12 bits. The diagrams of the A/D LSB and MSB registers show 15 data bits and a sign bit, which matches what the software expects for the `das08_encode16` AI encoding method. Cc: stable <stable@vger.kernel.org> Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: comedi: serial2002: Set range for digital inputs and outputsIan Abbott
I got an update from the original author of this driver (Anders Blomdell) to set the range table for digital input and digital output subdevices. Apply it. Cc: Anders Blomdell <anders.blomdell@control.lth.se> Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04Merge branch 'staging-linus' into staging-nextGreg Kroah-Hartman
This gets the 6 staging comedi patches that are needed for further patches that Ian sent. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: comedi: das08: Fix PCI ref countIan Abbott
When attaching a PCI device manually via the comedi driver `attach` hook (`das08_attach()`) (called by the comedi core for the `COMEDI_DEVCONFIG` ioctl), its reference count is incremented in the `for_each_pci_dev` loop (in `das08_find_pci()`). It is decremented when the `detach` hook (`das08_detach()`) is called to detach the device. However, when the PCI device is attached automatically via the `attach_pci` hook (`das08_attach_pci()`, called at probe time via `comedi_pci_auto_config()`) it's reference count is not incremented so there will be an unmatched decrement when detaching the device. Increment the PCI device reference count in `das08_attach_pci()` to correct the mismatch. Once support for manual configuration has been removed from this driver, the calls to `pci_dev_get()` and `pci_dev_put()` can be removed. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: comedi: amplc_pci230: Fix PCI ref countIan Abbott
When attaching a PCI device manually via the comedi driver `attach` hook (`pci230_attach()`) (called by the comedi core for the `COMEDI_DEVCONFIG` ioctl), its reference count is incremented in the `for_each_pci_dev` loop (in `pci230_find_pci_dev()`). It is decremented when the `detach` hook (`pci230_detach()`) is called to detach the device. However, when the PCI device is attached automatically via the `attach_pci` hook (`pci230_attach_pci()`, called at probe time via `comedi_pci_auto_config()`) it's reference count is not incremented so there will be an unmatched decrement when detaching the device. Increment the PCI device reference count in `pci230_attach_pci()` to correct the mismatch. Once support for manual configuration has been removed from this driver, the calls to `pci_dev_get()` and `pci_dev_put()` can be removed. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04staging: comedi: amplc_pc263: Fix PCI ref countIan Abbott
When attaching a PCI device manually via the comedi driver `attach` hook (`pc263_attach()`) (called by the comedi core for the `COMEDI_DEVCONFIG` ioctl), its reference count is incremented in the `for_each_pci_dev` loop (in `pc263_find_pci_dev()`). It is decremented when the `detach` hook (`pc263_detach()`) is called to detach the device. However, when the PCI device is attached automatically via the `attach_pci` hook (`pc263_attach_pci()`, called at probe time via `comedi_pci_auto_config()`) it's reference count is not incremented so there will be an unmatched decrement when detaching the device. Increment the PCI device reference count in `pc263_attach_pci()` to correct the mismatch. Once support for manual configuration has been removed from this driver, the calls to `pci_dev_get()` and `pci_dev_put()` can be removed. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>