Commit graph

506,942 commits

Author SHA1 Message Date
Thomas Pugliese
1fc671b3be uwb: move mutex_lock to error case in uwbd_evt_handle_rc_bp_slot_change
Only acquire rc->uwb_dev.mutex in the error case in
uwbd_evt_handle_rc_bp_slot_change.  This fixes a bug where establishing
a reservation on a new channel will fail if we were unable to establish
a reservation on the previous channel due to DRP conflict.

If rc->uwb_dev.mutex is acquired in the non-error case when the uwb
system is attempting to start beaconing, it will block because the start
beaconing code is holding this mutex.  This prevents any other
notifications from the URC from being processed.  In particular, the
DRP_AVAILABILITY notification will not be processed during the start
beaconing process which can result in a failure to establish a
reservation.  It is safe to not hold the mutex in the non-error
case since the only other place rc->uwb_dev.beacon_slot is accessed is
in the same worker thread that uwbd_evt_handle_rc_bp_slot_change
executes in.

Signed-off-by: Thomas Pugliese <thomas.pugliese@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 12:19:44 -08:00
Johannes Weiner
fff4068cba mm: page_alloc: revert NUMA aspect of fair allocation policy
Commit 81c0a2bb51 ("mm: page_alloc: fair zone allocator policy") meant
to bring aging fairness among zones in system, but it was overzealous
and badly regressed basic workloads on NUMA systems.

Due to the way kswapd and page allocator interacts, we still want to
make sure that all zones in any given node are used equally for all
allocations to maximize memory utilization and prevent thrashing on the
highest zone in the node.

While the same principle applies to NUMA nodes - memory utilization is
obviously improved by spreading allocations throughout all nodes -
remote references can be costly and so many workloads prefer locality
over memory utilization.  The original change assumed that
zone_reclaim_mode would be a good enough predictor for that, but it
turned out to be as indicative as a coin flip.

Revert the NUMA aspect of the fairness until we can find a proper way to
make it configurable and agree on a sane default.

Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Reviewed-by: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Mel Gorman <mgorman@suse.de>
Cc: <stable@kernel.org> # 3.12
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-12-20 12:19:18 -08:00
Mel Gorman
8798cee2f9 Revert "mm: page_alloc: exclude unreclaimable allocations from zone fairness policy"
This reverts commit 73f038b863.  The NUMA behaviour of this patch is
less than ideal.  An alternative approch is to interleave allocations
only within local zones which is implemented in the next patch.

Cc: stable@vger.kernel.org
Signed-off-by: Mel Gorman <mgorman@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-12-20 12:19:18 -08:00
Thomas Pugliese
bf359dff23 uwb: use uwb_rsv_callback instead of calling rsv->callback directly
Use uwb_rsv_callback wrapper instead of calling rsv->callback directly.
uwb_rsv_callback checks for NULL and is used by other callers of the
callback routine.

Signed-off-by: Thomas Pugliese <thomas.pugliese@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 12:19:13 -08:00
Thomas Pugliese
67d0fb2592 uwb: whitespace and comment cleanups
various whitespace and comment cleanups

Signed-off-by: Thomas Pugliese <thomas.pugliese@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 12:19:13 -08:00
Thomas Pugliese
f79833a7ab uwb: add debug prints during channel change and beacon actions
Add debug prints during channel change and beacon actions.

Signed-off-by: Thomas Pugliese <thomas.pugliese@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 12:19:13 -08:00
Kevin Hilman
1c928d10fd Renesas ARM based SoC DT updates for v3.14
* Global
   - Use interrupt macros
   - Use #include in device tree sources
   - Tidyup DT node naming
 
 * emev2 (Emma Mobile EV2) SoC
   - Setup internal peripheral interrupts as level high
   - Use interrupt macros in DT files
   - Add clock tree description in DT
 
 * r8a7791 (R-Car M2) SoC
   - Correct GPIO resources
 
 * r8a7791 (R-Car M2) based Koelsch board
   - Configure PFC and GPO
   - Use r8a7791 suffix for IRQC compat string
   - Add DT reference
 
 * r8a7790 (R-Car H2) based Lager board
   - Include all 4 GiB of memory
   - Use r8a7790 suffix for IRQC and MMCIF compat strings
   - Enable MMCIF
   - Add default PFC settings
 
 * r8a7778 (R-Car M1) SoC
   - Suffix for INTC compat string
   - Add HSPI, MMCIF, SDHI and I2C suppport on DTSI
   - Correct pin control device addresses
 
 * r8a7778 (R-Car M1) based Bock-W board
   - Use falling edge IRQ for LAN9221 in DT reference
   - Enable I2C, HSPI0, MMCIF and SDHI
   - Correct MMC pin conflict
   - Remove manual PFC settings from DT reference
   - Add default PFC settings
 
 * r8a7779 (R-Car H1) SoC
   - Add HSPI and SDHI support
   - Suffix for INTC compat string
 
 * r8a7779 (R-Car H1) based Marzen board
   - Enable HSPI0 and SDHI in DTS
   - Remove SDHI0 WP pin setting
   - Use falling edge IRQ for LAN9221 in DT reference
   - Add SDHI support
 
 * r8a7740 (R-Mobile A1) SoC
   - Suffix for INTC compat string
   - Add FSI support via DTSI
   - Use interrupt macros
 
 * r8a7740 based Armadillo board
   - Add FSI support for DTS
   - Use low level IRQ for ST1231 in DT reference
 
 * r8a73a4 (SH-Mobile APE6) SoC
   - Use interrupt macros in DT files
 
 * r8a73a4 (R-Mobile APE6) based ape6evm board
   - Include all 2 GiB of memory
 
 * r8a73a0 (SH-Mobile AG5) SoC
   - Correct SDHI compat string
 
 * r8a73a0 (SH-Mobile AG5) based kzm9d board
   - Add GPIO keys and Add PCF8575 GPIO extender to DT
   - Enable DSW2 with gpio-keys
   - Use falling edge IRQ for LAN9221 in DT reference
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJSqm6XAAoJENfPZGlqN0++pOoQAIgdo3M/CCP56+wAop/nYOfx
 DDdozpEt+V6RcNytVwGEkQboIDMqnekiAvhLiJ7GHT7sMHmf7au2KFkNPpxN+noU
 QVgmJaMsi2AoaoV6T+rc0ice7sve+3gbHE0S49frNVlabNlo69y5Y3prYBzLmfdt
 hefvngIUx6vhosaH00elYhsRTSTd1i5Pkj+jAYQNil1sI+QBJKC61buZrlLPMOfh
 WBMZXKROSN+jIYsqwmz+O7LvqNZa+Wjm9M8NFQnKWkv4fj9on+RZtkLuNo62Yy2P
 AaOM5Z0B2q5q35a7QcsLX23QiHOtkGOXIXehzjakzA56L5kUaZMWdfSUWGXPE+DU
 B163SndwQhRPiYFrb8//Ri5+GQxls6Pw6UKtT7owDMmqkqsYUrJHm7zfu88RcX1O
 UcDrtd3ZlF4XMmr3iNxIRzscFx8faQbIErfG2VornRRkEKLT+ILRvcAedZxkhGLk
 6fs8efTcxR7lvY+7pDtJ1N/xyGGykSnsf0LiCp5BkADamSyhGhqUcr8CjUfjMhKD
 r7WhzbHEQ7FdQ7B4Y8QmxKyH9dC1wNPxB8kZ4m6YjEKFYC95XCehMQhWvbUsx9vM
 jBrvvG7414+t3M2CmROwrs9NujJ0Kf0i6078Hvi06l+w4XYe55ytLUGMnXsJAuCL
 B7aAaVRIAt3UYK7tncK+
 =jkNE
 -----END PGP SIGNATURE-----

Merge tag 'renesas-dt-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

From Simon Horman:
Renesas ARM based SoC DT updates for v3.14

* Global
  - Use interrupt macros
  - Use #include in device tree sources
  - Tidyup DT node naming

* emev2 (Emma Mobile EV2) SoC
  - Setup internal peripheral interrupts as level high
  - Use interrupt macros in DT files
  - Add clock tree description in DT

* r8a7791 (R-Car M2) SoC
  - Correct GPIO resources

* r8a7791 (R-Car M2) based Koelsch board
  - Configure PFC and GPO
  - Use r8a7791 suffix for IRQC compat string
  - Add DT reference

* r8a7790 (R-Car H2) based Lager board
  - Include all 4 GiB of memory
  - Use r8a7790 suffix for IRQC and MMCIF compat strings
  - Enable MMCIF
  - Add default PFC settings

* r8a7778 (R-Car M1) SoC
  - Suffix for INTC compat string
  - Add HSPI, MMCIF, SDHI and I2C suppport on DTSI
  - Correct pin control device addresses

* r8a7778 (R-Car M1) based Bock-W board
  - Use falling edge IRQ for LAN9221 in DT reference
  - Enable I2C, HSPI0, MMCIF and SDHI
  - Correct MMC pin conflict
  - Remove manual PFC settings from DT reference
  - Add default PFC settings

* r8a7779 (R-Car H1) SoC
  - Add HSPI and SDHI support
  - Suffix for INTC compat string

* r8a7779 (R-Car H1) based Marzen board
  - Enable HSPI0 and SDHI in DTS
  - Remove SDHI0 WP pin setting
  - Use falling edge IRQ for LAN9221 in DT reference
  - Add SDHI support

* r8a7740 (R-Mobile A1) SoC
  - Suffix for INTC compat string
  - Add FSI support via DTSI
  - Use interrupt macros

* r8a7740 based Armadillo board
  - Add FSI support for DTS
  - Use low level IRQ for ST1231 in DT reference

* r8a73a4 (SH-Mobile APE6) SoC
  - Use interrupt macros in DT files

* r8a73a4 (R-Mobile APE6) based ape6evm board
  - Include all 2 GiB of memory

* r8a73a0 (SH-Mobile AG5) SoC
  - Correct SDHI compat string

* r8a73a0 (SH-Mobile AG5) based kzm9d board
  - Add GPIO keys and Add PCF8575 GPIO extender to DT
  - Enable DSW2 with gpio-keys
  - Use falling edge IRQ for LAN9221 in DT reference

* tag 'renesas-dt-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (102 commits)
  ARM: shmobile: marzen: enable HSPI0 in DTS
  ARM: shmobile: r8a7779: add HSPI support to DTSI
  ARM: shmobile: Use r8a7779 suffix for INTC compat string
  ARM: shmobile: Use r8a7778 suffix for INTC compat string
  ARM: shmobile: Use r8a7740 suffix for INTC compat string
  ARM: shmobile: Use sh73a0 suffix for INTC compat string
  ARM: shmobile: armadillo: add FSI support for DTS
  ARM: shmobile: r8a7740: add FSI support via DTSI
  ARM: shmobile: emev2: Setup internal peripheral interrupts as level high
  ARM: shmobile: emev2: Use interrupt macros in DT files
  ARM: shmobile: Use interrupt macros in r8a73a4 and r8a7778 DT files
  ARM: shmobile: Fix r8a7791 GPIO resources in DTS
  ARM: shmobile: Include all 4 GiB of memory on Lager DT Ref
  ARM: shmobile: Include all 4 GiB of memory on Lager
  ARM: shmobile: Include all 2 GiB of memory on APE6EVM
  ARM: shmobile: Include all 2 GiB of memory on APE6EVM DT Ref
  ARM: shmobile: kzm9g-reference: Add GPIO keys to DT
  ARM: shmobile: kzm9g-reference: Add PCF8575 GPIO extender to DT
  ARM: shmobile: Koelsch DT reference GPIO LED support
  ARM: shmobile: Enable DSW2 with gpio-keys on KZM9D
  ...

Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-12-20 12:17:18 -08:00
Kirill A. Shutemov
ee53664bda mm: Fix NULL pointer dereference in madvise(MADV_WILLNEED) support
Sasha Levin found a NULL pointer dereference that is due to a missing
page table lock, which in turn is due to the pmd entry in question being
a transparent huge-table entry.

The code - introduced in commit 1998cc0489 ("mm: make
madvise(MADV_WILLNEED) support swap file prefetch") - correctly checks
for this situation using pmd_none_or_trans_huge_or_clear_bad(), but it
turns out that that function doesn't work correctly.

pmd_none_or_trans_huge_or_clear_bad() expected that pmd_bad() would
trigger if the transparent hugepage bit was set, but it doesn't do that
if pmd_numa() is also set. Note that the NUMA bit only gets set on real
NUMA machines, so people trying to reproduce this on most normal
development systems would never actually trigger this.

Fix it by removing the very subtle (and subtly incorrect) expectation,
and instead just checking pmd_trans_huge() explicitly.

Reported-by: Sasha Levin <sasha.levin@oracle.com>
Acked-by: Andrea Arcangeli <aarcange@redhat.com>
[ Additionally remove the now stale test for pmd_trans_huge() inside the
  pmd_bad() case - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-12-20 12:17:03 -08:00
Thomas Pugliese
b4a9dfb02d usb: wusbcore: add debug prints to reservation and channel change
This patch adds debug prints to the reservation and channel change
sequence to help with debugging channel change problems.

Signed-off-by: Thomas Pugliese <thomas.pugliese@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 12:06:46 -08:00
Bjørn Mork
8dd5cd5395 usb: cdc-wdm: avoid hanging on zero length reads
commit 73e06865ea ("USB: cdc-wdm: support back-to-back
USB_CDC_NOTIFY_RESPONSE_AVAILABLE notifications") implemented
queued response handling. This added a new requirement: The read
urb must be resubmitted every time we clear the WDM_READ flag if
the response counter indicates that the device is waiting for a
read.

Fix by factoring out the code handling the WMD_READ clearing and
possible urb submission, calling it everywhere we clear the flag.

Without this fix, the driver ends up in a state where the read urb
is inactive, but the response counter is positive after a zero
length read.  This prevents the read urb from ever being submitted
again and the driver appears to be hanging.

Fixes: 73e06865ea ("USB: cdc-wdm: support back-to-back USB_CDC_NOTIFY_RESPONSE_AVAILABLE notifications")
Cc: Greg Suarez <gsuarez@smithmicro.com>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Cc: stable <stable@vger.kernel.org> # 3.13
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 12:06:46 -08:00
Bjorn Helgaas
79bf7fc511 Merge branch 'pci/misc' into next
* pci/misc:
  PCI/checkpatch: Deprecate DEFINE_PCI_DEVICE_TABLE
2013-12-20 12:51:52 -07:00
H Hartley Sweeten
01b6442b46 staging: comedi: ni_660x: tidy up set_tio_counterswap()
Clean up the multi-line comment and tidy the function a bit.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:34 -08:00
H Hartley Sweeten
d783a20e8f staging: comedi: ni_660x: remove dma_selection_counter()
The counter->chip_index will always be < counters_per_chip due to the
initialization of the subdevices during the attach of the board.

The dma_selection_counter() helper just does a BUG_ON() check before
returning the original value. Just use the original value directly
in the caller and remove the helper function.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:34 -08:00
H Hartley Sweeten
0c26c7ed76 staging: comedi: ni_660x: use a local var for the 'chip_index'
Use a local variable for the 'counter->chip_index' to help shorten the
long lines and clarify the code.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:34 -08:00
H Hartley Sweeten
1246f05baa staging: comedi: ni_660x: rename the CamelCase enum NI_660x_Register and labels
As prefered by the CodingStyle, rename this CamelCase enum and its labels.

Also, cleanup the ni_gpct_to_660x_register() helper function. Just return the
ni_660x_register for each ni_gpct_register and remove the unnecessary break
statements after the return statements.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:34 -08:00
H Hartley Sweeten
16cc181d63 staging: comedi: ni_tiocmd: make ni_tio_cmd() a proper comedi (*do_cmd)
Change the parameters to ni_tio_cmd() to make it a proper comedi
(*do_cmd) function.

The wrappers in the ni_660x and ni_mio_common modules are still needed
to request the mite channel and setup the device before actually doing
the command.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:33 -08:00
H Hartley Sweeten
c3f3b431de staging: comedi: ni_tiocmd: make ni_tio_cmdtest() a proper comedi (*do_cmdtest)
Change the parameters to ni_tio_cmdtest() to make it a proper comedi
(*do_cmdtest) function. This allows using it directly and removing the
wrapper functions in the ni_660x and ni_mio_common modules.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:33 -08:00
H Hartley Sweeten
cac04c0f68 staging: comedi: ni_tio: make ni_tio_insn_config() a proper comedi (*insn_config)
Change the parameters to ni_tio_insn_config() to make it a proper comedi
(*insn_config) function. This allows using it directly and removing the
wrapper functions in the ni_660x and ni_mio_common modules.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:33 -08:00
H Hartley Sweeten
10f74377ee staging: comedi: ni_tio: make ni_tio_winsn() a proper comedi (*insn_write)
Change the parameters to ni_tio_winsn() to make it a proper comedi
(*insn_write) function. This allows using it directly and removing the
wrapper functions in the ni_660x and ni_mio_common modules.

For aesthetics, rename the function.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:33 -08:00
H Hartley Sweeten
9014d816e5 staging: comedi: ni_tio: make ni_tio_rinsn() a proper comedi (*insn_read)
Change the parameters to ni_tio_rinsn() to make is a proper comedi
(*insn_read) function. This allows using it directly and removing the
wrapper functions in the ni_660x and ni_mio_common modules.

For aesthetics, rename the function.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:33 -08:00
H Hartley Sweeten
00edbc31d8 staging: comedi: ni_tio.h: remove subdev_to_counter()
This inline helper function simply returns the s->private void *.
Remove the helper and just get the s->private void * directly where
needed.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:33 -08:00
H Hartley Sweeten
c2e11bb11d staging: comedi: ni_tio.h: remove 'extern' from exported function prototypes
The 'extern' is not required, remove it.

Tidy up the function prototypes a bit.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:33 -08:00
H Hartley Sweeten
f688d4a763 staging: comedi: ni_tio: move the MODULE_* stuff to the end of file
For aesthetics, move all the MODULE_* information to the end of the file.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:33 -08:00
H Hartley Sweeten
cafa814958 staging: comedi: ni_tiocmd: move the MODULE_* stuff to the end of file
For aesthetics, move all the MODULE_* information to the end of the file.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:33 -08:00
H Hartley Sweeten
fca7c1d753 staging: comedi: ni_tio: use a local var for the 'counter_index'
Use a local variable for the 'counter->counter_index' to help shorten the
long lines and ugly line breaks.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:33 -08:00
H Hartley Sweeten
5382bfb978 staging: comedi: ni_tiocmd: use a local var for the 'counter_index'
Use a local variable for the 'counter->counter_index' to help shorten the
long lines and ugly line breaks.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:33 -08:00
H Hartley Sweeten
e6b1624aae staging: comedi: ni_tio_internal.h: add missing NITIO_*_REG macro
The "HW Save" registers are the only ones missing an access macro.
Add one for completness.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:33 -08:00
H Hartley Sweeten
94baf025ba staging: comedi: ni_tio_internal.h: replace NITIO_Gi_Interrupt_Enable_Reg()
The "Interrupt Enable" registers are sequential in the enum ni_gpct_register.
Replace this inline CamelCase function with a simple define.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:33 -08:00
H Hartley Sweeten
c9d766d04a staging: comedi: ni_tio_internal.h: replace NITIO_Gi_Status_Reg()
The "Status" registers are sequential in the enum ni_gpct_register.
Replace this inline CamelCase function with a simple define.

Rename the define for the shared status register.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:32 -08:00
H Hartley Sweeten
e72ccb041b staging: comedi: ni_tio_internal.h: replace NITIO_Gi_Interrupt_Acknowledge_Reg()
The "Interrupt Acknowledge" registers are sequential in the enum ni_gpct_register.
Replace this inline CamelCase function with a simple define.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:32 -08:00
H Hartley Sweeten
ff157abe21 staging: comedi: ni_tio_internal.h: replace NITIO_Gi_ABZ_Reg()
The "ABZ" registers are sequential in the enum ni_gpct_register.
Replace this inline CamelCase function with a simple define.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:32 -08:00
H Hartley Sweeten
8cd3936e97 staging: comedi: ni_tio_internal.h: replace NITIO_Gi_DMA_Status_Reg()
The "DMA Status" registers are sequential in the enum ni_gpct_register.
Replace this inline CamelCase function with a simple define.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:32 -08:00
H Hartley Sweeten
1dd26c2152 staging: comedi: ni_tio_internal.h: replace NITIO_Gi_DMA_Config_Reg()
The "DMA Config" registers are sequential in the enum ni_gpct_register.
Replace this inline CamelCase function with a simple define.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:32 -08:00
H Hartley Sweeten
5f19efaca6 staging: comedi: ni_tio_internal.h: replace NITIO_Gxx_Joint_Status2_Reg()
The shared "Status2" registers are sequential in the enum ni_gpct_register.
Replace this inline CamelCase function with a simple define.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:32 -08:00
H Hartley Sweeten
450a7c43e8 staging: comedi: ni_tio_internal.h: replace NITIO_Gxx_Joint_Status1_Reg()
The shared "Status1" registers are sequential in the enum ni_gpct_register.
Replace this inline CamelCase function with a simple define.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:32 -08:00
H Hartley Sweeten
fc31c52f4c staging: comedi: ni_tio_internal.h: replace NITIO_Gxx_Joint_Reset_Reg()
The shared "Reset" registers are sequential in the enum ni_gpct_register.
Replace this inline CamelCase function with a simple define.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:32 -08:00
H Hartley Sweeten
96b6175aa3 staging: comedi: ni_tio_internal.h: replace NITIO_Gxx_Status_Reg()
The shared "Status" registers are sequential in the enum ni_gpct_register.
Replace this inline CamelCase function with a simple define.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:32 -08:00
H Hartley Sweeten
7a0894e0d4 staging: comedi: ni_tio_internal.h: replace NITIO_Gi_Second_Gate_Reg()
The "Second Gate" registers are sequential in the enum ni_gpct_register.
Replace this inline CamelCase function with a simple define.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:32 -08:00
H Hartley Sweeten
0412ea4696 staging: comedi: ni_tio_internal.h: replace NITIO_Gi_Counting_Mode_Reg()
The "Counting Mode" registers are sequential in the enum ni_gpct_register.
Replace this inline CamelCase function with a simple define.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:32 -08:00
H Hartley Sweeten
3da68f50f2 staging: comedi: ni_tio_internal.h: replace NITIO_Gi_Input_Select_Reg()
The "Input Select" registers are sequential in the enum ni_gpct_register.
Replace this inline CamelCase function with a simple define.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:32 -08:00
H Hartley Sweeten
cc7a164b16 staging: comedi: ni_tio_internal.h: replace NITIO_Gi_LoadB_Reg()
The "LoadB" registers are sequential in the enum ni_gpct_register.
Replace this inline CamelCase function with a simple define.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:32 -08:00
H Hartley Sweeten
720712f439 staging: comedi: ni_tio_internal.h: replace NITIO_Gi_LoadA_Reg()
The "LoadA" registers are sequential in the enum ni_gpct_register.
Replace this inline CamelCase function with a simple define.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:31 -08:00
H Hartley Sweeten
0101791e83 staging: comedi: ni_tio_internal.h: replace NITIO_Gi_Mode_Reg()
The "Mode" registers are sequential in the enum ni_gpct_register.
Replace this inline CamelCase function with a simple define.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:31 -08:00
H Hartley Sweeten
67c68de0f1 staging: comedi: ni_tio_internal.h: replace NITIO_Gi_SW_Save_Reg()
The "SW Save" registers are sequential in the enum ni_gpct_register.
Replace this inline CamelCase function with a simple define.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:31 -08:00
H Hartley Sweeten
e25ef74446 staging: comedi: ni_tio_internal.h: replace NITIO_Gi_Command_Reg()
The "Command" registers are sequential in the enum ni_gpct_register.
Replace this inline CamelCase function with a simple define.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:31 -08:00
H Hartley Sweeten
e062f51b79 staging: comedi: ni_tio_internal.h: replace NITIO_Gi_Autoincrement_Reg()
The "AutoIncrement" registers are sequential in the enum ni_gpct_register.
Replace this inline CamelCase function with a simple define.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:31 -08:00
H Hartley Sweeten
12375292ce staging: comedi: ni_tio.h: rename the CamelCase enum ni_gpct_register labels
As prefered by the CodingStyle, rename all the CamelCase labels of the
enum ni_gpct_register.

Cleanup all the helper functions in ni_tio_internal.h that used the enum.

The 'counter_index' parameter to all the functions is the ni_gpct_device
'counter_index' which is initialized when the subdevices are setup. This
value is always < 4 so the default: BUG() cases can never happen. For
aesthetics, rename the 'counter_idx' to simply 'idx' and fix the type in
some of the helpers.

Also, remove the unnecessary break statements after the return statements.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:49:31 -08:00
Gokulnath Avanashilingam
8b80448d47 staging: bcm: fixed warning about no and prohibited space in InterfaceIdleMode.c.
This patch fixes all the warning related to spacing issues
found by checkpatch.pl script in InterfaceIdleMode.c

Signed-off-by: Gokulnath Avanashilingam <Gokulnath.Avanashilingam@in.bosch.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:47:42 -08:00
Gokulnath Avanashilingam
e42ff08dd9 staging: bcm: using time_after and time_before in InterfaceIdleMode.c
Used the time_after and time_before insted of comparing
the jiffies directly.This will fix the warnings and errors
found by the checkpatch.pl script.

Signed-off-by: Gokulnath Avanashilingam <Gokulnath.Avanashilingam@in.bosch.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:47:42 -08:00
Gokulnath Avanashilingam
786bdddc36 staging: bcm: line over 80 characters in InterfaceIdleMode.c
Fixed all the line over 80 characters warning found by
checkpatch.pl script.

Signed-off-by: Gokulnath Avanashilingam <Gokulnath.Avanashilingam@in.bosch.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 11:47:42 -08:00