]> git.karo-electronics.de Git - linux-beck.git/log
linux-beck.git
10 years agostaging: comedi: ni_660x: use cfc_handle_events()
H Hartley Sweeten [Sat, 8 Mar 2014 00:31:41 +0000 (17:31 -0700)]
staging: comedi: ni_660x: use cfc_handle_events()

Use the comedi_fc helper function instead of duplicating the code.

In the Kconfig, COMEDI_NI_660X selects COMEDI_FC indirectly by selecting
COMEDI_NI_TIOCMD which selects COMEDI_MITE which selects COMEDI_FC.

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>
10 years agostaging: comedi: pcl818: use cfc_handle_events()
H Hartley Sweeten [Sat, 8 Mar 2014 00:31:40 +0000 (17:31 -0700)]
staging: comedi: pcl818: use cfc_handle_events()

Use the comedi_fc helper function to automatically call the subdevice
(*cancel) function when needed and call comedi_event().

Update the Kconfig so that COMEDI_PCL818 selects COMEDI_FC.

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>
10 years agostaging: comedi: pcl816: use cfc_handle_events()
H Hartley Sweeten [Sat, 8 Mar 2014 00:31:39 +0000 (17:31 -0700)]
staging: comedi: pcl816: use cfc_handle_events()

Use the comedi_fc helper function to automatically call the subdevice
(*cancel) function when needed and call comedi_event().

Update the Kconfig so that COMEDI_PCL816 selects COMEDI_FC.

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>
10 years agostaging: comedi: pcl812: use cfc_handle_events()
H Hartley Sweeten [Sat, 8 Mar 2014 00:31:38 +0000 (17:31 -0700)]
staging: comedi: pcl812: use cfc_handle_events()

Use the comedi_fc helper function to automatically call the subdevice
(*cancel) function when needed and call comedi_event().

Update the Kconfig so that COMEDI_PCL812 selects COMEDI_FC.

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>
10 years agostaging: comedi: cb_pcidas: use cfc_handle_events()
H Hartley Sweeten [Sat, 8 Mar 2014 00:31:37 +0000 (17:31 -0700)]
staging: comedi: cb_pcidas: use cfc_handle_events()

Use the comedi_fc helper function to automatically call the subdevice
(*cancel) function when needed and call comedi_event().

Also, remove the clearing of the events, comedi_event() does that.

In the Kconfig, COMEDI_CB_PCIDAS already selects COMEDI_FC.

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>
10 years agostaging: comedi: amplc_pci224: use cfc_handle_events()
H Hartley Sweeten [Sat, 8 Mar 2014 00:31:36 +0000 (17:31 -0700)]
staging: comedi: amplc_pci224: use cfc_handle_events()

Use the comedi_fc helper function to automatically call the subdevice
(*cancel) function when needed and call comedi_event().

In the Kconfig, COMEDI_AMPLC_PCI224 already selects COMEDI_FC.

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>
10 years agostaging: comedi: ni_mio_common: use cfc_handle_events()
H Hartley Sweeten [Sat, 8 Mar 2014 00:31:35 +0000 (17:31 -0700)]
staging: comedi: ni_mio_common: use cfc_handle_events()

The ni_event() function in this file is an open coded version of
cfc_handle_events() where instead of calling the subdevice (*cancel)
function a switch is used to call the function based on the subdevice
'index'.

Use the comedi_fc helper function to simplify the code.

This also allows removing a couple of the forward declarations.

Fix the #ifdef/#endif for the ni_gpct_cancel() foward declaration and
around the function. This function is now only referenced by code that
is blocked with #ifdef PCIDMA.

This source file is included by the ni_atmio, ni_mio_cs, and ni_pcimio
drivers. In the Kconfig, the config options for these drivers already
select COMEDI_FC.

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>
10 years agostaging: comedi: ni_at_a2150: use cfc_handle_events()
H Hartley Sweeten [Sat, 8 Mar 2014 00:31:34 +0000 (17:31 -0700)]
staging: comedi: ni_at_a2150: use cfc_handle_events()

Use the comedi_fc helper function to automatically call the subdevice
(*cancel) function when needed and call comedi_event().

Also, remove the clearing of the events, comedi_event() does that.

In the Kconfig, COMEDI_NI_AT_A2150 already selects COMEDI_FC.

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>
10 years agostaging: comedi: dt282x: use cfc_handle_events()
H Hartley Sweeten [Sat, 8 Mar 2014 00:31:33 +0000 (17:31 -0700)]
staging: comedi: dt282x: use cfc_handle_events()

Use the comedi_fc helper function to automatically call the subdevice
(*cancel) function when needed and call comedi_event().

This also fixes two bugs.
  1) the analog input command is canceled due to a buffer overflow
     without sending an event (@@ -341,7 +340,7 @@).
  2) an analog output error causes the command to cancel but the event
     is reported to the analog input subdevice (@@ -449,15 +447,13 @@).

In the Kconfig, COMEDI_DT282X already selects COMEDI_FC.

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>
10 years agostaging: comedi: das1800: use cfc_handle_events()
H Hartley Sweeten [Sat, 8 Mar 2014 00:31:32 +0000 (17:31 -0700)]
staging: comedi: das1800: use cfc_handle_events()

Use the comedi_fc helper function to automatically call the subdevice
(*cancel) function when needed and call comedi_event().

In the Kconfig, COMEDI_DAS1800 already selects COMEDI_FC.

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>
10 years agostaging: comedi: das800: use cfc_handle_events()
H Hartley Sweeten [Sat, 8 Mar 2014 00:31:31 +0000 (17:31 -0700)]
staging: comedi: das800: use cfc_handle_events()

Use the comedi_fc helper function to automatically call the subdevice
(*cancel) function when needed and call comedi_event().

Also, remove the clearing of the event, comedi_event() does that.

In the Kconfig, COMEDI_DAS800 already selects COMEDI_FC.

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>
10 years agostaging: comedi: das16m1: use cfc_handle_events()
H Hartley Sweeten [Sat, 8 Mar 2014 00:31:30 +0000 (17:31 -0700)]
staging: comedi: das16m1: use cfc_handle_events()

Use the comedi_fc helper function to automatically call the subdevice
(*cancel) function when needed and call comedi_event().

In the Kconfig, COMEDI_DAS16M1 already selects COMEDI_FC.

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>
10 years agostaging: comedi: adv_pci1710: use cfc_handle_events()
H Hartley Sweeten [Sat, 8 Mar 2014 00:31:29 +0000 (17:31 -0700)]
staging: comedi: adv_pci1710: use cfc_handle_events()

Use the comedi_fc helper function to automatically call the subdevice
(*cancel) function when needed and call comedi_event().

Update the Kconfig to select COMEDI_FC when COMEDI_ADL_PCI9111 is enabled.

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>
10 years agostaging: comedi: adl_pci9111: use cfc_handle_events()
H Hartley Sweeten [Sat, 8 Mar 2014 00:31:28 +0000 (17:31 -0700)]
staging: comedi: adl_pci9111: use cfc_handle_events()

Use the comedi_fc helper function to automatically call the subdevice
(*cancel) function when needed and call comedi_event().

In the Kconfig, COMEDI_ADL_PCI9111 already selects COMEDI_FC.

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>
10 years agostaging: comedi: adl_pci9118: use cfc_handle_events()
H Hartley Sweeten [Sat, 8 Mar 2014 00:31:27 +0000 (17:31 -0700)]
staging: comedi: adl_pci9118: use cfc_handle_events()

Use the comedi_fc helper function to automatically call the subdevice
(*cancel) function when needed and call comedi_event().

In the Kconfig, COMEDI_ADL_PCI9118 already selects COMEDI_FC.

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>
10 years agostaging: comedi: mite: use cfc_inc_scan_progress()
H Hartley Sweeten [Sat, 8 Mar 2014 00:31:26 +0000 (17:31 -0700)]
staging: comedi: mite: use cfc_inc_scan_progress()

Use the comedi_fc helper function instead of duplicating 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>
10 years agostaging: comedi: comedi_fc: export increment_scan_progress()
H Hartley Sweeten [Sat, 8 Mar 2014 00:31:25 +0000 (17:31 -0700)]
staging: comedi: comedi_fc: export increment_scan_progress()

Rename this function to cfc_inc_scan_progress() and export it for
use by the comedi drivers.

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>
10 years agostaging: comedi: comedi_fc: export cfc_bytes_per_scan()
H Hartley Sweeten [Sat, 8 Mar 2014 00:31:24 +0000 (17:31 -0700)]
staging: comedi: comedi_fc: export cfc_bytes_per_scan()

This helper function is a bit long to be inlined. Move it to the
source file and export it.

The mite driver is the only external user right now. Update the
Kconfig to select COMEDI_FC when COMEDI_MITE is enabled.

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>
10 years agostaging: comedi: comedi_fc: tidy up cfc_bytes_per_scan()
H Hartley Sweeten [Sat, 8 Mar 2014 00:31:23 +0000 (17:31 -0700)]
staging: comedi: comedi_fc: tidy up cfc_bytes_per_scan()

This function returns the total number of bytes for a full scan of
an async command chanlist. The returned value is an unsigned int.

Change all the local variables to unsigned int and use a local
variable for the s->async->cmd.chanlist_len.

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>
10 years agostaging: comedi: comedi_fc: rename comedi_subdevice variables in header
H Hartley Sweeten [Sat, 8 Mar 2014 00:31:22 +0000 (17:31 -0700)]
staging: comedi: comedi_fc: rename comedi_subdevice variables in header

Typically the comedi_subdevice variable is simply named 's'. Rename
the variables in comedi_fc.h.

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>
10 years agostaging: comedi: comedi_fc: remove 'extern' from function prototypes
H Hartley Sweeten [Sat, 8 Mar 2014 00:31:21 +0000 (17:31 -0700)]
staging: comedi: comedi_fc: remove 'extern' from function prototypes

The 'extern' is not needed in the prototypes for the exported functions
in the header. Remove it.

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>
10 years agostaging: comedi: comedi_fc: tidy up multi-line comment in header
H Hartley Sweeten [Sat, 8 Mar 2014 00:31:20 +0000 (17:31 -0700)]
staging: comedi: comedi_fc: tidy up multi-line comment in header

Tidy up the multi-line comment to follow the 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>
10 years agostaging: comedi: comedi_fc: remove unnecessary prefix in dev_warn() message
H Hartley Sweeten [Sat, 8 Mar 2014 00:31:19 +0000 (17:31 -0700)]
staging: comedi: comedi_fc: remove unnecessary prefix in dev_warn() message

The dev_warn() will automatically have the "comedi" prefix.

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>
10 years agostaging: comedi: comedi_fc: rename comedi_subdevice variables
H Hartley Sweeten [Sat, 8 Mar 2014 00:31:18 +0000 (17:31 -0700)]
staging: comedi: comedi_fc: rename comedi_subdevice variables

Typically the comedi_subdevice variable is simply named 's'. Rename
the variables in this 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>
10 years agostaging: comedi: comedi_fc: tidy up multi-line comment
H Hartley Sweeten [Sat, 8 Mar 2014 00:31:17 +0000 (17:31 -0700)]
staging: comedi: comedi_fc: tidy up multi-line comment

Tidy up the multi-line comment to follow the 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>
10 years agostaging: comedi: comedi_fc: tidy up module init
H Hartley Sweeten [Sat, 8 Mar 2014 00:31:16 +0000 (17:31 -0700)]
staging: comedi: comedi_fc: tidy up module init

For aesthetics, move the MODULE_* information to the end of the file
and move the module_{init,exit}() after the functions.

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>
10 years agostaging: comedi: jr3_pci: remove 'channel_no' from subdevice private data
H Hartley Sweeten [Fri, 7 Mar 2014 20:41:08 +0000 (13:41 -0700)]
staging: comedi: jr3_pci: remove 'channel_no' from subdevice private data

This member of the subdevice private data is just the subdevice 'index'. Use
that instead and remove the member.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: jr3_pci: rename struct poll_delay_t
H Hartley Sweeten [Fri, 7 Mar 2014 20:41:07 +0000 (13:41 -0700)]
staging: comedi: jr3_pci: rename struct poll_delay_t

Rename this private struct so it has namespace associated with the
driver.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: jr3_pci: rename struct transform_t
H Hartley Sweeten [Fri, 7 Mar 2014 20:41:06 +0000 (13:41 -0700)]
staging: comedi: jr3_pci: rename struct transform_t

Rename this private struct so it has namespace associated with the
driver.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: jr3_pci: remove 'n_channels' from private data
H Hartley Sweeten [Fri, 7 Mar 2014 20:41:05 +0000 (13:41 -0700)]
staging: comedi: jr3_pci: remove 'n_channels' from private data

This member of the private data is actually the number of subdevices. We
can get that information directly from the comedi_device. Do that instead
and remove the unnecessary member from the private data.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: jr3_pci: introduce boardinfo for the supported boards
H Hartley Sweeten [Tue, 11 Mar 2014 17:03:31 +0000 (10:03 -0700)]
staging: comedi: jr3_pci: introduce boardinfo for the supported boards

Create an enum for the boards supported by this driver and pass that enum in
the pci_driver id_table as the driver_data.

Introduce a boardinfo struct to hold the board specific data for the boards
supported by this driver. Use the boardinfo when attaching to the driver
instead of using the pcidev->device and the switch.

Since the PCI device ids are now only used in the id_table, remove the
defines and open code the device ids.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: jr3_pci: tidy up jr3_pci_ai_insn_read()
H Hartley Sweeten [Fri, 7 Mar 2014 20:41:03 +0000 (13:41 -0700)]
staging: comedi: jr3_pci: tidy up jr3_pci_ai_insn_read()

Refactor this function to make it clearer.

The channel does not need to be validated. The comedi core does that for us.

Exit early if the subdevice private data is invalid.

Exit early if the subdevice 'state' is not done or there is an error.

Factor out the code that actually reads the channel data to reduce the
indent level.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: jr3_pci: tidy up jr3_pci_open()
H Hartley Sweeten [Fri, 7 Mar 2014 20:41:02 +0000 (13:41 -0700)]
staging: comedi: jr3_pci: tidy up jr3_pci_open()

For aesthetics, rename the subdevice private data pointer from 'p' to
'spriv' and add a local variable for the comedi_subdevice pointer.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: jr3_pci: tidy up jr3_download_firmware()
H Hartley Sweeten [Fri, 7 Mar 2014 20:41:01 +0000 (13:41 -0700)]
staging: comedi: jr3_pci: tidy up jr3_download_firmware()

This callback function for comedi_load_firmware() first validates that
the firmware data is the correct format then it writes the data to each
subdevice.

Split the two operations out as separate functions to clarify the code.
Tidy up the new functions.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: jr3_pci: tidy up jr3_pci_poll_subdevice()
H Hartley Sweeten [Fri, 7 Mar 2014 20:41:00 +0000 (13:41 -0700)]
staging: comedi: jr3_pci: tidy up jr3_pci_poll_subdevice()

Refactor the function to reduce the indent level.

For aesthetics, rename the subdevice private data pointer from 'p'
to 'spriv'.

Rename the lacal variable used for the channel->full_scale to 'fs'
to reduce the line lengths.

Remove the setting of range[8]. The min,max values are the same as
the ones used when the subdevice private data was allocated and
initialized.

Remove the poll_delay_min_max() that are the same as the default.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: jr3_pci: tidy up jr3_pci_poll_dev()
H Hartley Sweeten [Fri, 7 Mar 2014 20:40:59 +0000 (13:40 -0700)]
staging: comedi: jr3_pci: tidy up jr3_pci_poll_dev()

For aesthetics, rename the subdevice private data pointer from 'subdevpriv'
to 'spriv' and add a local variable for the comedi_subdevice pointer.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: jr3_pci: rename some local vars in the (*attach)
H Hartley Sweeten [Fri, 7 Mar 2014 20:40:58 +0000 (13:40 -0700)]
staging: comedi: jr3_pci: rename some local vars in the (*attach)

For aesthetics, rename the subdevice private data pointer from 'p'
to 'spriv' and the variable used to check the errno from 'result'
to 'ret'.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: jr3_pci: factor subdevice private data init out of (*attach)
H Hartley Sweeten [Fri, 7 Mar 2014 20:40:57 +0000 (13:40 -0700)]
staging: comedi: jr3_pci: factor subdevice private data init out of (*attach)

Factor the code that allocates and initializes the subdevice private data
out of the (*attach) to reduce the indent level and make the code easier
to follow.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: jr3_pci: use comedi_alloc_spriv()
H Hartley Sweeten [Fri, 7 Mar 2014 20:40:56 +0000 (13:40 -0700)]
staging: comedi: jr3_pci: use comedi_alloc_spriv()

Use the helper function to allocate the subdevice private data. This
sets the s->private variable for us and allows the comedi core to
automatically kfree() the memory during the (*detach).

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: jr3_pci: tidy up subdevice init
H Hartley Sweeten [Fri, 7 Mar 2014 20:40:55 +0000 (13:40 -0700)]
staging: comedi: jr3_pci: tidy up subdevice init

For aesthetics, use a pointer to the comedi_subdevice instead of
accessing the dev->subdevices array directly.

Move the local variable for the subdevice private data so that
this function does not declare the variable twice.

Change the kzalloc for the subdevice private data to remove the
sizeof(struct foo).

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: comedi_fops: introduce __comedi_get_user_chanlist()
H Hartley Sweeten [Thu, 6 Mar 2014 19:02:57 +0000 (12:02 -0700)]
staging: comedi: comedi_fops: introduce __comedi_get_user_chanlist()

The COMEDI_CMD and COMEDI_CMDTEST ioctl functions both copy the chanlist
passed by the user from __user memory space to kernel memory space. They
then do some sanity checking of the chanlist with comedi_check_chanlist()
before the subdevice (*do_cmdtest) and (*do_cmd) operations are called.

Introduce a helper function to handle the memdup_user() and the sanity
checking.

Also, remove the unnecessary dev_dbg() when the memdup_user() or
comedi_check_chanlist() fail.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: comedi_fops: introduce __comedi_get_user_cmd()
H Hartley Sweeten [Thu, 6 Mar 2014 19:02:56 +0000 (12:02 -0700)]
staging: comedi: comedi_fops: introduce __comedi_get_user_cmd()

The COMEDI_CMD and COMEDI_CMDTEST ioctl functions both copy the
comedi_cmd passed by the user from __user memory space to kernel
memory space. They then do some basic sanity checking of the cmd
before the subdevice (*do_cmdtest) and (*do_cmd) operations are
called.

Introduce a helper function to handle the copy_from_user() and
do the basic sanity checking.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: fixed parentheses and quoted string across lines coding style in CmHost.c
Joshua Baldock [Thu, 13 Mar 2014 06:14:58 +0000 (17:14 +1100)]
Staging: bcm: fixed parentheses and quoted string across lines coding style in CmHost.c

This is a patch to the CmHost.c file that fixes up parentheses and
quoted string across lines warnings found by checkpatch.pl tool.

Signed-off-by: Joshua Baldock <joshua.baldock@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: line6: long line fixes
Davide Berardi [Mon, 17 Mar 2014 02:34:41 +0000 (03:34 +0100)]
staging: line6: long line fixes

Fixed some line over 80 characters.

Signed-off-by: Davide Berardi <berardi.dav@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoMerge 3.14-rc7 into staging-next
Greg Kroah-Hartman [Mon, 17 Mar 2014 18:27:39 +0000 (11:27 -0700)]
Merge 3.14-rc7 into staging-next

This resolves a merge issue with drivers/staging/cxt1e1/linux.c that was
fixed in a report from Stephen Rothwell

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: bcm: Typedefs.h Fix "foo * bar" warning.
Aybuke Ozdemir [Sun, 16 Mar 2014 04:14:43 +0000 (06:14 +0200)]
staging: bcm: Typedefs.h Fix "foo * bar" warning.

This patch fixes these error messages found by checkpatch.pl:
ERROR: "foo* bar" should be "foo *bar"

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: bcm: Typedefs.h Fix do not use // c99 comments.
Aybuke Ozdemir [Sun, 16 Mar 2014 04:07:14 +0000 (06:07 +0200)]
staging: bcm: Typedefs.h Fix do not use // c99 comments.

This patch fixes "do not use // C99 comments"
errors in Typedefs.h

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: vt6656: power.c Fix line over 80 characters.
Aybuke Ozdemir [Sun, 16 Mar 2014 02:52:09 +0000 (04:52 +0200)]
staging: vt6656: power.c Fix line over 80 characters.

Fix checkpatch.pl issue with
line over 80 characters in power.c

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: nokia_h4p: nokia_fw-bcm.c Fix line over 80 characters.
Aybuke Ozdemir [Sun, 16 Mar 2014 02:06:08 +0000 (04:06 +0200)]
staging: nokia_h4p: nokia_fw-bcm.c Fix line over 80 characters.

Fix checkpatch.pl issue with
line over 80 characters in nokia_fw-bcm.c

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: winbond: Moved trailing statement to next line
Gulsah Kose [Sun, 16 Mar 2014 01:16:30 +0000 (03:16 +0200)]
staging: winbond: Moved trailing statement to next line

Fix checkpatch.pl issues with trailing statement to next line in wb35reg.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: cxt1e1: Fix space prohibited between function name and open parenthesis
Gulsah Kose [Sat, 15 Mar 2014 23:13:09 +0000 (01:13 +0200)]
staging: cxt1e1: Fix space prohibited between function name and open parenthesis

Fix checkpatch.pl issues with space prohibited between function name and
open parenthesis in libsbew.h

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: dgnc: Fix quoted string split across lines warning
Gulsah Kose [Sat, 15 Mar 2014 22:50:49 +0000 (00:50 +0200)]
staging: dgnc: Fix quoted string split across lines warning

This patch fixes "quoted string split across lines warning" warning in
dgnc_cls.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: line6: Fix line over 80 characters
Gulsah Kose [Sat, 15 Mar 2014 21:54:42 +0000 (23:54 +0200)]
staging: line6: Fix line over 80 characters

Fix checkpatch.pl issue with line over 80 characters in midi.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging:keucr: Remove typedefs
Himangi Saraogi [Sat, 15 Mar 2014 21:44:57 +0000 (03:14 +0530)]
staging:keucr: Remove typedefs

As suggested by Pablo, this patch uses a coccinelle script to remove the
typedefs:
typedef u8 BOOLEAN;  <-- use "bool" instead.
typedef u8 BYTE;     <-- use "u8"
typedef u8 *PBYTE;   <-- use "u8 *"
typedef u16 WORD;    <-- use "u16"
typedef u16 *PWORD;  <-- use "u16 *"
typedef u32 DWORD;   <-- use "u32"
typedef u32 *PDWORD; <-- use "u32 *"
in common.h.

The coccinelle script is:
/* coccinelle script to remove typedefs. */
@remove_typedef@
@@
-typedef bool BOOLEAN;
-typedef u8 BYTE;
-typedef u8 *PBYTE;
-typedef u16 WORD;
-typedef u16 *PWORD;
-typedef u32 DWORD;
-typedef u32 *PDWORD;

@fix_usage@
typedef BOOLEAN;
@@
-BOOLEAN
+bool

@fix_usage1@
typedef BYTE;
@@
-BYTE
+u8

@fix_usage2@
typedef PBYTE;
@@
-PBYTE
+u8 *

@fix_usage3@
typedef WORD;
@@
-WORD
+u16

@fix_usage4@
typedef PWORD;
@@
-PWORD
+u16 *

@fix_usage5@
typedef DWORD;
identifier f;
@@
-DWORD
+u32

@fix_usage6@
typedef PDWORD;
@@
-PDWORD
+u32 *

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: rtl8187se: Remove initialization of static variable in ieee80211/ieee80211_s...
Ana Rey [Sun, 16 Mar 2014 19:44:43 +0000 (20:44 +0100)]
staging: rtl8187se: Remove initialization of static variable in ieee80211/ieee80211_softmac.c

Fix checkpatch.pl errors:
ERROR: do not initialise statics to 0 or NULL

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: rtl8187se: Fix pointer declarations in ieee80211/ieee80211_softmac.c
Ana Rey [Sun, 16 Mar 2014 19:44:42 +0000 (20:44 +0100)]
staging: rtl8187se: Fix pointer declarations in ieee80211/ieee80211_softmac.c

Fix pointer declarations as the codingStyle of the kernel recommends in
ieee80211/ieee80211_softmac.c

Fix checkpatch.pl errors:
ERROR: "foo* bar" should be "foo *bar"
ERROR: "(foo*)" should be "(foo *)"

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: rtl8187se: Move trailing statement to next line
Ana Rey [Sun, 16 Mar 2014 19:44:41 +0000 (20:44 +0100)]
staging: rtl8187se: Move trailing statement to next line

Move trailing statements to next line as the codingStyle of
the kernel recommends.

Fix checkpatch.pl errors:
ERROR: trailing statements should be on next line

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: rtl8187se: Delete some innecesary whitespaces
Ana Rey [Sun, 16 Mar 2014 19:44:40 +0000 (20:44 +0100)]
staging: rtl8187se: Delete some innecesary whitespaces

Delete some whitespaces (whitespace before a quoted newline, space
at the start of a line and space before a tabs) as the codingStyle of
the kernel recommends.

Fix checkpatch.pl errors:
WARNING: unnecessary whitespace before a quoted newline
WARNING: please, no spaces at the start of a line
WARNING: please, no space before tabs

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: rtl8187se: Add whitespaces around '&', '||' and '&&'
Ana Rey [Sun, 16 Mar 2014 19:44:39 +0000 (20:44 +0100)]
staging: rtl8187se: Add whitespaces around '&', '||' and '&&'

Add whitespaces around '&', '||' and '&&' as the codingStyle of the kernel
recommends.

Fix checkpatch.pl errors:
ERROR: spaces required around that '||' (ctx:VxV)
ERROR: spaces required around that '&&' (ctx:VxV)
ERROR: need consistent spacing around '&'

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: rtl8187se: Add whitespaces around '+=' and '=='
Ana Rey [Sun, 16 Mar 2014 19:44:38 +0000 (20:44 +0100)]
staging: rtl8187se: Add whitespaces around '+=' and '=='

Add whitespaces around '+=' and '==' and fix coding style in these lines
as the codingStyle of the kernel recommends.

Fix checkpatch.pl errors:
ERROR: spaces required around that '+=' (ctx:VxV
ERROR: spaces required around that '==' (ctx:VxW)

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: rtl8187se: Fix "code indent should use tabs where possible" error
Ana Rey [Sun, 16 Mar 2014 19:44:37 +0000 (20:44 +0100)]
staging: rtl8187se: Fix "code indent should use tabs where possible" error

Fix checkpatch.pl error:
ERROR: code indent should use tabs where possible

Also fix some problems with tabs in an if-statement.

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: rtl8187se: Add whitespaces around commas
Ana Rey [Sun, 16 Mar 2014 19:44:36 +0000 (20:44 +0100)]
staging: rtl8187se: Add whitespaces around commas

Add whitespaces around commas and fix coding style in these lines as
the codingStyle of the kernel recommends.

Fix checkpatch.pl errors:
ERROR: space required after that ','

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: rtl8187se: Add whitespaces around '+', '-' and '='
Ana Rey [Sun, 16 Mar 2014 19:44:35 +0000 (20:44 +0100)]
staging: rtl8187se: Add whitespaces around '+', '-' and '='

Add whitespaces around '+', '-' and '=' as the codingStyle of the kernel
recommends.

Fix checkpatch.pl errors:
ERROR: need consistent spacing around '+'
ERROR: spaces required around that '=' (ctx:VxV)
ERROR: need consistent spacing around '-'

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: rtl8187se: Delete spaces prohibited around semicolons, colons and exclamations
Ana Rey [Sun, 16 Mar 2014 19:44:34 +0000 (20:44 +0100)]
staging: rtl8187se: Delete spaces prohibited around semicolons, colons and exclamations

Delete spaces prohibited before semicolon, before ':' and after '!' and
fix coding style in these lines when It is necessary.

Fix checkpàtch.pl error and warning messages:
WARNING: space prohibited before semicolon
ERROR: space prohibited before that ':'
ERROR: space prohibited after that '!'

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: rtl8187se: Delete space prohibited after open parenthesis.
Ana Rey [Sun, 16 Mar 2014 19:44:33 +0000 (20:44 +0100)]
staging: rtl8187se: Delete space prohibited after open parenthesis.

Delete space prohibited after open parenthesis and fix coding style in
the lines changed when It is necessary

Fix checkpatch.pl errors:
ERROR: space prohibited after that open parenthesis '('

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: rtl8187se: Delete space prohibited between function name and open parenthesis
Ana Rey [Sun, 16 Mar 2014 19:44:32 +0000 (20:44 +0100)]
staging: rtl8187se: Delete space prohibited between function name and open parenthesis

Delete space prohibited between function name and open parenthesis and
fix coding style in the lines changed when It is necessary

Fix checkpatch.pl warning message:
WARNING: space prohibited between function name and open parenthesis '('.

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: rtl8187se: Add whitespaces in while and for structures.
Ana Rey [Sun, 16 Mar 2014 19:44:31 +0000 (20:44 +0100)]
staging: rtl8187se: Add whitespaces in while and for structures.

Add a space required before the open parenthesis in while and for
structures as the codingStyle of the kernel recommends.

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: rtl8187se: Add whitespaces between 'if' and the condition.
Ana Rey [Sun, 16 Mar 2014 19:44:30 +0000 (20:44 +0100)]
staging: rtl8187se: Add whitespaces between 'if' and the condition.

Add a space required before the open parenthesis in conditional
statements as the codingStyle of the kernel recommends.

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: rtl8187se: Delete braces are not necessary in ieee80211/ieee80211_softmac.c
Ana Rey [Sun, 16 Mar 2014 19:44:29 +0000 (20:44 +0100)]
staging: rtl8187se: Delete braces are not necessary in ieee80211/ieee80211_softmac.c

Delete braces are not necessary for single statement blocks and fix
coding style in these lines when It is necessary.

Fix checkpatch.pl warning:
WARNING: braces {} are not necessary for single statement blocks

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: rtl8187se: Add necessary whitespaces in while and do-while statements.
Ana Rey [Sun, 16 Mar 2014 19:44:28 +0000 (20:44 +0100)]
staging: rtl8187se: Add necessary whitespaces in while and do-while statements.

Fix whitespaces in do-while statements and while statements as
the codingStyle of the kernel recommends in
ieee80211/ieee80211_softmac.c

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: rtl8187se: Fix whitespace around else-statements
Ana Rey [Sun, 16 Mar 2014 19:44:27 +0000 (20:44 +0100)]
staging: rtl8187se: Fix whitespace around else-statements

Fix whitespaces around else-statements and fix coding style in the
lines when It is necessary as the codingStyle of the kernel recommends
in ieee80211/ieee80211_softmac.c

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: rtl8187se: Fix whitespaces in if-statement.
Ana Rey [Sun, 16 Mar 2014 19:44:26 +0000 (20:44 +0100)]
staging: rtl8187se: Fix whitespaces in if-statement.

Fix whitespaces around braces in if-statement as the
codingStyle of the kernel recommends in ieee80211/ieee80211_softmac.c
Also, fix coding style in these lines when It is necessary.

Fix checkpatch.pl errors:
ERROR: space required before the open brace '{'

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: rtl8187se: Remove unused functions 'rsn_authen_cipher_suite' and 'ext_ieee80...
Ana Rey [Sun, 16 Mar 2014 19:44:25 +0000 (20:44 +0100)]
staging: rtl8187se: Remove unused functions 'rsn_authen_cipher_suite' and 'ext_ieee80211_send_beacon_wq'

Remove unused functions rsn_authen_cipher_suite() and
ext_ieee80211_send_beacon_wq() from ieee80211_softmac.c.

Fix sparse warnings:
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c:27:11: warning: ‘rsn_authen_cipher_suite’ defined but not used [-Wunused-variable]
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c:327:13: warning: ‘ext_ieee80211_send_beacon_wq’ defined but not used [-Wunused-function]

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: rtl8187se: Re-write if statement with comment lines inside.
Ana Rey [Sun, 16 Mar 2014 19:44:24 +0000 (20:44 +0100)]
staging: rtl8187se: Re-write if statement with comment lines inside.

Move comments from inside if conditionals to the lines above the
if-statement. Also delete unnecessary whitespace in these lines.

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: rtl8187se: Clean-up comment line style
Ana Rey [Sun, 16 Mar 2014 19:44:23 +0000 (20:44 +0100)]
staging: rtl8187se: Clean-up comment line style

Convert style of comments from C99-style to C89 and fix alignment in
these lines as the CodingStyle recommends.

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: rtl8187se: Remove unnecessary blank lines
Ana Rey [Sun, 16 Mar 2014 19:44:22 +0000 (20:44 +0100)]
staging: rtl8187se: Remove unnecessary blank lines

Remove unnecessary blank lines in ieee80211/ieee80211_softmac.c
(and add some necessary blank lines).

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: rtl8187se: Delete commented code
Ana Rey [Sun, 16 Mar 2014 19:44:21 +0000 (20:44 +0100)]
staging: rtl8187se: Delete commented code

Delete all commented code in ieee80211/ieee80211_softmac.c
that are not necessary.

Also, remove the unused variable referenced in the commented code.

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: media/omap24xx/tcm825x.h removed warning
Uma Sharma [Sat, 15 Mar 2014 19:06:26 +0000 (00:36 +0530)]
staging: media/omap24xx/tcm825x.h removed warning

This patch removes the following checkpatch.pl warning in tcm825x.h
Warning : missing space after return type

Signed-off-by: Uma Sharma <uma.sharma523@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: media/msi3101/sdr-msi3101.c removed warning
Uma Sharma [Sat, 15 Mar 2014 18:43:37 +0000 (00:13 +0530)]
staging: media/msi3101/sdr-msi3101.c removed warning

This patch removes the following checkpatch.pl warning in sdr-msi3101.c
Warning : Unnecessary space after function pointer name

Signed-off-by: Uma Sharma <uma.sharma523@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: crystalhd: Fix no space before tabs
Gulsah Kose [Sat, 15 Mar 2014 01:06:06 +0000 (03:06 +0200)]
staging: crystalhd: Fix no space before tabs

This patch fixes no spaces before tabs warning in crystalhd_misc.h

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: go7007: go7007-v4l2.c Fix line over 80 characters.
Aybuke Ozdemir [Sat, 15 Mar 2014 17:10:16 +0000 (19:10 +0200)]
staging: go7007: go7007-v4l2.c Fix line over 80 characters.

Fix checkpatch.pl issues with line over
80 characters in go7007-v4l2.c

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: octeon: ethernet-mdio.c Fix line over 80 characters.
Aybuke Ozdemir [Sat, 15 Mar 2014 16:54:28 +0000 (18:54 +0200)]
staging: octeon: ethernet-mdio.c Fix line over 80 characters.

Fix checkpatch.pl issue with
line over 80 characters in ethernet-mdio.c

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agoStaging: bcm: Removed unreachable code line in Bcmchar.c
Ebru Akagunduz [Thu, 13 Mar 2014 08:34:20 +0000 (10:34 +0200)]
Staging: bcm: Removed unreachable code line in Bcmchar.c

This patch removes unreachable code line and
unnecessary braces in Bcmchar.c

Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Acked-by: Bob Copeland <me@bobcopeland.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agoStaging: bcm: fix line over 80 characters in Bcmchar.c
Ebru Akagunduz [Thu, 13 Mar 2014 08:34:19 +0000 (10:34 +0200)]
Staging: bcm: fix line over 80 characters in Bcmchar.c

Fix checkpatch.pl issues with line over 80
characters in Bcmchar.c

Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: removed space after return function in gdm_lte.h
Uma Sharma [Sat, 15 Mar 2014 13:38:51 +0000 (19:08 +0530)]
staging: removed space after return function in gdm_lte.h

This patch removes the following checkpatch.pl warning in gdm_lte.h
Warning : space after return function

Signed-off-by: Uma Sharma <uma.sharma523@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: nokia_h4p: Fix quoted string split across lines
Gulsah Kose [Sat, 15 Mar 2014 12:21:07 +0000 (14:21 +0200)]
staging: nokia_h4p: Fix quoted string split across lines

This patch fixes "quoted string split across lines warning" warning in
nokia_core.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: frontier: Fix quoted string split across lines
Gulsah Kose [Sat, 15 Mar 2014 10:56:09 +0000 (12:56 +0200)]
staging: frontier: Fix quoted string split across lines

This patch fixes "quoted string split across lines warning" warning in
alphatrack.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: lustre: Remove extern keyword from function prototypes
Ashley Smith [Fri, 14 Mar 2014 23:10:22 +0000 (19:10 -0400)]
staging: lustre: Remove extern keyword from function prototypes

A function prototype is always a declaration and thus has "extern" prepended by default.

Signed-off-by: Ashley Smith <ashley@eclipso.ch>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: silicom: Fix line over 80 characters.
Gulsah Kose [Fri, 14 Mar 2014 23:43:06 +0000 (01:43 +0200)]
staging: silicom: Fix line over 80 characters.

Fix checkpatch.pl issues with line over 80 characters in bp_mod.h

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: gdm72xx: remove completed TODO item
Kristina Martšenko [Fri, 14 Mar 2014 23:10:06 +0000 (01:10 +0200)]
staging: gdm72xx: remove completed TODO item

Remove an item from the TODO file since it appears to have been
completed by the following commits:
1839c7ebd9 "staging/gdm72xx: usb_boot: replace firmware upgrade API"
3afcb91c41 "staging/gdm72xx: usb_boot: replace firmware upgrade API in
  em_download"
9e412a0a58 "staging/gdm72xx: sdio_boot: replace firmware upgrade API"

Signed-off-by: Kristina Martšenko <kristina.martsenko@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: gdm72xx: replace printk() and debug macros with dynamic debugging
Kristina Martšenko [Fri, 14 Mar 2014 23:10:05 +0000 (01:10 +0200)]
staging: gdm72xx: replace printk() and debug macros with dynamic debugging

Replace printk(KERN_DEBUG ...) with netdev_dbg and dev_dbg. Remove
debug macros which become unnecessary.

This removes the following types of checkpatch warnings from the driver:
drivers/staging/gdm72xx/gdm_sdio.c:461: WARNING: Prefer netdev_dbg(netdev, ... then dev_dbg(dev, ... then pr_debug(...  to printk(KERN_DEBUG ...

Signed-off-by: Kristina Martšenko <kristina.martsenko@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: gdm72xx: use print_hex_dump_debug and remove debug macros
Kristina Martšenko [Fri, 14 Mar 2014 23:10:04 +0000 (01:10 +0200)]
staging: gdm72xx: use print_hex_dump_debug and remove debug macros

Since the kernel already has a function for hex dumps, use that instead
of the driver's own versions. The function supports dynamic debugging,
so also remove some unnecessary debug macros.

Signed-off-by: Kristina Martšenko <kristina.martsenko@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: gdm724x: gdm_usb.c: Fix line over 80 characters.
Aybuke Ozdemir [Fri, 14 Mar 2014 21:55:05 +0000 (23:55 +0200)]
staging: gdm724x: gdm_usb.c: Fix line over 80 characters.

Fix checkpatch.pl issues with line over 80 characters in gdm_usb.c

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: vt6655: Fix line over 80 characters.
Gulsah Kose [Fri, 14 Mar 2014 21:07:47 +0000 (23:07 +0200)]
staging: vt6655: Fix line over 80 characters.

Fix checkpatch.pl issues with line over 80 characters in 80211mgr.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agodrivers/staging/crystalhd:crystalhd_lnx.c: Fix line over 80 characters.
Aybuke Ozdemir [Fri, 14 Mar 2014 21:44:54 +0000 (23:44 +0200)]
drivers/staging/crystalhd:crystalhd_lnx.c: Fix line over 80 characters.

Fix checkpatch.pl issues with line over 80 characters in crystalhd_lnx.c

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: vt6655: Remove unnecessary braces in aes_ccmp.c
Jelena Bjelja [Fri, 14 Mar 2014 15:47:06 +0000 (16:47 +0100)]
staging: vt6655: Remove unnecessary braces in aes_ccmp.c

This patch fixes the checkpatch warnings:
WARNING: braces {} are not necessary for single statement blocks

Signed-off-by: Jelena Bjelja <jelena.bjelja.ing@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agoLinux 3.14-rc7
Linus Torvalds [Mon, 17 Mar 2014 01:51:24 +0000 (18:51 -0700)]
Linux 3.14-rc7

10 years agostatic: keucr: Fix sparse warning of static declarations
Himangi Saraogi [Fri, 14 Mar 2014 10:58:00 +0000 (16:28 +0530)]
static: keucr: Fix sparse warning of static declarations

This patch fixes the warning:
drivers/staging/keucr/smilsub.c:603:6: warning: symbol '_Check_D_DevCode' was not declared. Should it be static?
by making function static as it is used within the file.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Acked-by: Pablo Neira Ayuso <pablo@gnumonks.org>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: core: tiomap3430.c Fix line over 80 characters.
Aybuke Ozdemir [Fri, 14 Mar 2014 19:12:56 +0000 (21:12 +0200)]
staging: core: tiomap3430.c Fix line over 80 characters.

Fix checkpatch.pl issues with line over 80 characters in tiomap3430.c

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
10 years agostaging: rtl8192u: make in r819xU_phy.c some local functions static
Ana Rey [Fri, 14 Mar 2014 17:59:58 +0000 (18:59 +0100)]
staging: rtl8192u: make in r819xU_phy.c some local functions static

Make some local functions static and fix coding style in these function
declarations when It is necessary

These are the local functions that were made static:
rtl8192_CalculateBitShift, rtl8192_phy_RFSerialRead,
rtl8192_phy_RFSerialWrite, rtl8192_InitBBRFRegDef,
rtl8192_BB_Config_ParaFile,rtl8192_SetTxPowerLevel,
rtl8192_phy_SetSwChnlCmdArray, rtl8192_phy_SwChnlStepByStep,
rtl8192_phy_FinishSwChnlNow

Fixed the following sparse warnings in r819xU_phy.c

drivers/staging/rtl8192u/r819xU_phy.c:47:5: warning: symbol 'rtl8192_CalculateBitShift' was not declared. Should it be static?
drivers/staging/rtl8192u/r819xU_phy.c:147:5: warning: symbol 'rtl8192_phy_RFSerialRead' was not declared. Should it be static?
drivers/staging/rtl8192u/r819xU_phy.c:232:6: warning: symbol 'rtl8192_phy_RFSerialWrite' was not declared. Should it be static?
drivers/staging/rtl8192u/r819xU_phy.c:574:6: warning: symbol 'rtl8192_InitBBRFRegDef' was not declared. Should it be static?
drivers/staging/rtl8192u/r819xU_phy.c:783:6: warning: symbol 'rtl8192_BB_Config_ParaFile' was not declared. Should it be static?
drivers/staging/rtl8192u/r819xU_phy.c:1073:6: warning: symbol 'rtl8192_SetTxPowerLevel' was not declared. Should it be static?
drivers/staging/rtl8192u/r819xU_phy.c:1242:4: warning: symbol 'rtl8192_phy_SetSwChnlCmdArray' was not declared. Should it be static?
drivers/staging/rtl8192u/r819xU_phy.c:1279:4: warning: symbol 'rtl8192_phy_SwChnlStepByStep' was not declared. Should it be static?
drivers/staging/rtl8192u/r819xU_phy.c:1436:6: warning: symbol 'rtl8192_phy_FinishSwChnlNow' was not declared. Should it be static?

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>