H Hartley Sweeten [Mon, 14 Jul 2014 19:07:03 +0000 (12:07 -0700)]
staging: comedi: ni_65xx: update the MODULE_DESCRIPTION
Update the MODULE_DESCRIPTION to better describe the driver.
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>
H Hartley Sweeten [Mon, 14 Jul 2014 19:07:02 +0000 (12:07 -0700)]
staging: comedi: ni_65xx: clean up multi-line comments
Clean up the multi-line comments at the beginning of the file so they
follow the kernel CodingStyle.
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>
H Hartley Sweeten [Mon, 14 Jul 2014 19:07:01 +0000 (12:07 -0700)]
staging: comedi: ni_65xx: tidy up the comedi_driver declaration
For aesthetics, add some whitespace to the comedi_driver declaration.
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>
H Hartley Sweeten [Mon, 14 Jul 2014 19:07:00 +0000 (12:07 -0700)]
staging: comedi: ni_65xx: tidy up the subdevice initialization
For aesthetics, add some whitespace to the subdevice init.
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>
H Hartley Sweeten [Mon, 14 Jul 2014 19:06:59 +0000 (12:06 -0700)]
staging: comedi: ni_65xx: tidy up the port<->chan conversions
Introduce some convienence macros to handle the port to channel,
channel to port, and channel mask calculations based on the 8
channels per port of the hardware.
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>
H Hartley Sweeten [Mon, 14 Jul 2014 19:06:58 +0000 (12:06 -0700)]
staging: comedi: ni_65xx: fix ni_65xx_intr_insn_config()
Refactor this function to follow the standard (*insn_config) form.
Add a sanity check of the number of data parameters (insn->n). Currently
the core does not check INSN_CONFIG_CHANGE_NOTIFY.
Fix the writes to the rise/fall edge enable registers. The macro expects
a "port" value not the port offset value.
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>
H Hartley Sweeten [Mon, 14 Jul 2014 19:06:57 +0000 (12:06 -0700)]
staging: comedi: ni_65xx: hook up command support only if irq is available
Subdevice 3 is used in this driver to provide edge detection of the input
channels.
Move the reset/disable of the interrupts and the request_irq() so that
when subdevice 3 is setup we can conditionally hookup the async command
support only if the irq is available.
Also, remove the noise when the irq is not available.
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>
H Hartley Sweeten [Mon, 14 Jul 2014 19:06:56 +0000 (12:06 -0700)]
staging: comedi: ni_65xx: remove the need for the subdevice private data
There is only one member in the subdevice private data, an unsigned value
that is the 'base_port' that the subdevice uses to access the port registers.
Just cast the appropriate value into s->private instead of allocating the
private data for each subdevice. The casts are a bit of a nusance but it
removes the unnecessary allocations.
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>
H Hartley Sweeten [Mon, 14 Jul 2014 19:06:55 +0000 (12:06 -0700)]
staging: comedi: ni_65xx: remove 'dio_direction' from private data
The IO Select registers are readable. Remove the need for the
'dio_direction' member in the private data by just checking the
register value for the INSN_CONFIG_DIO_QUERY instruction.
Also, refactor the switch statement to return -EINVAL for unhandled
instructions and have the (*insn_config) return insn->n normally.
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>
H Hartley Sweeten [Mon, 14 Jul 2014 19:06:54 +0000 (12:06 -0700)]
staging: comedi: ni_65xx: cleanup INSN_CONFIG_FILTER handling
The INSN_CONFIG_FILTER instruction is used to set the deglitch filter
interval used to debounce the input channels.
Absorb the helper function into the (*insn_config) function and refactor
the code to not require the 'filter_interval' and 'filter_enable' members
in the private data.
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>
H Hartley Sweeten [Mon, 14 Jul 2014 19:06:53 +0000 (12:06 -0700)]
staging: comedi: ni_65xx: cleanup recurring register map
Convert the inline functions used to calculate the offsets to the
recurring port registers and rename them to remove the CamelCase.
Define all the recurring registers.
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>
H Hartley Sweeten [Mon, 14 Jul 2014 19:06:52 +0000 (12:06 -0700)]
staging: comedi: ni_65xx: cleanup non-recurring register map defines
Rename the CamelCase defines used for the non-recurring registers.
Define all the non-recurring registers and bits.
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>
H Hartley Sweeten [Mon, 14 Jul 2014 19:06:51 +0000 (12:06 -0700)]
staging: comedi: ni_65xx: filter interval register is 32-bit
According to the register programming manual, the filter interval
register is 32-bit. Fix the writes to this 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>
Erik Arfvidson [Wed, 16 Jul 2014 20:03:20 +0000 (16:03 -0400)]
staging: unisys: added virtpci info entry
This patch adds the virtpci debugfs directory and the info entry
inside of it.
Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Mon, 14 Jul 2014 18:54:29 +0000 (11:54 -0700)]
staging: comedi: ni_670x: remove COMEDI_MITE and HAS_DMA dependancy
The mite module provides the DMA interface for the PCI MITE ASIC used on
many National Instruments DAQ boards. This driver does not use DMA and only
depends on the mite module to initialize the MITE ASIC.
Handle the initialization localy and remove the unnecessary dependancies.
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>
H Hartley Sweeten [Mon, 14 Jul 2014 18:54:28 +0000 (11:54 -0700)]
staging: comedi: ni_65xx: remove COMEDI_MITE and HAS_DMA dependancy
The mite module provides the DMA interface for the PCI MITE ASIC used on
many National Instruments DAQ boards. This driver does not use DMA and only
depends on the mite module to initialize the MITE ASIC.
Handle the initialization localy and remove the unnecessary dependancies.
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>
H Hartley Sweeten [Mon, 14 Jul 2014 18:54:27 +0000 (11:54 -0700)]
staging: comedi: ni_labpc_pci: remove COMEDI_MITE and HAS_DMA dependancy
The mite module provides the DMA interface for the PCI MITE ASIC used on
many National Instruments DAQ boards. This driver does not use DMA and only
depends on the mite module to initialize the MITE ASIC.
Handle the initialization localy and remove the unnecessary dependancies.
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>
H Hartley Sweeten [Mon, 14 Jul 2014 18:54:26 +0000 (11:54 -0700)]
staging: comedi: 8255_pci: remove include of mite.h
The mite.h header is included only to pickup the MITE_IODWBSR and WENAB defines
needed to set the data window (PCI BAR 1) when initializing the PCI MITE ASIC
on the National Instruments boards supported by this driver.
Remove the include of mite.h by adding the two defines locally in this driver.
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>
Chase Southwood [Sat, 12 Jul 2014 22:44:09 +0000 (17:44 -0500)]
staging: comedi: addi_apci_1564: use addi_watchdog module to init watchdog subdevice
Use the addi_watchdog module to provide support for the watchdog
subdevice.
Also, rearrange the subdevice init blocks so that the order makes sense.
Digital input/output subdevices and subdevices for DI/DO interrupt
support, followed by timer/counter/watchdog subdevices is the new order.
Signed-off-by: Chase Southwood <chase.southwood@gmail.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Cc: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Chase Southwood [Sat, 12 Jul 2014 22:42:36 +0000 (17:42 -0500)]
staging: comedi: addi_apci_1564: driver no longer needs to include addi_common.h
This driver no longer depends on anything in addi_common.h, save for a
few headers that it was including indirectly. Remove the include of
addi_common.h and add the includes of <linux/interrupt.h>
and <linux/sched.h> directly.
Signed-off-by: Chase Southwood <chase.southwood@gmail.com>
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
KANG Yuxuan [Wed, 16 Jul 2014 02:45:01 +0000 (10:45 +0800)]
staging: emxx_udc: Fix coding style errors
Only fixing errors reported by checkpatch.pl, based on the following
rules:
1. '*' should be adjacent to the data name or function name.
2. Don't use C99-style "// ..." comments.
Signed-off-by: KANG Yuxuan <stonekyx@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Peter Senna Tschudin [Tue, 15 Jul 2014 21:23:27 +0000 (23:23 +0200)]
staging: vt6556: Cleanup coding style: indentation
This patch cleanup the follwoing coding style issues:
- indentation style
- new line after declaration
Tested by compilation only.
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Peter Senna Tschudin [Tue, 15 Jul 2014 21:23:26 +0000 (23:23 +0200)]
staging: vt6556: Cleanup coding style: lines over 80 chars
This patch cleanup the follwoing coding style issues:
- line over 80 chars
- spaces on the beginning of a line
- put { and } on the correct places
Tested by compilation only.
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Peter Senna Tschudin [Tue, 15 Jul 2014 21:23:25 +0000 (23:23 +0200)]
staging: vt6556: Cleanup coding style: comments
This patch cleanup coding style issues on comments.
Tested by compilation only.
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Peter Senna Tschudin [Tue, 15 Jul 2014 21:23:24 +0000 (23:23 +0200)]
staging: vt6556: Cleanup coding style: #define
This patch cleanup coding style issues on #defines.
Tested by compilation only.
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Peter Senna Tschudin [Tue, 15 Jul 2014 20:46:48 +0000 (22:46 +0200)]
staging: vt6556: Cleanup indentation on statements
Use tabs instead of spaces in a set of statements and fix lines
over 80 chars. Reported by checkpatch.
Tested by compilation only.
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Tue, 15 Jul 2014 17:30:41 +0000 (13:30 -0400)]
staging: unisys: remove proc entries from /proc/visorchipset/controlvm
Remove the code that generates proc entries for the controlVM channel.
These entries are no longer necessary for debug.
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Kroah-Hartman [Wed, 16 Jul 2014 04:01:37 +0000 (21:01 -0700)]
Merge 'delete tidspbridge branch' into staging-next
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Kristina Martšenko [Tue, 15 Jul 2014 23:30:19 +0000 (02:30 +0300)]
ARM: OMAP2+: remove DSP platform device
It was added to support DSP Bridge. Since DSP Bridge was removed, and
nothing else is using the platform device, remove it too.
Signed-off-by: Kristina Martšenko <kristina.martsenko@gmail.com>
Cc: Omar Ramirez Luna <omar.ramirez@copitl.com>
Cc: Suman Anna <s-anna@ti.com>
Cc: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Kristina Martšenko [Tue, 15 Jul 2014 23:30:18 +0000 (02:30 +0300)]
staging: tidspbridge: remove driver
The driver has been broken and disabled for several kernel versions now.
It doesn't have a maintainer anymore, and most of the people who've
worked on it have moved on. There's also still a long list of issues in
the TODO file before it can be moved out of staging. Until someone can
put in the work to make the driver work again and move it out of
staging, remove it from the kernel.
Signed-off-by: Kristina Martšenko <kristina.martsenko@gmail.com>
Cc: Omar Ramirez Luna <omar.ramirez@copitl.com>
Cc: Suman Anna <s-anna@ti.com>
Cc: Felipe Contreras <felipe.contreras@gmail.com>
Cc: Ohad Ben-Cohen <ohad@wizery.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Adithya Krishnamurthy [Tue, 15 Jul 2014 16:48:20 +0000 (22:18 +0530)]
Staging:tidspbridge Fix minor checkpatch.pl warining Unnecessary parentheses
Fixed checkpatch "WARNING: Unnecessary parentheses"
Signed-off-by: Adithya Krishnamurthy <linux.challenge1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Adithya Krishnamurthy [Tue, 15 Jul 2014 16:48:19 +0000 (22:18 +0530)]
Staging:tidspbridge Fix minor checkpatch.pl warning unnecessary whitespace before a quoted newline
Fixed checkpatch "WARNING: unnecessary whitespace before a quoted newline"
Signed-off-by: Adithya Krishnamurthy <linux.challenge1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Adithya Krishnamurthy [Tue, 15 Jul 2014 16:48:18 +0000 (22:18 +0530)]
Staging:tidspbridge Fix checkpatch.pl warning char * array declaration might be better as static const
Fixed checkpatch "WARNING: char * array declaration might be better as static const"
Signed-off-by: Adithya Krishnamurthy <linux.challenge1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Kinka Huang [Tue, 15 Jul 2014 15:11:02 +0000 (23:11 +0800)]
staging: comedi: removing not useful `else` after return
Signed-off-by: Kinka Huang <kinkabrain@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Tue, 15 Jul 2014 18:54:43 +0000 (19:54 +0100)]
staging: vt6656: usbpipe irrelevant function descriptions
All these have no or vague meaning.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Tue, 15 Jul 2014 18:54:42 +0000 (19:54 +0100)]
staging: vt6656: rename s_nsBulkInUsbIoCompleteRead to vnt_submit_rx_urb_complete
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Tue, 15 Jul 2014 18:54:41 +0000 (19:54 +0100)]
staging: vt6656: rename PIPEnsBulkInUsbRead to vnt_submit_rx_urb
The function just submits to rx urbs.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Tue, 15 Jul 2014 18:54:40 +0000 (19:54 +0100)]
staging: vt6656: rename s_nsBulkOutIoCompleteWrite to vnt_tx_context_complete
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Tue, 15 Jul 2014 18:54:39 +0000 (19:54 +0100)]
staging: vt6656: rename PIPEnsSendBulkOut to vnt_tx_context.
We are just tx the context
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Tue, 15 Jul 2014 18:54:38 +0000 (19:54 +0100)]
staging: vt6656: rename s_nsInterruptUsbIoCompleteRead to vnt_start_interrupt_urb_complete
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Tue, 15 Jul 2014 18:54:37 +0000 (19:54 +0100)]
staging: vt6656: usbpipe rename PIPEnsInterruptRead to vnt_start_interrupt_urb
Drop Read and PIPE. The function starts the interrupt urb.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Tue, 15 Jul 2014 18:54:36 +0000 (19:54 +0100)]
staging: vt6656: int.c remove irrelevant function description
The function does not directly poll from here
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Tue, 15 Jul 2014 18:54:35 +0000 (19:54 +0100)]
staging: vt6656: rename INTvWorkItem to vnt_int_start_interrupt
This function does run as work item, it starts interrupts from the
device.
Rename to vnt_int_start_interrupt
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Tue, 15 Jul 2014 18:54:34 +0000 (19:54 +0100)]
staging: vt6656: int rename INTnsProcessData to vnt_int_process_data
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Tue, 15 Jul 2014 18:54:33 +0000 (19:54 +0100)]
staging: vt6656: int.c Replace DBG_PRT debug messages
Replace with dev_dbg
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Tue, 15 Jul 2014 18:54:32 +0000 (19:54 +0100)]
staging: vt6656: INTvWorkItem remove camel case
Camel case changes
pDevice -> priv
ntStatus -> status
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lucas Tanure [Mon, 14 Jul 2014 00:31:05 +0000 (21:31 -0300)]
staging: android: Clean up else statement from binder_send_failed_reply
Kernel coding style. Remove useless else statement after return.
Changes from v1 and v2: Fix warning for mixed declarations and code.
Declaration of "struct binder_transaction *next" made outside of while.
Changes from v3: Removed initialization to NULL for next variable.
Signed-off-by: Lucas Tanure <tanure@linux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lucas Tanure [Tue, 15 Jul 2014 03:32:35 +0000 (00:32 -0300)]
staging: android: Clean up else statement from sync_fence_poll()
Kernel coding style. Remove useless else statement after return.
Signed-off-by: Lucas Tanure <tanure@linux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Rahul Bedarkar [Mon, 14 Jul 2014 17:21:15 +0000 (22:51 +0530)]
staging: octeon: fix coding style
This patch fixes checkpatch.pl warning. Add blank line after
declaration.
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Joerg C. Meyer [Mon, 14 Jul 2014 14:48:50 +0000 (16:48 +0200)]
Staging: rtl8821ae: delete unneeded lines in cam.c
This is a patch to the cam.c file that removes some unneeded lines of commented-out code
Signed-off-by: Joerg C. Meyer <joerg@meyer.homedns.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Daeseok Youn [Tue, 15 Jul 2014 09:50:37 +0000 (18:50 +0900)]
staging: dgap: remove dgap_newnode()
The dgap_newnode() is useless for creating new node.
So just use kzalloc and set a type in case statement.
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Daeseok Youn [Tue, 15 Jul 2014 09:49:52 +0000 (18:49 +0900)]
staging: dgap: remove unused a parameter in dgap_gettok()
The "p" as parameter is unused.
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Daeseok Youn [Tue, 15 Jul 2014 09:49:09 +0000 (18:49 +0900)]
staging: dgap: fix a typo in dgap_gettok()
The "boar" should be "board".
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Daeseok Youn [Tue, 15 Jul 2014 09:48:25 +0000 (18:48 +0900)]
staging: dgap: remove unused case value in dgap_parsefile()
If rc is zero, this function will returns with an error and
cannot reach switch-case statement.
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Daeseok Youn [Tue, 15 Jul 2014 09:47:11 +0000 (18:47 +0900)]
staging: dgap: remove redundant error value check
The retval in dgap_block_til_ready() is initialized to zero,
and if no error has occurred in this function, the retval has a zero.
So it doesn't need to check "retval" itself.
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Tue, 15 Jul 2014 07:43:15 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Shortened lines
This patch shortenes all lines where possible without code refactoring,
as well as comment lines. It does not change the wording of comments.
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Tue, 15 Jul 2014 07:43:14 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Replaced if-else return code with simple return assertion
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Tue, 15 Jul 2014 07:43:13 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Replaced member accessing with variable in CreateSFToClassifierRuleMapping()
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Tue, 15 Jul 2014 07:43:12 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Simplified nested if statements by linking them with logical AND in GetPhsRuleEntry()
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Tue, 15 Jul 2014 07:43:11 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Simplified nested if statements by linking them with logical AND in GetServiceFlowEntry()
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Tue, 15 Jul 2014 07:43:10 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Simplified nested if statements by linking them with logical AND in GetServiceFlowEntry()
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Tue, 15 Jul 2014 07:43:09 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Replaced member accessing with variable in GetServiceFlowEntry()
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Tue, 15 Jul 2014 07:43:08 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Added const keyword to ValidatePHSRUleComplete() argument
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Tue, 15 Jul 2014 07:43:07 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Rewrote ValidatePHSRuleComplete()
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Tue, 15 Jul 2014 07:43:06 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Replaced indentation level with goto jump on bad condition
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Tue, 15 Jul 2014 07:43:05 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Replaced member accessing with variable in free_phs_service()
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Tue, 15 Jul 2014 07:43:04 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Added missing braces around else block
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Tue, 15 Jul 2014 07:43:03 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Whitespace cleanup in PhsCompress()
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Tue, 15 Jul 2014 07:43:02 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Replaced member accessing with variables
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Tue, 15 Jul 2014 07:43:01 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Reduced indentation by using jump label in PhsDeleteSFRules()
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Tue, 15 Jul 2014 07:43:00 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Shortened lines
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Tue, 15 Jul 2014 07:42:59 +0000 (09:42 +0200)]
Staging: bcm: PHSModule.c: Reduced indentation level by using jump label
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Tue, 15 Jul 2014 07:42:58 +0000 (09:42 +0200)]
Staging: bcm: PHSModule.c: Replaced nested if statements with logical AND concatenation of the conditions
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Tue, 15 Jul 2014 07:42:57 +0000 (09:42 +0200)]
Staging: bcm: PHSModule.c: Replaced member accessing with variable in PhsDeletePHSRule()
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Tue, 15 Jul 2014 07:42:56 +0000 (09:42 +0200)]
Staging: bcm: PHSModule.c: Outsourced debug printing for phs classifier entry
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Tue, 15 Jul 2014 07:42:55 +0000 (09:42 +0200)]
Staging: bcm: PHSModule.c: Outsourced debug printing in own function
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Tue, 15 Jul 2014 07:42:54 +0000 (09:42 +0200)]
Staging: bcm: PHSModule.c: Whitespace & Indentation cleanup
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Peter Senna Tschudin [Mon, 14 Jul 2014 19:15:29 +0000 (21:15 +0200)]
staging: vt6556: Remove double parentheses
This patch cleanup a checkpatch warning by removing double parentheses
from if condition. Additionally it fixes a line over 80 chars.
Tested by compilation only.
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Mon, 14 Jul 2014 18:43:06 +0000 (19:43 +0100)]
staging: vt6656: set BBvSetAntennaMode in device_init_registers
BBvSetAntennaMode is not set at all, set to byRxAntennaMode
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Mon, 14 Jul 2014 18:43:05 +0000 (19:43 +0100)]
staging: vt6656: device.h remove old wireless stats
These are dead nolonger of use.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Chen Gang [Mon, 14 Jul 2014 11:59:13 +0000 (19:59 +0800)]
drivers: staging: lustre: Use 'force_die' instead of 'die' to avoid compiling issue
Some of architectures have already defined 'die' as macro, so can not
use it as declaration or definition in other modules, or it will cause
compiling issue.
So use more precise name 'force_die' (like 'wrap_bulk') instead of. And
the related error (with allmodconfig under score):
CC [M] drivers/staging/lustre/lustre/ptlrpc/sec.o
drivers/staging/lustre/lustre/ptlrpc/sec.c: In function 'sptlrpc_cli_ctx_expire':
drivers/staging/lustre/lustre/ptlrpc/sec.c:309:13: error: 'struct ptlrpc_ctx_ops' has no member named '__die'
ctx->cc_ops->die(ctx, 0);
^
drivers/staging/lustre/lustre/ptlrpc/sec.c: In function 'ctx_refresh_timeout':
drivers/staging/lustre/lustre/ptlrpc/sec.c:594:26: error: 'struct ptlrpc_ctx_ops' has no member named '__die'
req->rq_cli_ctx->cc_ops->die(req->rq_cli_ctx, 0);
^
make[5]: *** [drivers/staging/lustre/lustre/ptlrpc/sec.o] Error 1
make[4]: *** [drivers/staging/lustre/lustre/ptlrpc] Error 2
make[3]: *** [drivers/staging/lustre/lustre] Error 2
make[2]: *** [drivers/staging/lustre] Error 2
make[1]: *** [drivers/staging] Error 2
make: *** [drivers] Error 2
Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Kroah-Hartman [Sun, 13 Jul 2014 22:35:56 +0000 (15:35 -0700)]
Merge 3.16-rc5 into staging-next
We want the fixes in -rc5 in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Linus Torvalds [Sun, 13 Jul 2014 21:04:33 +0000 (14:04 -0700)]
Linux 3.16-rc5
Linus Torvalds [Sun, 13 Jul 2014 20:14:55 +0000 (13:14 -0700)]
Merge tag 'ext4_for_linus_stable' of git://git./linux/kernel/git/tytso/ext4
Pull ext4 bugfixes from Ted Ts'o:
"More bug fixes for ext4 -- most importantly, a fix for a bug
introduced in 3.15 that can end up triggering a file system corruption
error after a journal replay.
It shouldn't lead to any actual data corruption, but it is scary and
can force file systems to be remounted read-only, etc"
* tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: fix potential null pointer dereference in ext4_free_inode
ext4: fix a potential deadlock in __ext4_es_shrink()
ext4: revert commit which was causing fs corruption after journal replays
ext4: disable synchronous transaction batching if max_batch_time==0
ext4: clarify ext4_error message in ext4_mb_generate_buddy_error()
ext4: clarify error count warning messages
ext4: fix unjournalled bg descriptor while initializing inode bitmap
Greg Kroah-Hartman [Sun, 13 Jul 2014 19:31:47 +0000 (12:31 -0700)]
Merge tag 'iio-for-3.17c' of git://git./linux/kernel/git/jic23/iio into staging-next
Jonathan writes:
3rd round of IIO new drivers, cleanups and functionality for the 3.17 cycle.
New drivers
* isl29125 digital color light sensor driver
* TAOS/AMS tcs3414 digital color sensor
Staging graduation
* ad7291 ADC driver.
New functionality
* st_sensors - device tree support and bindings
* mma8452 - device tree support
Cleanups
* Drop redundant variables in a number of drivers.
* Reorder a structure definition to ealy wiht a warning about static
not being at the beginning in the hid-sensors driver.
* Switch a few more drivers away from using explicit sampling_frequency
attribute to providing this through the core.
* Make hid_sensor_get_reporting_interval static as only used within a single
file.
* Drop a redundant check for negative values in an unsigned variable from
ad9832
* Drop some duplicate case labels in the event monitor example code.
* Use devm_ioremap_resource to simplify error handling.
* Use devm_kzalloc within the blackfin timer driver to simplify error
handling and removal.
* A number of cleanups of the ad7291 from Hartmut Knaack in response
to a patch moving it out of staging.
* Core support for the period info element about events. It has been
in the abi for a while, but not added until now to the newer handling
of information related to events.
* Add HAS_IOMEM dependency to mxs_lradc to avoid build issues when testing
enabled.
navin patidar [Sun, 13 Jul 2014 14:29:38 +0000 (19:59 +0530)]
staging: rtl8188eu: Rename _rtw_init_mlme_priv() to rtw_init_mlme_priv()
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 13 Jul 2014 14:29:37 +0000 (19:59 +0530)]
staging: rtl8188eu: Rename _rtw_free_mlme_priv() to rtw_free_mlme_priv()
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 13 Jul 2014 14:29:36 +0000 (19:59 +0530)]
staging: rtl8188eu: Remove unused function _rtw_enqueue_network()
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 13 Jul 2014 14:29:35 +0000 (19:59 +0530)]
staging: rtl8188eu: Remove unused function _rtw_dequeue_network()
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 13 Jul 2014 14:29:34 +0000 (19:59 +0530)]
staging: rtl8188eu: Make _rtw_free_network() static
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 13 Jul 2014 14:29:33 +0000 (19:59 +0530)]
staging: rtl8188eu: Rename _rtw_find_network() to rtw_find_network()
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 13 Jul 2014 14:29:32 +0000 (19:59 +0530)]
staging: rtl8188eu: Rename _rtw_free_network_queue() to rtw_free_network_queue()
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 13 Jul 2014 14:29:31 +0000 (19:59 +0530)]
staging: rtl8188eu: Remove unused function rtw_get_timestampe_from_ie()
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 13 Jul 2014 14:29:30 +0000 (19:59 +0530)]
staging: rtl8188eu: Remove unused function _rtw_IOL_append_WW_cmd()
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 13 Jul 2014 14:29:29 +0000 (19:59 +0530)]
staging: rtl8188eu: Remove unused function rtw_set_802_11_remove_wep()
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 13 Jul 2014 14:29:28 +0000 (19:59 +0530)]
staging: rtl8188eu: Remove unused function rtw_set_802_11_remove_key()
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 13 Jul 2014 14:29:27 +0000 (19:59 +0530)]
staging: rtl8188eu: Remove unused function rtw_set_802_11_add_key()
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 13 Jul 2014 14:29:26 +0000 (19:59 +0530)]
staging: rtl8188eu: Remove unused function rtw_validate_ssid()
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 13 Jul 2014 14:29:25 +0000 (19:59 +0530)]
staging: rtl8188eu: Remove unused function rtw_set_scan_mode()
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 13 Jul 2014 14:29:24 +0000 (19:59 +0530)]
staging: rtl8188eu: Remove function rtw_set_channel_plan()
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>