Commit Graph
322858 Commits
Author SHA1 Message Date
H Hartley Sweeten c514bab7cc staging: comedi: adl_pci9111: remove pci9111_ai_range_[gs]et macros
These macros rely on a local variable having a specific name.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:05:56 -07:00
H Hartley Sweeten ae479ee562 staging: comedi: adl_pci9111: use local variables for the chan/range
Simplify the chan/range in pci9111_ai_insn_read() by using local
variables for hold the values and by just passing insn->chanspec
to the CR_* macros instead of using (&insn->chanspec)[0].

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:05:56 -07:00
H Hartley Sweeten 9852d13745 staging: comedi: adl_pci9111: remove INTERRUPT_DEBUG code
This debug output should be removed in the final driver.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:05:55 -07:00
H Hartley Sweeten 1fbc937b24 staging: comedi: adl_pci9111: remove AI_DO_CMD_DEBUG code
This debug output should be removed in the final driver.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:05:55 -07:00
H Hartley Sweeten 3e5a0ba03e staging: comedi: adl_pci9111: use attach_pci callback
Convert this PCI driver to use the comedi PCI auto config attach
mechanism by adding an 'attach_pci' callback function. Since the
driver does not require any external configuration options, and
the legacy 'attach' callback is now optional, remove it. The
boardinfo is also not needed now so remove it also.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:05:55 -07:00
H Hartley Sweeten f2bed9b4cb staging: comedi: adl_pci9111: remove the io_range values from the private data
These values are not used by the driver. Remove them.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:05:55 -07:00
H Hartley Sweeten 034f873459 staging: comedi: adl_pci9111: remove the board attach noise
Remove the kernel messages about the io base/range for the pci
resources.

Move the board attach messages to the end of the attach and use
a simple/clean dev_info message for it.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:05:55 -07:00
H Hartley Sweeten 02baee8cd8 staging: comedi: adl_pci9111: analog input subdevice is fixed
The analog input subdevice is the same for all boards supported by
this driver. Remove the boardinfo just open-code the values in the
attach function.

Note: the only other board that could be supported by this driver is
the ADLink PCI-9111DG board. This board has 12-bit analog inputs
instead of the 16-bit inputs of the PCI-9111HR board. Unfortunately
these boards share the same PCI vendor/device id.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:05:55 -07:00
H Hartley Sweeten f212a372c2 staging: comedi: adl_pci9111: remove 'single' channel list check
The comedi core verifies that the chanlist elements are inrange for
the subdevice. Remove the redundant check in thie driver.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:05:55 -07:00
H Hartley Sweeten e6e69aa130 staging: comedi: adl_pci9111: remove chanlist_len checks
The chanlist_len is validated by the comedi core before calling
the do_cmdtest function. Remove these redundant checks.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:05:55 -07:00
H Hartley Sweeten 3acf31763f staging: comedi: adl_pci9111: digital input/output subdevices are fixed
The digital input and output subdevices are the same for all boards
supported by this driver. Remove the defines just open-code the values
in the attach function.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:05:55 -07:00
H Hartley Sweeten 05841b3638 staging: comedi: adl_pci9111: analog output subdevice is fixed
The analog output subdevice is the same for all boards supported
by this driver. Remove the boardinfo for it and just open-code
the values in the attach function.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:05:55 -07:00
H Hartley Sweeten 2f002cc9b8 staging: comedi: adl_pci9111: cleanup ai read in pci9111_ai_insn_read()
The shift, maxdata, and invert values, used to handle the 12-/16-bit
analog input differences, can be calculated based on the subdevice
maxdata value.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:05:54 -07:00
H Hartley Sweeten b5d8d11931 staging: comedi: adl_pci9111: remove pci9111_{hr_, )ai* macros
These macros rely on a local variable having a specific name.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:02:24 -07:00
H Hartley Sweeten af031edf3f staging: comedi: adl_pci9111: cleanup pci9111_ai_munge()
The shift, maxdata, and invert values, used to handle the 12-/16-bit
analog input differences, can be calculated based on the subdevice
maxdata value.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:02:24 -07:00
H Hartley Sweeten 2873ea8154 staging: comedi: adl_pci9111: remove AI_INSN_DEBUG code
This debug output should be removed in the final driver.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:02:24 -07:00
H Hartley Sweeten 2084fd19f8 staging: comedi: adl_pci9111: cleanup pci9111_ao_insn_write()
Remove the unnecessary comment.

Only the last data value written needs to be cached for
readback.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:02:24 -07:00
H Hartley Sweeten 6b7044dcfc staging: comedi: adl_pci9111: cleanup ao resolution
The 'ao_resolution' in the boardinfo is not used. Remove it.

Rename the 'ao_resolution_mask' to 'ao_maxdata', this information
is copied to the ao subdevice 'maxdata'.

Remove the PCI9111_AO_RESOLUTION* defines and just open-code the
maxdata in the boardinfo.

Remove the mask of the output data in pci9111_ao_insn_write(),
the comedi core insures that the data is valid.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:02:24 -07:00
H Hartley Sweeten b3450faf38 staging: comedi: adl_pci9111: cleanup pci9111_ao_insn_read()
Remove the unnecessary comments.

The readback value does not need to be masked.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:02:24 -07:00
H Hartley Sweeten dc79022aef staging: comedi: adl_pci9111: remove pci9111_ao_set_data macro
This macro relies on a local variable having a specific name.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:02:23 -07:00
H Hartley Sweeten 83dcfee0f2 staging: comedi: adl_pci9111: cleanup pci9111_do_insn_bits()
Remove the unnecessary comments.

Cleanup the function to follow the comedi standard for digital
outputs. The 'mask' does not need to be checked, the comedi core
will make sure that it is valid based on the subdevice data.
The outputs only need to be updated if the 'mask' indicates
something is changing, otherwise we just need to return the
current "state" of the outputs.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:02:23 -07:00
H Hartley Sweeten bfa6d3b80f staging: comedi: adl_pci9111: cleanup pci9111_di_insn_bits()
Remove the unnecessary comments and remove the unneeded local variable.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:02:23 -07:00
H Hartley Sweeten 101e490a2a staging: comedi: adl_pci9111: remove pci9111_d[io]_* i/o macros
These macros rely on a local variable having a specific name.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:02:23 -07:00
H Hartley Sweeten 9d09315113 staging: comedi: adl_pci9111: use 8253 helper functions
The timer on this board is a standard 8254 compatible counter/timer.
Instead of open-coding the 8254 timer io, use the helper functions
provided by 8253.h.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:02:23 -07:00
H Hartley Sweeten d3ceb27c70 staging: comedi: adl_pci9111: remove pci9111_8254_* i/o macros
These macros rely on a local variable having a specific name.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:02:23 -07:00
H Hartley Sweeten 886edb0caf staging: comedi: adl_pci9111: remove PCI9111_IO_BASE macro
This macro relies on a local variable having a specific name.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:02:23 -07:00
H Hartley Sweeten 3faac285bb staging: comedi: adl_pci9111: remove pci9111_board_nbr macro
This macro is an open-coded version of the kernels ARRAY_SIZE
macro. Use the kernel provided macro instead.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:02:23 -07:00
H Hartley Sweeten 98943079bf staging: comedi: adl_pci9111: remove dev_private macro
This macro relies on a local variable having a specific name.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 20:02:23 -07:00
Rob Clark 119c08149a staging: drm/omap: hold a ref to the bo while waiting for flip
Since the plane hasn't yet taken a reference, we need to hold a
reference while waiting to ensure the backing GEM bo doesn't get
freed from under us.

Signed-off-by: Rob Clark <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 16:44:22 -07:00
Greg Kroah-Hartman 1004689cd9 Merge tag 'iio-for-3.7c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into work-next
Third set of IIO rework and new drivers for the 3.7 cycle.

This set includes:

1) HID sensor drivers. This includes a core elements in the
HID subsystem merged through the IIO tree because we have some
ABI changes outstanding (some in this set) which will effect them.
The HID sensors specification covers an extremely wide range of
sensors so we will probably be seeing lots more elements of this
as the hardware hits the market.

2) Some general abi cleanups to use the utility function
iio_push_to_buffer and to drop the used timestamp parameter
from the same call.  For a long time timestamps have taken
the same path as all other channel types into the buffers so
it is good to clean this out.

3) More ADC driver support for Analog Devices parts in the form
of one new driver and some additional supported parts via current
drivers.

4) An increase to the accuracy of the calibration scale for
the isl29018 driver.

So a mixed bag, but all good additions to IIO.
2012-09-10 16:10:28 -07:00
Aaro Koskinen a7e46d8b5c staging: xgifb: delete redundant casts
Delete some redundant casts.

Signed-off-by: Aaro Koskinen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 15:48:17 -07:00
Aaro Koskinen e8cb03d422 staging: xgifb: use correct type for VBVCLKData
Use correct type to eliminate casting.

Signed-off-by: Aaro Koskinen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 15:48:17 -07:00
Aaro Koskinen 8951dadc97 staging: xgifb: delete ISXPDOS
Delete unneeded flag.

Signed-off-by: Aaro Koskinen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 15:48:17 -07:00
Aaro Koskinen d21222d186 staging: xgifb: mark constant data with const
Mark some data tables as const.

Signed-off-by: Aaro Koskinen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 15:48:17 -07:00
Aaro Koskinen 073b61e8c1 staging: xgifb: access static data tables directly
Access some data tables directly instead of using pointers.

Signed-off-by: Aaro Koskinen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 15:48:17 -07:00
Aaro Koskinen d3ae5762c6 staging: xgifb: use "else if"
Use "else if" when possible to reduce nesting.

Signed-off-by: Aaro Koskinen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 15:48:17 -07:00
Aaro Koskinen 14f7c11187 staging: xgifb: delete XGI_LCDDataTablStruct
Delete an unused structure.

Signed-off-by: Aaro Koskinen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 15:48:17 -07:00
Aaro Koskinen 898df16401 staging: xgifb: delete LCDLenList
LCDLenList is redundant. It's only used for modifying a write-only stack
variable. Delete also related #defines.

Signed-off-by: Aaro Koskinen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 15:48:17 -07:00
Aaro Koskinen 378fd8a582 staging: xgifb: XGI_GetLcdPtr: delete dead code
Only table values 0..5 are ever used.

Signed-off-by: Aaro Koskinen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 15:48:17 -07:00
Aaro Koskinen bc9ffcc2c6 staging: xgifb: delete Chrontel 7017 LCD data
Delete unused Chrontel 7017 LCD data.

Signed-off-by: Aaro Koskinen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 15:48:16 -07:00
Aaro Koskinen 18ba866bb4 staging: xgifb: use a real pointer for TV DATAPTR
Replace DATAPTR numbers with a real pointer to make code simpler.

Signed-off-by: Aaro Koskinen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 15:48:16 -07:00
Aaro Koskinen 2457254560 staging: xgifb: use proper typing for TV data
There's a dangerous cast from XGI330_TVDataStruct to SiS_TVData. Use
SiS_TVData everywhere, also the data can be made const.

Signed-off-by: Aaro Koskinen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 15:48:16 -07:00
Aaro Koskinen 6265ee4c0b staging: xgifb: delete Chrontel TV data
Delete unused Chrontel TV data.

Signed-off-by: Aaro Koskinen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 15:48:16 -07:00
Aaro Koskinen 56d276cad4 staging: xgifb: XGI_GetTVPtr: drop the table parameter
Only one TV data table is used by the driver, delete unneeded complexity.

Signed-off-by: Aaro Koskinen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 15:48:16 -07:00
Aaro Koskinen 4c047ac461 staging: xgifb: avoid copy-pasting LCD data
Share the common data tables instead of having the same data in multiple
tables.

Signed-off-by: Aaro Koskinen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 15:48:16 -07:00
Aaro Koskinen 4d8f5ca7d2 staging: xgifb: delete redundant chip type check
All chip type values are covered by (chip >= XG20 || chip >= XG40).

Signed-off-by: Aaro Koskinen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 15:48:16 -07:00
Aaro Koskinen c62c517e51 staging: xgifb: delete some unused #defines
Delete some unused #defines.

Signed-off-by: Aaro Koskinen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 15:48:16 -07:00
Aaro Koskinen 31fb40fd13 staging: xgifb: delete IF_DEF_LCDA
IF_DEF_LCDA is always true.

Signed-off-by: Aaro Koskinen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 15:48:16 -07:00
Aaro Koskinen 6e90d0570d staging: xgifb: delete IF_DEF_ExpLink
Delete a flag which is never set.

Signed-off-by: Aaro Koskinen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 15:48:15 -07:00
Aaro Koskinen 886230c12d staging: xgifb: replace XGI_XG21SetPanelDelay() with mdelay()
Eliminate a trivial wrapper function.

Signed-off-by: Aaro Koskinen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-09-10 15:48:15 -07:00