GitHub/moto-9609/android_kernel_motorola_exynos9610.git
12 years agostaging: comedi: ni_660x: remove inline function board()
H Hartley Sweeten [Tue, 23 Oct 2012 23:27:57 +0000 (16:27 -0700)]
staging: comedi: ni_660x: remove inline function board()

This function is used to get the dev->board_ptr from the
comedi_device. Remove the function and use a local variable
to hold the pointer where used. Use the comedi_board() helper
to get the 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>
12 years agostaging: comedi: ni_660x: move module init code to EOF
H Hartley Sweeten [Tue, 23 Oct 2012 23:27:42 +0000 (16:27 -0700)]
staging: comedi: ni_660x: move module init code to EOF

Move the module init code to the end of the file. This removes
the need for all the forward declarations.

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>
12 years agostaging: slicoss: get rid of slic_cmdqmem_init function
Devendra Naga [Tue, 23 Oct 2012 22:08:43 +0000 (18:08 -0400)]
staging: slicoss: get rid of slic_cmdqmem_init function

this function memset's the cmdqmem, instead do it in  slic_cmdq_init.

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: slicoss: remove default case in irqhandler
Devendra Naga [Tue, 23 Oct 2012 22:05:14 +0000 (18:05 -0400)]
staging: slicoss: remove default case in irqhandler

this default statement does nothing in the irqhandler, so remove it

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: slicoss: return -ENOMEM if kzalloc fail
Devendra Naga [Tue, 23 Oct 2012 22:04:32 +0000 (18:04 -0400)]
staging: slicoss: return -ENOMEM if kzalloc fail

this takes up the error path cleanup,
fixes a crash too due to null deref

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: auto-config drivers do not need to set hw_dev
H Hartley Sweeten [Tue, 23 Oct 2012 20:43:11 +0000 (13:43 -0700)]
staging: comedi: auto-config drivers do not need to set hw_dev

The comedi core now sets the 'hw_dev' pointer in the function
comedi_auto_config_helper() before calling the auto attach
function in the driver.

Remove the now unnecessary call to comedi_set_hw_dev() in the
drivers that use the auto-config attach mechanism.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: remove inline alloc_private()
H Hartley Sweeten [Tue, 23 Oct 2012 20:22:37 +0000 (13:22 -0700)]
staging: comedi: remove inline alloc_private()

This inline function has a very generic name and it's only a
wrapper around a simple kzalloc(). Since the inline function
does not save any lines-of-code, instead of renaming it just
remove it and do the kzalloc() directly.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agodrivers/staging/wlags49_h2/man: remove CONFIG_EXPERIMENTAL
Kees Cook [Tue, 23 Oct 2012 20:03:17 +0000 (13:03 -0700)]
drivers/staging/wlags49_h2/man: remove CONFIG_EXPERIMENTAL

This config item has not carried much meaning for a while now and is
almost always enabled by default. As agreed during the Linux kernel
summit, remove it.

CC: Henk de Groot <pe1dnn@amsat.org>
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: bcm: InterfaceIdleMode.h: Checkpatch fixes
Ceri James [Tue, 23 Oct 2012 14:50:33 +0000 (15:50 +0100)]
Staging: bcm: InterfaceIdleMode.h: Checkpatch fixes

This fixes the following checkpatch issues:

WARNING: line over 80 characters
+INT InterfaceIdleModeRespond(struct bcm_mini_adapter *Adapter, unsigned int *puiBuffer);

ERROR: "foo * bar" should be "foo *bar"
+INT InterfaceWakeUp(struct bcm_mini_adapter * Adapter);

Signed-off-by: Ceri James <jamesceri@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: bcm: LeakyBucket.c: Checkpatch fixes
Ceri James [Tue, 23 Oct 2012 12:51:56 +0000 (13:51 +0100)]
Staging: bcm: LeakyBucket.c: Checkpatch fixes

This fixes the following checkpatch issues:

WARNING: line over 80 characters
+ BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "=====>\n");

ERROR: space required after that ',' (ctx:VxV)
+ BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "=====>\n");
                         ^
WARNING: line over 80 characters
+ BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "Adapter found NULL!\n");

ERROR: space required after that ',' (ctx:VxV)
+ BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "Adapter found NULL!\n");
                         ^

Signed-off-by: Ceri James <jamesceri@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: et131x: Fix i386 build warnings from use of dma_addr_t
Mark Einon [Tue, 23 Oct 2012 22:34:15 +0000 (23:34 +0100)]
staging: et131x: Fix i386 build warnings from use of dma_addr_t

dma_addr_t can be of size 64 or 32bits, depending on the architecture.

This fixes these build warnings for ARCH=i386, and also tested on x86_64:

drivers/staging/et131x/et131x.c: In function ‘et131x_rx_dma_memory_alloc’:
drivers/staging/et131x/et131x.c:2356:11: warning: passing argument 2 of ‘et131x_align_allocated_memory’ from incompatible pointer type [enabled by default]
drivers/staging/et131x/et131x.c:2260:13: note: expected ‘u64 *’ but argument is of type ‘dma_addr_t *’
drivers/staging/et131x/et131x.c:2378:11: warning: passing argument 2 of ‘et131x_align_allocated_memory’ from incompatible pointer type [enabled by default]
drivers/staging/et131x/et131x.c:2260:13: note: expected ‘u64 *’ but argument is of type ‘dma_addr_t *’
drivers/staging/et131x/et131x.c: In function ‘free_send_packet’:
drivers/staging/et131x/et131x.c:3540:5: warning: left shift count >= width of type [enabled by default]

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: slicoss: remove ASSERT macro altogether
Devendra Naga [Mon, 22 Oct 2012 22:16:07 +0000 (18:16 -0400)]
staging: slicoss: remove ASSERT macro altogether

remove ASSERT and remove all its callers altogether in the code

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: slicoss: fail out if we dont have a valid firmware file
Devendra Naga [Mon, 22 Oct 2012 22:15:41 +0000 (18:15 -0400)]
staging: slicoss: fail out if we dont have a valid firmware file

fail instead calling request_firmware with filename as a null string
and return -ENOENT

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: et131x: Remove USE_FBR0 define and #ifdefs
Mark Einon [Fri, 19 Oct 2012 22:08:16 +0000 (23:08 +0100)]
staging: et131x: Remove USE_FBR0 define and #ifdefs

USE_FBR0 has always been defined, even in the original driver code.
Remove the define and #ifdef code to leave the code in the same state.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: et131x: Use upper_32_bits() instead of '>> 32'
Mark Einon [Fri, 19 Oct 2012 22:08:15 +0000 (23:08 +0100)]
staging: et131x: Use upper_32_bits() instead of '>> 32'

'>> 32 of a 32bit value is undefined in C. The compiler is free
to do what it likes with this...'

Change all uses of '>> 32' to use upper_32_bits() and use
the corresponding lower_32_bits() to match.

Also remove an incorrect comment about dma alloc always returning 32bit
addresses.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: et131x: Remove fbr_lookup.real_physaddr
Mark Einon [Fri, 19 Oct 2012 22:08:14 +0000 (23:08 +0100)]
staging: et131x: Remove fbr_lookup.real_physaddr

fbr_lookup.real_physaddr is only being used as a pseudonym for
fbr_lookup.ring_physaddr, so remove it and rename all instances to
ring_physaddr.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: et131x: Fix 64bit tx dma address handling
Mark Einon [Thu, 18 Oct 2012 20:34:22 +0000 (21:34 +0100)]
staging: et131x: Fix 64bit tx dma address handling

The driver checks that the device can handle 64bit DMA addressing in
et131x_pci_setup(), but then assumes that the top dword of a tx dma
address is always zero when creating a dma mapping in nic_send_packet().
Fix the mapping to use the higher dword of the dma_addr_t returned by
dma_map_single() and skb_frag_dma_map().

Also remove incorrect comments stating that dma_map_single() only returns
a 32 bit address.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: et131x: Use skb_headlen() where appropriate
Mark Einon [Wed, 17 Oct 2012 21:15:11 +0000 (22:15 +0100)]
staging: et131x: Use skb_headlen() where appropriate

(skb->len - skb->data_len) is used in several places in the et131x
driver code. Converted all instances of this to use skb_headlen()
which is more readable.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: rts5139: fixed issues when config to built-in object
Roger Tseng [Fri, 19 Oct 2012 09:43:34 +0000 (17:43 +0800)]
staging: rts5139: fixed issues when config to built-in object

Fixed two issues when CONFIG_RTS5139=y :

  - Makefile doesn't take $(CONFIG_RTS5139). It always uses obj-m and built as
    a loadable module.
  - Rename some symbols with prefix 'rts51x_' to prevent symbol name collisions
    with drivers/staging/rts_pstor when both are configured to be built-in
    objects.

  drivers/staging/rts5139/built-in.o: In function `xd_cleanup_work':
  (.text+0x1435d): multiple definition of `xd_cleanup_work'
  drivers/staging/rts_pstor/built-in.o:(.text+0x2b96a): first defined here
  drivers/staging/rts5139/built-in.o: In function `release_xd_card':
  (.text+0x14393): multiple definition of `release_xd_card'
  drivers/staging/rts_pstor/built-in.o:(.text+0x2c491): first defined here
  drivers/staging/rts5139/built-in.o: In function `set_sense_data':
  (.text+0x1e02): multiple definition of `set_sense_data'
  drivers/staging/rts_pstor/built-in.o:(.text+0xa79f): first defined here
  drivers/staging/rts5139/built-in.o: In function `ms_delay_write':
  ...

Signed-off-by: Roger Tseng <rogerable@realtek.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: ipack/carriers: fix missing include linux/slab.h
Samuel Iglesias Gonsalvez [Mon, 22 Oct 2012 07:36:48 +0000 (09:36 +0200)]
Staging: ipack/carriers: fix missing include linux/slab.h

Kernel build failed for parisc architecture:

drivers/staging/ipack/carriers/tpci200.c: In function 'tpci200_free_irq':
drivers/staging/ipack/carriers/tpci200.c:190:2: error: implicit declaration of
function 'kfree' [-Werror=implicit-function-declaration]
drivers/staging/ipack/carriers/tpci200.c: In function 'tpci200_request_irq':
drivers/staging/ipack/carriers/tpci200.c:217:2: error: implicit declaration of
function 'kzalloc' [-Werror=implicit-function-declaration]

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: silicom: Fix up version.h includes
Jesper Juhl [Thu, 18 Oct 2012 19:43:55 +0000 (21:43 +0200)]
Staging: silicom: Fix up version.h includes

drivers/staging/silicom/bypasslib/bplibk.h actually uses stuff from
version.h so it should include the header.
drivers/staging/silicom/bp_proc.c and
drivers/staging/silicom/bypasslib/bypass.c currently include the
header but use nothing from it so they don't need to.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: remove version.h include from dgrp/dgrp_sysfs.c
Jesper Juhl [Thu, 18 Oct 2012 19:34:38 +0000 (21:34 +0200)]
staging: remove version.h include from dgrp/dgrp_sysfs.c

The file uses nothing from linux/version.h, so the include is
pointless - remove it.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agodrm/omap: Remove cpu_is_omapXXXX usage in DMM
Andy Gross [Wed, 17 Oct 2012 05:30:03 +0000 (00:30 -0500)]
drm/omap: Remove cpu_is_omapXXXX usage in DMM

Removed usage of the cpu_is_omapXXXX in the DMM driver.  This is no
longer necessary as we can key off of the omap_dmm pointer that is
only non-NULL if the device has been probed successfully.

Signed-off-by: Andy Gross <andy.gross@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: silicom: fix up compiler warnings in bp_proc.c
Greg Kroah-Hartman [Mon, 22 Oct 2012 22:52:46 +0000 (15:52 -0700)]
Staging: silicom: fix up compiler warnings in bp_proc.c

This removes the compiler warnings for unused variables and functions in
the bp_proc.c file.

Cc: Chad Williamson <chad@dahc.us>
Cc: Daniel Cotey <puff65537@bansheeslibrary.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: drm/omap: Fix include error during make
Andy Gross [Tue, 16 Oct 2012 05:17:40 +0000 (00:17 -0500)]
staging: drm/omap: Fix include error during make

Fixed include error for drm_mode.h

Signed-off-by: Andy Gross <andy.gross@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: line6: drop unused line6_index and line6_id arrays
Stefan Hajnoczi [Mon, 15 Oct 2012 18:52:27 +0000 (20:52 +0200)]
staging: line6: drop unused line6_index and line6_id arrays

The line6 driver does not support 'index' and 'id' module parameters so
there is no need to keep arrays for these values.  Do what other sound
drivers do and use the scalar constants instead of dummy arrays.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: line6: drop unused line6_devices[] array
Stefan Hajnoczi [Mon, 15 Oct 2012 18:26:46 +0000 (20:26 +0200)]
staging: line6: drop unused line6_devices[] array

There is no reason to limit the number of line6 devices.  Drop the
static array.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: ccg: rename ccg init and exit functions to conventional names
Constantine Shulyupin [Mon, 15 Oct 2012 16:54:41 +0000 (18:54 +0200)]
staging: ccg: rename ccg init and exit functions to conventional names

Previous names of init and exit functions "init" and "cleanup" are
unconventional and are not friendly for source navigation with tags.
New names "ccg_init" and "ccg_exit" are conveninal and source navigation
friendly.

Signed-off-by: Constantine Shulyupin <const@MakeLinux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: silicom: fix explicit intialization of procfs_dir in bp_proc.c
Chad Williamson [Mon, 15 Oct 2012 10:30:39 +0000 (05:30 -0500)]
staging: silicom: fix explicit intialization of procfs_dir in bp_proc.c

Remove explicit intialization of static procfs_dir to NULL, resolving a
checkpatch.pl error.

Signed-off-by: Chad Williamson <chad@dahc.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: silicom: remove unnecessary braces in bp_proc.c
Chad Williamson [Mon, 15 Oct 2012 10:30:38 +0000 (05:30 -0500)]
staging: silicom: remove unnecessary braces in bp_proc.c

Remove unnecessary braces from single statement blocks in bp_proc.c,
resolving checkpatch.pl warnings.

Signed-off-by: Chad Williamson <chad@dahc.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: silicom: remove parentheses from return statements in bg_proc.c
Chad Williamson [Mon, 15 Oct 2012 10:30:37 +0000 (05:30 -0500)]
staging: silicom: remove parentheses from return statements in bg_proc.c

Remove unnecessary parentheses from return statements in bg_proc.c to
resolve checkpatch.pl errors.

Signed-off-by: Chad Williamson <chad@dahc.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: silicom: fix C99 comments in bp_proc.c
Chad Williamson [Mon, 15 Oct 2012 10:30:36 +0000 (05:30 -0500)]
staging: silicom: fix C99 comments in bp_proc.c

Fix C99 // comments in bp_proc.c to resolve checkpatch.pl errors.

Signed-off-by: Chad Williamson <chad@dahc.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: silicom: fix whitespace in bp_proc.c
Chad Williamson [Mon, 15 Oct 2012 10:30:35 +0000 (05:30 -0500)]
staging: silicom: fix whitespace in bp_proc.c

Remove superfluous spaces in bp_proc.c to resolve checkpatch.pl errors.

Signed-off-by: Chad Williamson <chad@dahc.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agodrm/omap: fix issue w/ fb attached to multiple CRTCs
Rob Clark [Fri, 12 Oct 2012 23:58:02 +0000 (18:58 -0500)]
drm/omap: fix issue w/ fb attached to multiple CRTCs

When the fb is detached from one CRTC/plane, paddr was set back to
zero.  But really we don't want to do this because the fb could still
be attached to other CRTC/plane(s).  This originally worked like this
to catch cases of freeing a pinned fb (but with the refcnt'ing this
should no longer be needed).  Also, there is checking in the GEM code
for freeing a pinned GEM object, so this extra level of checking is
redundant.

Signed-off-by: Rob Clark <rob@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agodrm/omap: Fix release of refill engine
Andy Gross [Fri, 12 Oct 2012 16:18:11 +0000 (11:18 -0500)]
drm/omap: Fix release of refill engine

During asynchronous refills, we don't wait for the refill to
finish.  However, we cannot release the engine back to the idle
list until it has actually completed the refill operation.  The
engine release will now be done in the IRQ handler, but only
for asynchronous refill operations.

Synchronous refills will continue to release the engine after they
unblock from waiting on the refill.

v2: Fixed review comments on async variable and bool type

Signed-off-by: Andy Gross <andy.gross@ti.com>
Signed-off-by: Rob Clark <rob@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agodrm/omap: Use writecombine for descriptors
Andy Gross [Fri, 12 Oct 2012 04:07:36 +0000 (23:07 -0500)]
drm/omap: Use writecombine for descriptors

Use writecombine for descriptor and PAT programming memory.

Signed-off-by: Andy Gross <andy.gross@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agodrm/omap: Remove shadow lut usage
Andy Gross [Fri, 12 Oct 2012 04:06:43 +0000 (23:06 -0500)]
drm/omap: Remove shadow lut usage

Removing extraneous shadow lut maintenance.  There is no need for
this to be in place until power management is added to the driver,
and this extra copy degrades performance for no gain.

Signed-off-by: Andy Gross <andy.gross@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: silicom: pointless check removal
Alan Cox [Thu, 11 Oct 2012 16:23:18 +0000 (17:23 +0100)]
staging: silicom: pointless check removal

bus_info is an array not a pointer. Fix silly if check

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: dgrp: fix some warnings
Alan Cox [Thu, 11 Oct 2012 16:21:03 +0000 (17:21 +0100)]
staging: dgrp: fix some warnings

Just squashing these to get them out of the analysis queue.

nd_ps_desc is an array not a pointer so comparing it with NULL is silly (be
nice if gcc shouted about this). And there are some slightly pointless
comparisons too.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoMerge tag 'iio-for-3.8a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio...
Greg Kroah-Hartman [Mon, 22 Oct 2012 21:52:19 +0000 (14:52 -0700)]
Merge tag 'iio-for-3.8a' of git://git./linux/kernel/git/jic23/iio into staging-next

First round of new IIO drivers and cleanups for the 3.8 cycle.

Here we have

* New driver ad5449 with the introduction of a new IIO return type
  to simplify power of 2 dividers (extremely common case).
* Some coccinelle warning fixing patches (dull but worthwhile as
  make for easier automated testing and cut down on false positives).
* Some trivial bits of formatting cleanup and spelling corrections.
* Use kcalloc in a few places for semantic reasons.
* Stop lis3l02dq driver (soon to be dropped I hope) using now non
  existent irq_to_gpio.
* Some dead code/unused variable removal
* Convert a few drivers to generic core provided functions instead
  of their own versions.

So all in all a nice new driver and a lot of worthy but dull cleanup.

12 years agoStaging: csr: fix code indent coding style issues in csr_wifi_hip_signals.h
Sunhee Hwang [Thu, 18 Oct 2012 14:10:09 +0000 (23:10 +0900)]
Staging: csr: fix code indent coding style issues in csr_wifi_hip_signals.h

This is a patch that fixes up code indent coding style warnings
in the csr_wifi_hip_signals.h found by checkpatch.pl tool.

Signed-off-by: Sunhee Hwang <sunheehwang821@gmail.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: csr: csr_wifi_router_ctrl_sef.c: fix line over 80 characters
Jugwan Eom [Thu, 18 Oct 2012 13:00:42 +0000 (22:00 +0900)]
Staging: csr: csr_wifi_router_ctrl_sef.c: fix line over 80 characters

This patch fixes line over 80 characters problem found by checkpatch.pl
tool.

Signed-off-by: Jugwan Eom <zugwan@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: csr: csr_wifi_router_ctrl_sef.c: fix tab mess
Jugwan Eom [Thu, 18 Oct 2012 13:00:41 +0000 (22:00 +0900)]
Staging: csr: csr_wifi_router_ctrl_sef.c: fix tab mess

This patch converts spaces to tabs.

Signed-off-by: Jugwan Eom <zugwan@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: csr: csr_wifi_router_ctrl_sef.c: fix up brace placement
Jugwan Eom [Thu, 18 Oct 2012 13:00:40 +0000 (22:00 +0900)]
Staging: csr: csr_wifi_router_ctrl_sef.c: fix up brace placement

This patch fixes a brace placement error found by checkpatch.pl tool.

Signed-off-by: Jugwan Eom <zugwan@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: csr: csr_wifi_sme_sef.h: fixed indentation warnings
Sangho Yi [Wed, 17 Oct 2012 10:11:05 +0000 (19:11 +0900)]
staging: csr: csr_wifi_sme_sef.h: fixed indentation warnings

Fixed indentation warnings on comments

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: csr: csr_wifi_sme_serialize.h: fixed indentation warnings
Sangho Yi [Wed, 17 Oct 2012 10:11:02 +0000 (19:11 +0900)]
staging: csr: csr_wifi_sme_serialize.h: fixed indentation warnings

Fixed indentation warnings from the comments.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: csr: csr_wifi_sme_sef.h: Fixed lines over 80 chars per line
Sangho Yi [Wed, 17 Oct 2012 10:11:07 +0000 (19:11 +0900)]
staging: csr: csr_wifi_sme_sef.h: Fixed lines over 80 chars per line

Fixed lines over 80 characters per line.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: csr: csr_wifi_sme_sef.h: Fixed from foo* bar to foo *bar
Sangho Yi [Wed, 17 Oct 2012 10:11:06 +0000 (19:11 +0900)]
staging: csr: csr_wifi_sme_sef.h: Fixed from foo* bar to foo *bar

Fixed coding style errors like foo* bar to foo *bar for the definition
of input and output variables of the function interfaces.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: csr: csr_wifi_sme_serialize.h: fixed over 80 char lines
Sangho Yi [Wed, 17 Oct 2012 10:11:04 +0000 (19:11 +0900)]
staging: csr: csr_wifi_sme_serialize.h: fixed over 80 char lines

Appropriately modified the lines over 80 characters.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: csr: csr_wifi_sme_serialize.h: Fixed from foo* bar to foo *bar
Sangho Yi [Wed, 17 Oct 2012 10:11:03 +0000 (19:11 +0900)]
staging: csr: csr_wifi_sme_serialize.h: Fixed from foo* bar to foo *bar

Fixed the coding style convention warnings for the statements of the
pointer variable declaration.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: csr: csr_wifi_sme_task.h: fixed indentation coding style
Sangho Yi [Wed, 17 Oct 2012 10:11:01 +0000 (19:11 +0900)]
staging: csr: csr_wifi_sme_task.h: fixed indentation coding style

Removed coding style warnings occurred on the comments.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoDrivers: Staging: CSR: fixed coding style errors in csr_wifi_router_free_upstream_con...
Sangho Yi [Sun, 14 Oct 2012 12:35:32 +0000 (21:35 +0900)]
Drivers: Staging: CSR: fixed coding style errors in csr_wifi_router_free_upstream_contents.c

Originally there were a lot of coding style errors so, I cleaned up the
coding style errors including braces and indentations.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: csr: fix pointer(asterisk) position coding style issue in sme_userspace.h
Sunhee Hwang [Thu, 18 Oct 2012 01:52:50 +0000 (10:52 +0900)]
Staging: csr: fix pointer(asterisk) position coding style issue in sme_userspace.h

This is a patch in the sme_userspace.h that fixes up
a pointer(asterisk) position warning found by checkpatch.pl tool

Signed-off-by: Sunhee Hwang <sunheehwang821@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: csr: csr_framework_ext_types.h: fix coding style
SeongJae Park [Tue, 16 Oct 2012 07:47:50 +0000 (16:47 +0900)]
staging: csr: csr_framework_ext_types.h: fix coding style

Fix coding style of csr_framework_ext_types.h
    
Signed-off-by: SeongJae Park <sj38.park@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: CSR: csr_time.h: Removed unnecessary typedef struct
Sangho Yi [Sun, 14 Oct 2012 14:50:02 +0000 (23:50 +0900)]
Staging: CSR: csr_time.h: Removed unnecessary typedef struct

I removed the unnecessary typedef struct from the csr_time.h.
There is no actual usage of the typedef definition.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: CSR: csr_time.h: fixed indentation warnings based on coding style
Sangho Yi [Sun, 14 Oct 2012 14:50:01 +0000 (23:50 +0900)]
Staging: CSR: csr_time.h: fixed indentation warnings based on coding style

I fixed the indentation warnings on csr_time.h.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: csr: data_tx: remove extra space in printk
Greg Kroah-Hartman [Fri, 12 Oct 2012 05:58:41 +0000 (14:58 +0900)]
Staging: csr: data_tx: remove extra space in printk

This saves us 1 byte!

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: csr: data_tx: fix up brace placement
Greg Kroah-Hartman [Fri, 12 Oct 2012 05:58:40 +0000 (14:58 +0900)]
Staging: csr: data_tx: fix up brace placement

This cleans up the brace placement coding issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: csr: data_tx: clean up tab mess
Greg Kroah-Hartman [Fri, 12 Oct 2012 05:58:39 +0000 (14:58 +0900)]
Staging: csr: data_tx: clean up tab mess

This patch converts spaces to tabs.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: csr: csr_log_configure.h: clean up tab mess
Homin Lee [Sun, 14 Oct 2012 01:32:26 +0000 (10:32 +0900)]
Staging: csr: csr_log_configure.h: clean up tab mess

Signed-off-by: Homin Lee <homin.lee@suapapa.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: csr: remove unused including <linux/version.h>
Wei Yongjun [Sun, 7 Oct 2012 13:43:26 +0000 (21:43 +0800)]
staging: csr: remove unused including <linux/version.h>

Remove including <linux/version.h> that don't need it.

dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch)

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: zram: correct obsolete comment on max_zpage_size
Minchan Kim [Tue, 9 Oct 2012 23:49:52 +0000 (08:49 +0900)]
staging: zram: correct obsolete comment on max_zpage_size

Zram doesn't use xv_malloc any more so it doesn't have
limitation about zobj_header.

Signed-off-by: Minchan Kim <minchan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: ste_rmi4: use module_i2c_driver to simplify the code
Wei Yongjun [Mon, 8 Oct 2012 14:15:44 +0000 (22:15 +0800)]
staging: ste_rmi4: use module_i2c_driver to simplify the code

Use the module_i2c_driver() macro to make the code smaller
and a bit simpler.

dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch)

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: usbip: Avoid superfluous set HC_STATE_RUNNING in vhci_start
Bernard Blackham [Sun, 21 Oct 2012 19:45:26 +0000 (06:45 +1100)]
staging: usbip: Avoid superfluous set HC_STATE_RUNNING in vhci_start

HC_STATE_RUNNING is already set by the usb core.

Signed-off-by: Bernard Blackham <b-linuxgit@largestprime.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: usbip: Don't leak struct file.
Bernard Blackham [Sun, 21 Oct 2012 19:45:00 +0000 (06:45 +1100)]
staging: usbip: Don't leak struct file.

usbip takes a reference on a struct file which is passed in via
sysfs.  Previously, this reference was never cleaned up, although
the socket it referred to was.

This patch drops the corresponding reference (found with the
socket's ->file backpointer) instead of just closing the socket.

Signed-off-by: Bernard Blackham <b-linuxgit@largestprime.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: usbip: cleanup of comments
Bart Westgeest [Wed, 10 Oct 2012 17:34:27 +0000 (13:34 -0400)]
staging: usbip: cleanup of comments

Removed commented-out code, obsolete comments, and fixed comment typos.

Signed-off-by: Bart Westgeest <bart@elbrys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: usbip: make rh_port_disconnect static
Bart Westgeest [Wed, 10 Oct 2012 17:34:26 +0000 (13:34 -0400)]
staging: usbip: make rh_port_disconnect static

Signed-off-by: Bart Westgeest <bart@elbrys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: usbip: replaced pointer arithmetic, and strongly type function return.
Bart Westgeest [Wed, 10 Oct 2012 17:34:25 +0000 (13:34 -0400)]
staging: usbip: replaced pointer arithmetic, and strongly type function return.

Replaced pointer arithmetic by using array indexing, and changed
function return type for usbip_alloc_iso_desc_pdu from 'void*' to
'struct usbip_iso_packet_descriptor'.

Signed-off-by: Bart Westgeest <bart@elbrys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: crystalhd: fix a style warning
Devendra Naga [Mon, 15 Oct 2012 17:29:18 +0000 (13:29 -0400)]
staging: crystalhd: fix a style warning

we dont need braces around a single statement blocks

style WARNINGS:
drivers/staging/crystalhd/crystalhd_cmds.c:311: WARNING: braces {} are not necessary for any arm of this statement

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: r8712u: fix potential NULL pointer dereference in r871x_wps_start()
Wei Yongjun [Mon, 8 Oct 2012 00:43:45 +0000 (08:43 +0800)]
staging: r8712u: fix potential NULL pointer dereference in r871x_wps_start()

The dereference should be moved below the NULL test.

dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch)

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: ced1401: fix missing unlock on error in FreeCircBlock()
Wei Yongjun [Mon, 22 Oct 2012 05:22:15 +0000 (13:22 +0800)]
Staging: ced1401: fix missing unlock on error in FreeCircBlock()

Add the missing unlock on the error handle path in function
FreeCircBlock().

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: ced1401: remove kernel version ifdef 's
Devendra Naga [Mon, 22 Oct 2012 15:49:47 +0000 (11:49 -0400)]
staging: ced1401: remove kernel version ifdef 's

We dont need these kernel versioning checks anyways.

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: ced1401: fix some style warnings
Devendra Naga [Mon, 22 Oct 2012 15:49:28 +0000 (11:49 -0400)]
staging: ced1401: fix some style warnings

this fixes:

comments to in kernel comment style
the opening brace of if statement must be beside the if not below
to it

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: ced1401: remove an obvious commit about the minor number
Devendra Naga [Mon, 22 Oct 2012 15:49:06 +0000 (11:49 -0400)]
staging: ced1401: remove an obvious commit about the minor number

in disconnect we assign the device minor number from the interface
pointer to the localvarible minor, and then print it at the end,

this code seems self explanatory so remove the comment of assigning
the minor number to a local variable.

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: vt6655: fix missing unlock on error in vCommandTimer()
Wei Yongjun [Mon, 22 Oct 2012 05:07:35 +0000 (13:07 +0800)]
Staging: vt6655: fix missing unlock on error in vCommandTimer()

Add the missing unlock on the error handle path in function
vCommandTimer.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: vt6656: [BUG] PIPEnsSendBulkOut free bBoolInUse
Malcolm Priestley [Fri, 12 Oct 2012 08:49:15 +0000 (09:49 +0100)]
staging: vt6656: [BUG] PIPEnsSendBulkOut free bBoolInUse

Eventually, when there is enough errors we run out of free TX urbs and
connection stalls.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: vt6655-6: shift wrap in hostap_set_encryption()
Dan Carpenter [Thu, 11 Oct 2012 06:55:25 +0000 (09:55 +0300)]
Staging: vt6655-6: shift wrap in hostap_set_encryption()

abySeq is an unsigned char so shifting more than 31 bits will lead to a
shift wrapping bug.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: vt6655-6: shift wrap buf in s_vFillTxKey()
Dan Carpenter [Thu, 11 Oct 2012 06:54:05 +0000 (09:54 +0300)]
Staging: vt6655-6: shift wrap buf in s_vFillTxKey()

byKeyIndex is an unsigned char between 0 and 0xf.  If it is any value
higher than 1, then we will hit an integer wrap issue here.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: vt6656: Keep firmware loading local and release firware.
Malcolm Priestley [Sun, 7 Oct 2012 10:41:31 +0000 (11:41 +0100)]
staging: vt6656: Keep firmware loading local and release firware.

Firmware is retained unreleased for the entire duration of the
driver.

When done release firmware and if the need be request firmware again.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: vt6656: [BUG] out of bound array reference in RFbSetPower.
Malcolm Priestley [Sun, 7 Oct 2012 07:27:00 +0000 (08:27 +0100)]
staging: vt6656: [BUG] out of bound array reference in RFbSetPower.

Calling RFbSetPower with uCH zero value will cause out of bound array reference.

This causes 64 bit kernels to oops on boot.

Note: Driver does not function on 64 bit kernels and should be
blacklisted on them.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: android: binder: Add some tracepoints
Arve Hjønnevåg [Tue, 16 Oct 2012 22:29:53 +0000 (15:29 -0700)]
Staging: android: binder: Add some tracepoints

Add tracepoints:
- ioctl entry and exit
- Main binder lock: lock, locked and unlock
- Command and return buffer opcodes
- Transaction: create and receive
- Transaction buffer: create and free
- Object and file descriptor transfer
- binder_update_page_range

Signed-off-by: Arve Hjønnevåg <arve@android.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: android: binder: Add some missing binder_stat_br calls
Arve Hjønnevåg [Tue, 16 Oct 2012 22:29:52 +0000 (15:29 -0700)]
Staging: android: binder: Add some missing binder_stat_br calls

Cached thread return errors, death notifications and new looper
requests were not included in the stats.

Signed-off-by: Arve Hjønnevåg <arve@android.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging/comedi: Use pr_ or dev_ printks in drivers/dt9812.c
YAMANE Toshiaki [Tue, 9 Oct 2012 13:07:27 +0000 (22:07 +0900)]
staging/comedi: Use pr_ or dev_ printks in drivers/dt9812.c

fixed below checkpatch warnings.
- WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(...  to printk(KERN_ERR ...
- WARNING: Prefer netdev_info(netdev, ... then dev_info(dev, ... then pr_info(...  to printk(KERN_INFO ...

and added pr_fmt.

Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging/comedi: Use dev_ printks in drivers/ii_pci20kc.c
YAMANE Toshiaki [Mon, 8 Oct 2012 12:26:33 +0000 (21:26 +0900)]
staging/comedi: Use dev_ printks in drivers/ii_pci20kc.c

fixed below checkpatch warnings.
- WARNING: Prefer netdev_warn(netdev, ... then dev_warn(dev, ... then pr_warn(...  to printk(KERN_WARNING ...
- WARNING: Prefer netdev_info(netdev, ... then dev_info(dev, ... then pr_info(...  to printk(KERN_INFO ...

Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging/comedi: Use dev_ printks in drivers/ni_pcimio.c
YAMANE Toshiaki [Mon, 8 Oct 2012 12:26:17 +0000 (21:26 +0900)]
staging/comedi: Use dev_ printks in drivers/ni_pcimio.c

fixed below checkpatch warning.
- WARNING: Prefer netdev_warn(netdev, ... then dev_warn(dev, ... then pr_warn(...  to printk(KERN_WARNING ...

Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging/comedi: Use dev_ printks in drivers/ni_daq_dio24.c
YAMANE Toshiaki [Mon, 8 Oct 2012 12:25:58 +0000 (21:25 +0900)]
staging/comedi: Use dev_ printks in drivers/ni_daq_dio24.c

fixed below checkpatch warning.
- WARNING: Prefer netdev_info(netdev, ... then dev_info(dev, ... then pr_info(...  to printk(KERN_INFO ...

Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging/comedi: Use dev_ printks in drivers/usbdux.c
YAMANE Toshiaki [Mon, 8 Oct 2012 12:25:37 +0000 (21:25 +0900)]
staging/comedi: Use dev_ printks in drivers/usbdux.c

fixed below checkpatch warning.
- WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(...  to printk(KERN_ERR ...

Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging/comedi: Use dev_ printks in rtd520.c
YAMANE Toshiaki [Sat, 6 Oct 2012 05:53:02 +0000 (14:53 +0900)]
staging/comedi: Use dev_ printks in rtd520.c

fixed below checkpatch warning.
-Prefer netdev_info(netdev, ... then dev_info(dev, ... then pr_info(...  to printk(KERN_INFO ...

Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging/comedi: Use dev_ printks in drivers/quatech_daqp_cs.c
YAMANE Toshiaki [Sat, 6 Oct 2012 05:52:34 +0000 (14:52 +0900)]
staging/comedi: Use dev_ printks in drivers/quatech_daqp_cs.c

fixed below checkpatch warnings.
- WARNING: Prefer netdev_info(netdev, ... then dev_info(dev, ... then pr_info(...  to printk(KERN_INFO ...
- WARNING: Prefer netdev_warn(netdev, ... then dev_warn(dev, ... then pr_warn(...  to printk(KERN_WARNING ...
- WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(...  to printk(KERN_ERR ...
- WARNING: Prefer netdev_info(netdev, ... then dev_info(dev, ... then pr_info(...  to printk(KERN_INFO ...
- WARNING: Prefer netdev_notice(netdev, ... then dev_notice(dev, ... then pr_notice(...  to printk(KERN_NOTICE ...

and added pr_fmt.

Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging/comedi: Use dev_ printks in drivers/adl_pci8164.c
YAMANE Toshiaki [Sat, 6 Oct 2012 05:32:40 +0000 (14:32 +0900)]
staging/comedi: Use dev_ printks in drivers/adl_pci8164.c

fixed below checkpatch warning.
- WARNING: Prefer netdev_dbg(netdev, ... then dev_dbg(dev, ... then pr_debug(...  to printk(KERN_DEBUG ...

Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging/comedi: Use dev_ printks in drivers/me_daq.c
YAMANE Toshiaki [Sat, 6 Oct 2012 05:31:43 +0000 (14:31 +0900)]
staging/comedi: Use dev_ printks in drivers/me_daq.c

fixed below checkpatch warnings.
- WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(...  to printk(KERN_ERR ...
- WARNING: quoted string split across lines

Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging/comedi: Use dev_ printks in kcomedilib/kcomedilib_main.c
YAMANE Toshiaki [Fri, 5 Oct 2012 00:07:00 +0000 (09:07 +0900)]
staging/comedi: Use dev_ printks in kcomedilib/kcomedilib_main.c

fixed below checkpatch warning.
- WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(...  to printk(KERN_ERR ...

Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: always set hw_dev during auto-config
Ian Abbott [Mon, 15 Oct 2012 12:07:32 +0000 (13:07 +0100)]
staging: comedi: always set hw_dev during auto-config

Auto-configuration (auto-attachment) of USB and PCI comedi devices all
goes through `comedi_auto_config_helper()`.  That is a good place to set
the comedi device's `hw_dev` pointer to the hardware `struct device` via
a call to `comedi_set_hw_dev(comedi_device, hardware_device)` as it may
obviate the need for the low-level comedi driver to make this call.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: avoid a put_device(), get_device() sequence
Ian Abbott [Mon, 15 Oct 2012 12:07:31 +0000 (13:07 +0100)]
staging: comedi: avoid a put_device(), get_device() sequence

In `comedi_set_hw_dev()`, if there is no change to `dev->hw_dev` (and it
is not `NULL`), don't bother putting and getting the device.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: s626: remove devpriv macro
H Hartley Sweeten [Mon, 15 Oct 2012 17:16:38 +0000 (10:16 -0700)]
staging: comedi: s626: remove devpriv macro

Missed one... This macro relies on a local variable having
a specific name. Remove its use by replacing it with a local
variable where used.

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>
12 years agostaging: comedi: drivers: remove remaining devpriv macros
H Hartley Sweeten [Mon, 15 Oct 2012 17:15:52 +0000 (10:15 -0700)]
staging: comedi: drivers: remove remaining devpriv macros

The remaining comedi drivers that still have a devpriv macro
are all pretty straight forward for removing the devpriv
macro.

This macro relies on a local variable having a specific name.
Remove its use by replacing it with a local variable where
used.

The inline function alloc_private(), used to kzalloc the
dev->private memory, returns non-zero if there is an error.
Fix all the alloc_private() calls accordingly and remove any
kernel messages or obvious comments that still exist in the
drivers. Leave a comment in the skel 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>
12 years agostaging: comedi: ni_mio_common: remove devpriv macro
H Hartley Sweeten [Mon, 15 Oct 2012 17:19:06 +0000 (10:19 -0700)]
staging: comedi: ni_mio_common: remove devpriv macro

The ni_mio_common.c file is #include'd by the ni_atmio, ni_mio_cs,
and ni_pcimio drivers. Those drivers all have a devpriv macro of
this type:

This macro relies on a local variable having a specific name.
Remove its use in all the files by replacing it with a local
variable.

Some of the functions in ni_mio_common.c don't always use the
devpriv variable due to differences in how the low-level i/o
is handled by the driver. Tag the variable in those functions
with __maybe_unused to avoid compile warnings.

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>
12 years agostaging: comedi: addi-data: remove devpriv macro
H Hartley Sweeten [Mon, 15 Oct 2012 17:15:05 +0000 (10:15 -0700)]
staging: comedi: addi-data: remove devpriv macro

This macro relies on a local variable having a specific name.

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>
12 years agostaging: comedi: poc: introduce struct poc_private
H Hartley Sweeten [Mon, 15 Oct 2012 17:14:48 +0000 (10:14 -0700)]
staging: comedi: poc: introduce struct poc_private

Wrap the private data used by this driver in a struct. This makes
the use of that data clearer and gets rid of the need for the casts.

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>
12 years agostaging: comedi: ni_660x: remove inline private() function
H Hartley Sweeten [Mon, 15 Oct 2012 17:14:32 +0000 (10:14 -0700)]
staging: comedi: ni_660x: remove inline private() function

The inline private() function simply returns the dev->private pointer
to the private data.

Remove the inline function and just use a local variable where the
private data is used.

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>