cascardo/linux.git
11 years agostaging: comedi: amplc_pc236: use cfc_check_trigger_arg_*() helpers
H Hartley Sweeten [Wed, 14 Nov 2012 00:49:38 +0000 (17:49 -0700)]
staging: comedi: amplc_pc236: use cfc_check_trigger_arg_*() helpers

Use the new helpers in the step 3 tests of pc236_intr_cmdtest().

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>
11 years agostaging: comedi: amplc_dio200: use cfc_check_trigger_arg_*() helpers
H Hartley Sweeten [Wed, 14 Nov 2012 00:49:22 +0000 (17:49 -0700)]
staging: comedi: amplc_dio200: use cfc_check_trigger_arg_*() helpers

Use the new helpers in the step 3 tests of dio200_subdev_intr_cmdtest().

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>
11 years agostaging: comedi: addi_apci_1032: use cfc_check_trigger_arg_*() helpers
H Hartley Sweeten [Wed, 14 Nov 2012 00:49:05 +0000 (17:49 -0700)]
staging: comedi: addi_apci_1032: use cfc_check_trigger_arg_*() helpers

Use the new helpers in the step 3 tests of apci1032_cos_cmdtest().

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>
11 years agostaging: comedi: comedi_parport: use cfc_check_trigger_arg_*() helpers
H Hartley Sweeten [Wed, 14 Nov 2012 00:48:41 +0000 (17:48 -0700)]
staging: comedi: comedi_parport: use cfc_check_trigger_arg_*() helpers

Use the new helpers in the step 3 tests of parport_intr_cmdtest().

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>
11 years agostaging: comedi: 8255: use cfc_check_trigger_arg_*() helpers
H Hartley Sweeten [Wed, 14 Nov 2012 00:48:23 +0000 (17:48 -0700)]
staging: comedi: 8255: use cfc_check_trigger_arg_*() helpers

Use the new helpers in the step 3 tests of subdev_8255_cmdtest().

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>
11 years agostaging: comedi: comedi_fc.h: introduce new helpers for do_cmdtest step 3
H Hartley Sweeten [Wed, 14 Nov 2012 00:48:03 +0000 (17:48 -0700)]
staging: comedi: comedi_fc.h: introduce new helpers for do_cmdtest step 3

Step 3 of the do_cmdtest functions validates the arguments for the
command to be executed. Most of these are simple tests to see if the
argument "is" a value, a "min" value, or a "max" value. Each of these
tests then clamps the argument to the value if it fails the test.

Introduce three new helper functions in comedi_fc.h to handle these
tests and remove the boilerplate code from the drivers.

The new helper functions are:

cfc_check_trigger_arg_is()  - argument must be == the value
cfc_check_trigger_arg_min() - argument must be >= the value
cfc_check_trigger_arg_max() - argument must be <= the value

All of these helpers set the argument to the value and return -EINVAL
if the validation fails.

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>
11 years agostaging: comedi: Kconfig: remove VIRT_TO_BUS depends on
H Hartley Sweeten [Tue, 13 Nov 2012 23:21:17 +0000 (16:21 -0700)]
staging: comedi: Kconfig: remove VIRT_TO_BUS depends on

The only addi-data driver that uses virt_to_bus is addi_apci_3120.
Remove the depends on for the other addi-data drivers.

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>
11 years agostaging: drm/omap: Fix usage of IS_ERR_OR_NULL and PTR_ERR
Andy Gross [Tue, 13 Nov 2012 21:41:32 +0000 (15:41 -0600)]
staging: drm/omap: Fix usage of IS_ERR_OR_NULL and PTR_ERR

Return PTR_ERR(-ENOMEM) if dmm_txn_init cannot allocate a
refill engine.

Signed-off-by: Andy Gross <andy.gross@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: addi_apci_1516: update the MODULE_DESCRIPTION
H Hartley Sweeten [Tue, 13 Nov 2012 20:48:50 +0000 (13:48 -0700)]
staging: comedi: addi_apci_1516: update the MODULE_DESCRIPTION

Change the generic MODULE_DESCRIPTION text to something more
specific for this 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>
11 years agostaging: comedi: addi_apci_1516: update the Kconfig
H Hartley Sweeten [Tue, 13 Nov 2012 20:48:34 +0000 (13:48 -0700)]
staging: comedi: addi_apci_1516: update the Kconfig

This driver does not use virt_to_bus(), remove the depends on for it.

Update the Kconfig entry to list all the boards supported by this
driver. Also, expand the help text a bit.

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>
11 years agostaging: comedi: addi_apci_1516: reword the initialization comments
H Hartley Sweeten [Tue, 13 Nov 2012 20:48:18 +0000 (13:48 -0700)]
staging: comedi: addi_apci_1516: reword the initialization comments

The subdevice init does not do any allocation, this was already done
by comedi_alloc_subdevices(). Reword the comments a bit.

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>
11 years agostaging: comedi: addi_apci_1516: rename has_timer
H Hartley Sweeten [Tue, 13 Nov 2012 20:48:03 +0000 (13:48 -0700)]
staging: comedi: addi_apci_1516: rename has_timer

The "timer" on these boards is actually a watchdog. Rename the
boardinfo value "has_timer" to "has_wdog".

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>
11 years agostaging: comedi: addi_apci_1516: final cleanup of the register map defines
H Hartley Sweeten [Tue, 13 Nov 2012 20:47:48 +0000 (13:47 -0700)]
staging: comedi: addi_apci_1516: final cleanup of the register map defines

I finally got hold of the i/o mapping from ADDI-DATA. Cleanup the defines
a bit and add the missing information.

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>
11 years agostaging: comedi: addi_apci_1516: fix i_APCI1516_StartStopWriteWatchdog()
H Hartley Sweeten [Tue, 13 Nov 2012 20:47:27 +0000 (13:47 -0700)]
staging: comedi: addi_apci_1516: fix i_APCI1516_StartStopWriteWatchdog()

This function is used by the watchdog subdevice to "ping" the watchdog.
Rename the CamelCase function to apci1516_wdog_insn_write.

Currently this function does not follow the comed API. INSN_WRITE functions
are supposed to write insn->n values. Also, starting and stopping the
watchdog is handled by the INSN_CONFIG function.

Fix this function so it works like the comedi core expects. Also, since
the watchdog needs to be enabled in order to "ping" it, make sure it is
enabled before writing to it.

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>
11 years agostaging: comedi: addi_apci_1516: fix i_APCI1516_ConfigWatchdog()
H Hartley Sweeten [Tue, 13 Nov 2012 20:47:09 +0000 (13:47 -0700)]
staging: comedi: addi_apci_1516: fix i_APCI1516_ConfigWatchdog()

This function is used by the watchdog subdevice to enable/disable and
set the timeout for the watchdog. Rename the CamelCase function to
apci1516_wdog_insn_config.

Currently this function does not follow the comed API. Recode it so
it works like the core expects. data[0] is the configuration id code
(INSN_CONFIG_*) for the configuration instruction. Two instructions
are supported:

INSN_CONFIG_ARM: enables the watchdog and sets the timeout value
INSN_CONFIG_DISARM: disables the watchdog

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>
11 years agostaging: comedi: addi_apci_1516: fix i_APCI1516_ReadWatchdog()
H Hartley Sweeten [Tue, 13 Nov 2012 20:46:52 +0000 (13:46 -0700)]
staging: comedi: addi_apci_1516: fix i_APCI1516_ReadWatchdog()

This function is used by the watchdog subdevice to read the status of
the watchdog. Rename the CamelCase function to apci1516_wdog_insn_read
and fix the function to return the status value insn->n times like
the comedi core expects.

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>
11 years agostaging: comedi: addi_apci_1516: cleanup the subdevice init
H Hartley Sweeten [Tue, 13 Nov 2012 20:46:35 +0000 (13:46 -0700)]
staging: comedi: addi_apci_1516: cleanup the subdevice init

For aesthetic reasons. add some whitespace to the subdevice init.

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>
11 years agostaging: comedi: addi_apci_1516: cleanup apci1516_detach()
H Hartley Sweeten [Tue, 13 Nov 2012 20:46:19 +0000 (13:46 -0700)]
staging: comedi: addi_apci_1516: cleanup apci1516_detach()

This driver uses the comedi auto_config mechanism to attach to
the comedi subsystem. The dev->hw_dev is set by the core so
comedi_to_pci_dev() will always return a valid pcidev. Remove
the unnecessary test.

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>
11 years agostaging: comedi: addi_apci_1516: add defines for the PCI device ids
H Hartley Sweeten [Tue, 13 Nov 2012 20:46:04 +0000 (13:46 -0700)]
staging: comedi: addi_apci_1516: add defines for the PCI device ids

The PCI device ids supported by this driver are used multiple places
in the code. To improve maintainability, create #define's for them.

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>
11 years agostaging: comedi: addi_apci_1516: cleanup the s->subdev_flags
H Hartley Sweeten [Tue, 13 Nov 2012 20:45:39 +0000 (13:45 -0700)]
staging: comedi: addi_apci_1516: cleanup the s->subdev_flags

The flags SDF_GROUND and SDF_COMMON only have meaning for analog
input/output subdevices. Remove these flags from the digital
input/output and timer subdevices in this driver.

The digital output subdevice does not need the SDF_READABLE flags.
Remove it.

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>
11 years agostaging: comedi: addi_apci_1516: remove setting of s->io_bits
H Hartley Sweeten [Tue, 13 Nov 2012 20:45:23 +0000 (13:45 -0700)]
staging: comedi: addi_apci_1516: remove setting of s->io_bits

This value only has meaning for dio subdevices. Don't bother setting
it for the di and do subdevices in this 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>
11 years agostaging: comedi: addi_apci_1516: remove setting of s->len_chanlist
H Hartley Sweeten [Tue, 13 Nov 2012 20:45:08 +0000 (13:45 -0700)]
staging: comedi: addi_apci_1516: remove setting of s->len_chanlist

This value only has meaning for subdevices that support async commands.
Since this driver does not support async commands on any of its subdevices,
don't bother setting it . The comedi core will detect this and set the
value appropriately.

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>
11 years agostaging: comedi: addi_apci_1516: merge in hwdrv_apci1516.c
H Hartley Sweeten [Tue, 13 Nov 2012 20:44:53 +0000 (13:44 -0700)]
staging: comedi: addi_apci_1516: merge in hwdrv_apci1516.c

Merge the code from hwdrv_apci1516.c into the driver and delete the
now unused file.

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>
11 years agostaging: comedi: addi_apci_1516: cleanup addi_find_boardinfo()
H Hartley Sweeten [Tue, 13 Nov 2012 20:44:36 +0000 (13:44 -0700)]
staging: comedi: addi_apci_1516: cleanup addi_find_boardinfo()

This driver uses the comedi auto_config mechanism to attach to the
PCI board.

This mechanism does not require passing the boardinfo data in the
comedi_driver. Remove it and modify the code to directly access
the boardinfo data instead of messing with the dev->driver->board_name
pointer.

All the boards supported by this driver have the same PCI vendor id.
Remove this extra info from the boardinfo and the test for it.

Rename the function so it has namespace associated with this 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>
11 years agostaging: comedi: addi_apci_1516: remove unnecessary include
H Hartley Sweeten [Tue, 13 Nov 2012 20:44:19 +0000 (13:44 -0700)]
staging: comedi: addi_apci_1516: remove unnecessary include

This driver no longer depends on the addi-data "common" code.
Remove the include.

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>
11 years agostaging: comedi: addi_apci_1516: remove use of struct addi_board
H Hartley Sweeten [Tue, 13 Nov 2012 20:44:02 +0000 (13:44 -0700)]
staging: comedi: addi_apci_1516: remove use of struct addi_board

The only boardinfo needed in this driver only consists of 6 data
values. The "common" addi_board has a lot of unnecessary bloat.

Create a local struct for this drivers boardinfo and remove the
need for struct addi_board in the "common" code.

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>
11 years agostaging: comedi: addi_apci_1516: remove use of struct addi_private
H Hartley Sweeten [Tue, 13 Nov 2012 20:43:44 +0000 (13:43 -0700)]
staging: comedi: addi_apci_1516: remove use of struct addi_private

The only private data this driver has is the iobase address for the
watchdog. Create a local struct to hold this information in dev->private
and remove the need for struct addi_private from the "common" code.

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>
11 years agostaging: comedi: addi_apci_1516: only allocate needed subdevices
H Hartley Sweeten [Tue, 13 Nov 2012 20:43:27 +0000 (13:43 -0700)]
staging: comedi: addi_apci_1516: only allocate needed subdevices

The addi-data "common" code always allocated 7 subdevices. This driver
only requires 3. Change the allocation and remove the unused subdevices.

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>
11 years agostaging: comedi: addi_apci_1516: remove use of devpriv->s_EeParameters
H Hartley Sweeten [Tue, 13 Nov 2012 20:43:10 +0000 (13:43 -0700)]
staging: comedi: addi_apci_1516: remove use of devpriv->s_EeParameters

This driver no longer reads the eeprom to find the board specific data,
all the necessary data is in the boardinfo. Use the boardinfo directly
instead of passing through devpriv->s_EeParameters.

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>
11 years agostaging: comedi: addi_apci_1516: don't read the unused PCI bars
H Hartley Sweeten [Tue, 13 Nov 2012 20:42:54 +0000 (13:42 -0700)]
staging: comedi: addi_apci_1516: don't read the unused PCI bars

This driver does use devpriv->i_IobaseAmcc or devpriv->i_IobaseReserved.
Don't bother reading these PCI bars.

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>
11 years agostaging: comedi: addi_apci_1516: remove devpriv->dw_AiBase
H Hartley Sweeten [Tue, 13 Nov 2012 20:42:38 +0000 (13:42 -0700)]
staging: comedi: addi_apci_1516: remove devpriv->dw_AiBase

This driver does not ioremap the PCI bar stored in devpriv->dw_AiBase.
Remove the iounmap.

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>
11 years agostaging: comedi: addi_apci_1516: remove devpriv->iobase usage
H Hartley Sweeten [Tue, 13 Nov 2012 20:42:15 +0000 (13:42 -0700)]
staging: comedi: addi_apci_1516: remove devpriv->iobase usage

The iobase address stored in devpriv->iobase is also stored in dev->iobase.
Use that instead.

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>
11 years agostaging: comedi: addi_apci_1516: remove unnecessary info from boardinfo
H Hartley Sweeten [Tue, 13 Nov 2012 20:41:57 +0000 (13:41 -0700)]
staging: comedi: addi_apci_1516: remove unnecessary info from boardinfo

The i_IorangeBase[012], i_PCIEeprom, and pc_EepromChip data in the
boardinfo was only needed to work out the usage of the PCI bars.
This is no longer needed so remove the 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>
11 years agostaging: comedi: addi_apci_1516: simplify the PCI bar reading
H Hartley Sweeten [Tue, 13 Nov 2012 20:41:41 +0000 (13:41 -0700)]
staging: comedi: addi_apci_1516: simplify the PCI bar reading

The boards supported by this driver have an eeprom attached to a S5920
PCI controller chip. Knowing this information allows simplifying the
code that reads the PCI bars to get the iobase address.

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>
11 years agostaging: comedi: addi_apci_1516: cleanup subdevice ops pointers
H Hartley Sweeten [Tue, 13 Nov 2012 20:41:22 +0000 (13:41 -0700)]
staging: comedi: addi_apci_1516: cleanup subdevice ops pointers

The same subdevice operations are used, as needed, for all the boards
supported by this driver. Remove the function pointers from the
boardinfo and set the subdevice operations directly in the attach.

Remove all the subdevice operations that would be set to NULL.

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>
11 years agostaging: comedi: addi_apci_1516: boards do not have interrupts
H Hartley Sweeten [Tue, 13 Nov 2012 20:41:06 +0000 (13:41 -0700)]
staging: comedi: addi_apci_1516: boards do not have interrupts

The boards supported by this driver do not have interrupt capabiltiy.
Remove the interrupt support code.

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>
11 years agostaging: comedi: addi_apci_1516: don't reset the apci1016 board
H Hartley Sweeten [Tue, 13 Nov 2012 20:40:50 +0000 (13:40 -0700)]
staging: comedi: addi_apci_1516: don't reset the apci1016 board

The apci1016 board only has digital inputs. There is no reason to
reset the digital outputs and watchdog timer on that board.

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>
11 years agostaging: comedi: addi_apci_1516: absorb i_APCI1516_Reset()
H Hartley Sweeten [Tue, 13 Nov 2012 20:40:34 +0000 (13:40 -0700)]
staging: comedi: addi_apci_1516: absorb i_APCI1516_Reset()

The same low-level reset function is used by all the boards supported
by this driver. Remove it from the boardinfo and absorb the function
from hwdrv_apci1516.c directly into the driver.

Rename the CamelCase function i_ADDI_Reset() to apci1516_reset().

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>
11 years agostaging: comedi: addi_apci_1516: remove unnecessary include
H Hartley Sweeten [Tue, 13 Nov 2012 20:40:18 +0000 (13:40 -0700)]
staging: comedi: addi_apci_1516: remove unnecessary include

This include is not needed.

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>
11 years agostaging: comedi: addi_apci_1516: remove unused define
H Hartley Sweeten [Tue, 13 Nov 2012 20:40:02 +0000 (13:40 -0700)]
staging: comedi: addi_apci_1516: remove unused define

The COMEDI_SUBD_TTLIO define is not used by this driver. Remove it.

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>
11 years agostaging: comedi: addi_apci_1516: remove eeprom support code
H Hartley Sweeten [Tue, 13 Nov 2012 20:39:47 +0000 (13:39 -0700)]
staging: comedi: addi_apci_1516: remove eeprom support code

Reading the eeprom on the boards supported by this driver is not
necessary. All the information required is in the boardinfo.

Remove the eeprom support code since it's not really interesting
or useful.

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>
11 years agostaging: comedi: addi_apci_1516: board does not have analog outputs
H Hartley Sweeten [Tue, 13 Nov 2012 20:39:29 +0000 (13:39 -0700)]
staging: comedi: addi_apci_1516: board does not have analog outputs

The boards supported by this driver do not have analog outputs. Remove
the subdevice init for it.

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>
11 years agostaging: comedi: addi_apci_1516: board does not have analog inputs
H Hartley Sweeten [Tue, 13 Nov 2012 20:39:14 +0000 (13:39 -0700)]
staging: comedi: addi_apci_1516: board does not have analog inputs

The boards supported by this driver do not have analog inputs. Remove
the subdevice init for it.

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>
11 years agostaging: comedi: addi_apci_1516: board does not have ttl i/o
H Hartley Sweeten [Tue, 13 Nov 2012 20:38:57 +0000 (13:38 -0700)]
staging: comedi: addi_apci_1516: board does not have ttl i/o

The boards supported by this driver do not have ttl i/o. Remove the
subdevice init for it.

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>
11 years agostaging: comedi: addi_apci_1516: separate from addi_common.c
H Hartley Sweeten [Tue, 13 Nov 2012 20:38:39 +0000 (13:38 -0700)]
staging: comedi: addi_apci_1516: separate from addi_common.c

This driver is for simple 16 channel dio boards. Using the addi-data
"common" code introduces a lot of bloat.

Copy the code in addi_common.c to this driver and remove the #include
that caused addi_common.c to be compiled with this driver. This will
allow removing the bloat.

Rename the attach_pci and detach functions so they have namespace
associated with this 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>
11 years agostaging: comedi: addi_apci_1516: define the watchdog control register
H Hartley Sweeten [Tue, 13 Nov 2012 20:37:31 +0000 (13:37 -0700)]
staging: comedi: addi_apci_1516: define the watchdog control register

Add defines for the bits in the watchdog control register and use
them to remove the "magic" numbers.

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>
11 years agostaging: comedi: addi_apci_1516: cleanup the register map defines
H Hartley Sweeten [Tue, 13 Nov 2012 20:37:01 +0000 (13:37 -0700)]
staging: comedi: addi_apci_1516: cleanup the register map defines

For aesthetic reasons, rename the defines used for the register map
and convert them from decimal to hex values.

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>
11 years agostaging: comedi: addi_apci_1516: add support for apci1016 board
H Hartley Sweeten [Tue, 13 Nov 2012 20:36:44 +0000 (13:36 -0700)]
staging: comedi: addi_apci_1516: add support for apci1016 board

The apci1016 board can also be supported by this driver. This board is
also a 16 channel dio board with 16 input channels. The apci1016 does
not have the watchdog timer feature of the apci1516 and apci2016.

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>
11 years agostaging: comedi: addi_apci_1516: merge in addi_apci_2016 driver
H Hartley Sweeten [Tue, 13 Nov 2012 20:36:19 +0000 (13:36 -0700)]
staging: comedi: addi_apci_1516: merge in addi_apci_2016 driver

The low-level hardware support code for these drivers, hwdrv_apci1516.c
and hwdrv_apci2016.c, is identical. Both of these boards are 16 channel
dio boards. The 1516 board has 8 input/8 output channels and the 2016
has 16 output channels.

To ease maintainability, merge the boardinfo and pci device information
from the addi_apci_2016 driver into the addi_apci_1516 driver and modify
the Kconfig and Makefile appropriately.

This allows deleting the addi_apci_2016.c and hwdrv_apci2016.c files.

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>
11 years agostaging: vt6656: iwctl_giwaplist/device_ioctl : use off stack buffers.
Malcolm Priestley [Tue, 13 Nov 2012 21:04:36 +0000 (21:04 +0000)]
staging: vt6656: iwctl_giwaplist/device_ioctl : use off stack buffers.

Calls ioctl SIOCGIWAPLIST use off stack buffers.

clears up warning messages.
main_usb.c:2015:1: warning: the frame size of 1888 bytes is larger than 1024 bytes [-Wframe-larger-than=]
iwctl.c:683:1: warning: the frame size of 1280 bytes is larger than 1024 bytes [-Wframe-larger-than=]

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: omap-thermal: fix context restore function
Radhesh Fadnis [Tue, 13 Nov 2012 18:10:04 +0000 (14:10 -0400)]
staging: omap-thermal: fix context restore function

In the context restore function, if the context is lost or
not is being checked by the contents of the counter register.
But this is logic hold good as long as counter reset value is
zero, if the reset value is non-zero then above logic doesn't
hold good. Hence removed checking of the register value and
restoring the context.

Signed-off-by: Radhesh Fadnis <radhesh.fadnis@ti.com>
Signed-off-by: Enric Balletbo i Serra <eballetbo@gmail.com>
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: omap-thermal: add IRQ debugging messaging
Eduardo Valentin [Tue, 13 Nov 2012 18:10:03 +0000 (14:10 -0400)]
staging: omap-thermal: add IRQ debugging messaging

For debugging purposes, print the IRQ event for the domain being processed.

Signed-off-by: Enric Balletbo i Serra <eballetbo@gmail.com>
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: omap-thermal: remove freq_clip table
Eduardo Valentin [Tue, 13 Nov 2012 18:10:02 +0000 (14:10 -0400)]
staging: omap-thermal: remove freq_clip table

The API exposed by cpu cooling does not need any freq clip
table anymore. Now the cpu cooling device is smart enough
to build its own table.

For this reason, this patch removes all the code that is
generating a freq clip table and also removes all references
in data structures regarding freq clip table.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: omap-thermal: remove platform data nomenclature
Eduardo Valentin [Tue, 13 Nov 2012 18:10:01 +0000 (14:10 -0400)]
staging: omap-thermal: remove platform data nomenclature

Because the driver is not really using platform data, this patch
removes the pdata nomenclature from this driver.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: omap-thermal: fix compilation
Eduardo Valentin [Tue, 13 Nov 2012 18:10:00 +0000 (14:10 -0400)]
staging: omap-thermal: fix compilation

Because we are not including linux/io.h, the driver is not compiling.
This patch adds the missing header.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: drm/imx: Remove 300ms delay after memory reset
Philipp Zabel [Mon, 12 Nov 2012 15:29:04 +0000 (16:29 +0100)]
staging: drm/imx: Remove 300ms delay after memory reset

This has been added once, but does not seem to be necessary. Tested
on i.MX51 and i.MX6.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: drm/imx: Add pinctrl support to parallel display driver
Sascha Hauer [Mon, 12 Nov 2012 15:29:03 +0000 (16:29 +0100)]
staging: drm/imx: Add pinctrl support to parallel display driver

To allow the iomux to be configured for the display.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: drm/imx: Add ipu_cpmem_set_yuv_interleaved()
Philipp Zabel [Mon, 12 Nov 2012 15:29:02 +0000 (16:29 +0100)]
staging: drm/imx: Add ipu_cpmem_set_yuv_interleaved()

For configuring interleaved formats.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: drm/imx: silence ipu_crtc_dpms debug message
Philipp Zabel [Mon, 12 Nov 2012 15:29:01 +0000 (16:29 +0100)]
staging: drm/imx: silence ipu_crtc_dpms debug message

It's for debugging only, so use dev_dbg.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: drm/imx: Add YVU420 support to i.MX IPUv3 base driver
Philipp Zabel [Mon, 12 Nov 2012 15:29:00 +0000 (16:29 +0100)]
staging: drm/imx: Add YVU420 support to i.MX IPUv3 base driver

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: drm/imx: Fix YUYV support in i.MX IPUv3 base driver
Michael Olbrich [Mon, 12 Nov 2012 15:28:59 +0000 (16:28 +0100)]
staging: drm/imx: Fix YUYV support in i.MX IPUv3 base driver

YVYU is not supported by the IPU, so remove partial handling
of this format and replace it with YUYV which is supported.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: et131x: Remove unnecessary DMA address alignment code
Mark Einon [Mon, 12 Nov 2012 21:16:29 +0000 (21:16 +0000)]
staging: et131x: Remove unnecessary DMA address alignment code

"The cpu return address and the DMA bus master address are both
guaranteed to be aligned to the smallest PAGE_SIZE order which
is greater than or equal to the requested size."

There are several places in the et131x.c code where these addresses are
aligned to a 4k boundary after a call to dma_alloc_coherent(),
needlessly.

Remove these alignment offset calculations, and the
et131x_align_allocated_memory() call which is only used for 4k
alignments.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: et131x: Avoid unnecessary calculations in for loop
Mark Einon [Mon, 12 Nov 2012 21:16:28 +0000 (21:16 +0000)]
staging: et131x: Avoid unnecessary calculations in for loop

In et131x_rx_dma_memory_alloc(), we loop over fbr_entries - the values of
fbr_align and fbr_chunksize calculated in the loop do not depend on the
loop counter and are the same for all loop iterations.

Take the calculations of these values out of the loop, as we only
need to calculate them once per loop, not once per loop iteration.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: ipack: tpci200: fixes 80 character line length issue
Johan Meiring [Sun, 11 Nov 2012 20:41:13 +0000 (22:41 +0200)]
staging: ipack: tpci200: fixes 80 character line length issue

This fixes one of the two instances of an 80+ char line in the file.
Fixing the other instance would have decreased the readability of the
code, in my opinion.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: ipack: ipack: fix coding style issues
Johan Meiring [Sun, 11 Nov 2012 20:41:12 +0000 (22:41 +0200)]
Staging: ipack: ipack: fix coding style issues

This uses linux/io.h instead of asm/io.h and cleans up an 80+ character issue.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: line6: drop unused CONFIG_LINE6_USB_DEBUG
Stefan Hajnoczi [Sun, 11 Nov 2012 12:52:26 +0000 (13:52 +0100)]
staging: line6: drop unused CONFIG_LINE6_USB_DEBUG

The CONFIG_LINE6_USB_DEBUG option is no longer relevant since dyndbg
dev_dbg() is now used instead of a compile-time decision whether to
enable debug messages or not.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: line6: drop unused DEBUG_MESSAGES() macro
Stefan Hajnoczi [Sun, 11 Nov 2012 12:52:25 +0000 (13:52 +0100)]
staging: line6: drop unused DEBUG_MESSAGES() macro

The DEBUG_MESSAGES() macro is no longer needed since dev_dbg() is now
used for debug messages.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: line6: replace DEBUG_MESSAGES() with dev_dbg()
Stefan Hajnoczi [Sun, 11 Nov 2012 12:52:24 +0000 (13:52 +0100)]
staging: line6: replace DEBUG_MESSAGES() with dev_dbg()

The dyndbg feature allows dev_dbg() calls to be enabled/disabled at
runtime and is therefore more convenient than static debug log messages.
Use dev_dbg() instead of the line6-specific DEBUG_MESSAGES() macro.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: line6: wrap comment to 80 chars in variax.c
Stefan Hajnoczi [Sun, 11 Nov 2012 12:24:46 +0000 (13:24 +0100)]
staging: line6: wrap comment to 80 chars in variax.c

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: line6: wrap lines to 80 chars in usbdefs.h
Stefan Hajnoczi [Sun, 11 Nov 2012 12:24:45 +0000 (13:24 +0100)]
staging: line6: wrap lines to 80 chars in usbdefs.h

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: line6: replace deprecated strict_strtol() in toneport.c
Stefan Hajnoczi [Sun, 11 Nov 2012 12:24:44 +0000 (13:24 +0100)]
staging: line6: replace deprecated strict_strtol() in toneport.c

The LED value is an int, so replace strict_strtol() with kstrtoint().
It's safe to pass in the actual variable instead of a local temporary
because strto*() doesn't write to the result unless the function returns
success.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: line6: wrap lines to 80 chars in playback.c
Stefan Hajnoczi [Sun, 11 Nov 2012 12:24:43 +0000 (13:24 +0100)]
staging: line6: wrap lines to 80 chars in playback.c

There are a few instances of 80+ character lines in playback.c.  Two
instances are just because of a useless comment "this is somewhat
paranoid", so drop the comment.  Other instances are straightforward
line wrapping.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: line6: drop trailing whitespace in pcm.h
Stefan Hajnoczi [Sun, 11 Nov 2012 12:24:42 +0000 (13:24 +0100)]
staging: line6: drop trailing whitespace in pcm.h

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: line6: shorten comment below 80 chars in pcm.c
Stefan Hajnoczi [Sun, 11 Nov 2012 12:24:41 +0000 (13:24 +0100)]
staging: line6: shorten comment below 80 chars in pcm.c

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: line6: fix quoted string across lines in midibuf.c
Stefan Hajnoczi [Sun, 11 Nov 2012 12:24:40 +0000 (13:24 +0100)]
staging: line6: fix quoted string across lines in midibuf.c

Checkpatch warns when quoted strings are split across lines.  The
rationale is that quoted strings should be left on a single line so that
grep works.  (The 80 character line limit does not apply to quoted
strings.)

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: line6: wrap >80 char lines in capture.c
Stefan Hajnoczi [Sun, 11 Nov 2012 12:24:39 +0000 (13:24 +0100)]
staging: line6: wrap >80 char lines in capture.c

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging/serqt_usb2: refactor qt_unthrottle() in serqt_usb2.c
YAMANE Toshiaki [Fri, 9 Nov 2012 21:34:27 +0000 (06:34 +0900)]
staging/serqt_usb2: refactor qt_unthrottle() in serqt_usb2.c

Modified to eliminate the deep nesting.

Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging/serqt_usb2: refactor qt_open() in serqt_usb2.c
YAMANE Toshiaki [Fri, 9 Nov 2012 21:34:11 +0000 (06:34 +0900)]
staging/serqt_usb2: refactor qt_open() in serqt_usb2.c

Modified to eliminate the deep nesting.

Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging/serqt_usb2: refactor qt_read_bulk_callback() in serqt_usb2.c
YAMANE Toshiaki [Fri, 9 Nov 2012 21:33:56 +0000 (06:33 +0900)]
staging/serqt_usb2: refactor qt_read_bulk_callback() in serqt_usb2.c

Modified to eliminate the deep nesting and redundant description.

Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging/serqt_usb2: fixed line over issue in serqt_usb2.c
YAMANE Toshiaki [Fri, 9 Nov 2012 21:33:02 +0000 (06:33 +0900)]
staging/serqt_usb2: fixed line over issue in serqt_usb2.c

Fixed a description of the procedure call dev_dbg().

Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging/vme: Use dev_ or pr_ printks in devices/vme_user.c
YAMANE Toshiaki [Fri, 9 Nov 2012 03:23:14 +0000 (12:23 +0900)]
staging/vme: Use dev_ or pr_ printks in devices/vme_user.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 ...
- WARNING: Prefer netdev_dbg(netdev, ... then dev_dbg(dev, ... then pr_debug(...  to printk(KERN_DEBUG ...
- WARNING: Prefer netdev_warn(netdev, ... then dev_warn(dev, ... then pr_warn(...  to printk(KERN_WARNING ...

and add pr_fmt.

Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: winbond: wb35rx_s: Fixed coding style issue
Adil Mujeeb [Wed, 7 Nov 2012 18:50:03 +0000 (00:20 +0530)]
Staging: winbond: wb35rx_s: Fixed coding style issue

Fixed checpatch.pl reported ERRORs (excluding WARNING of line over 80 characters)

Signed-off-by: Adil Mujeeb <mujeeb.adil@gmail.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: winbond: mds: Fixed coding style issues
Adil Mujeeb [Wed, 7 Nov 2012 18:50:01 +0000 (00:20 +0530)]
Staging: winbond: mds: Fixed coding style issues

Removed printk tracing call

Signed-off-by: Adil Mujeeb <mujeeb.adil@gmail.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: winbond: wb35rx_f: Fixed coding style issues
Adil Mujeeb [Wed, 7 Nov 2012 18:50:02 +0000 (00:20 +0530)]
Staging: winbond: wb35rx_f: Fixed coding style issues

Fixed checkpatch.pl reported ERRORs

Signed-off-by: Adil Mujeeb <mujeeb.adil@gmail.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: winbond: wbusb: Fixed coding style issue
Adil Mujeeb [Wed, 7 Nov 2012 18:50:00 +0000 (00:20 +0530)]
Staging: winbond: wbusb: Fixed coding style issue

Removed unnecessary printk and pr_debug tracing calls

Signed-off-by: Adil Mujeeb <mujeeb.adil@gmail.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: tidspbridge: dynload: reloc.c: checkpatch.pl cleanup
Kumar Amit Mehta [Wed, 7 Nov 2012 06:52:55 +0000 (22:52 -0800)]
staging: tidspbridge: dynload: reloc.c: checkpatch.pl cleanup

fix for few error messages as reported by checkpatch.pl

Signed-off-by: Kumar Amit Mehta <gmate.amit@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: tidspbridge: dynload: dload_internal.h: fix for coding style issue
Kumar Amit Mehta [Wed, 7 Nov 2012 06:38:37 +0000 (22:38 -0800)]
staging: tidspbridge: dynload: dload_internal.h: fix for coding style issue

fixed few error messages as reported by checkpatch.pl

Signed-off-by: Kumar Amit Mehta <gmate.amit@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: usbip: put usb_device and kill event handler thread in error cleanups.
Harvey Yang [Tue, 6 Nov 2012 08:10:29 +0000 (16:10 +0800)]
staging: usbip: put usb_device and kill event handler thread in error cleanups.

If probe returns with error, the kthread is still alive even when all
usbip modules unloaded. So do cleanups in error handler.

Signed-off-by: harvey.yang <harvey.huawei.yang@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: make remaining data tables const
Aaro Koskinen [Sun, 4 Nov 2012 19:15:07 +0000 (21:15 +0200)]
staging: xgifb: make remaining data tables const

Remaining vb_table.h data can be trivially made const.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: constify Tap4 data
Aaro Koskinen [Sun, 4 Nov 2012 19:15:06 +0000 (21:15 +0200)]
staging: xgifb: constify Tap4 data

Make Tap4 data const and adjust functions accordingly.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: eliminate pVBInfo->AGPReg
Aaro Koskinen [Sun, 4 Nov 2012 19:15:05 +0000 (21:15 +0200)]
staging: xgifb: eliminate pVBInfo->AGPReg

Access XGI340_AGPReg directly and make it const.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: eliminate pVBInfo->SR16
Aaro Koskinen [Sun, 4 Nov 2012 19:15:04 +0000 (21:15 +0200)]
staging: xgifb: eliminate pVBInfo->SR16

Inline constant values that are used only once.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: eliminate pVBInfo->CR6B
Aaro Koskinen [Sun, 4 Nov 2012 19:15:03 +0000 (21:15 +0200)]
staging: xgifb: eliminate pVBInfo->CR6B

Access XGI340_CR6B directly and make it const.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: eliminate pVBInfo->SR21/22/25
Aaro Koskinen [Sun, 4 Nov 2012 19:15:02 +0000 (21:15 +0200)]
staging: xgifb: eliminate pVBInfo->SR21/22/25

In-line constants that are used only once.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: eliminate pVBInfo->StResInfo
Aaro Koskinen [Sun, 4 Nov 2012 19:15:01 +0000 (21:15 +0200)]
staging: xgifb: eliminate pVBInfo->StResInfo

Delete unused data.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: eliminate pVBInfo->ModeResInfo
Aaro Koskinen [Sun, 4 Nov 2012 19:15:00 +0000 (21:15 +0200)]
staging: xgifb: eliminate pVBInfo->ModeResInfo

Access XGI330_ModeResInfo directly and make it const.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: eliminate pVBInfo->ScreenOffset
Aaro Koskinen [Sun, 4 Nov 2012 19:14:59 +0000 (21:14 +0200)]
staging: xgifb: eliminate pVBInfo->ScreenOffset

Access XGI330_ScreenOffset directly and make it const.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: eliminate pVBInfo->VCLKData/VBVCLKData
Aaro Koskinen [Sun, 4 Nov 2012 19:14:58 +0000 (21:14 +0200)]
staging: xgifb: eliminate pVBInfo->VCLKData/VBVCLKData

Access XGI_VCLKData and XGI_VBVCLKData directly and make them const.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: eliminate pVBInfo->ECLKData
Aaro Koskinen [Sun, 4 Nov 2012 19:14:57 +0000 (21:14 +0200)]
staging: xgifb: eliminate pVBInfo->ECLKData

Access XGI340_ECLKData directly and make it const.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: eliminate pVBInfo->CR6E/6F/89
Aaro Koskinen [Sun, 4 Nov 2012 19:14:56 +0000 (21:14 +0200)]
staging: xgifb: eliminate pVBInfo->CR6E/6F/89

Eliminate dummy zero read-only global data.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>