summaryrefslogtreecommitdiffstats
path: root/drivers/staging
AgeCommit message (Collapse)AuthorFilesLines
2013-06-24staging: comedi: pcmuio: introduce pcmuio_read()H Hartley Sweeten1-21/+24
Introduce a helper function to handle reading a 24-bit value from the three 8-bit registers associated with a "port" or "page". Simplify the for() loop in pcmuio_handle_asic_interrupt() that finds which channels have triggered the interrupt. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-24staging: comedi: pcmuio: simplify interrupt subdevice initH Hartley Sweeten1-28/+14
Only subdevices 0 and 2 support interrupts. Simplify the attach a bit. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-24staging: comedi: pcmuio: remove 'iobases' from subdevice private dataH Hartley Sweeten1-23/+15
The 'asic' and 'port' associated with a given subdevice can easily be found based on the subdevice 'index'. With that information we can then calculate the correct iobase and register offset needed to read/ write the 8-bit ports. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-24staging: comedi: pcmuio: remove 'iobase' from private dataH Hartley Sweeten1-7/+4
It's simple enough to calculate the iobase when needed. Remove this member from the private data. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-24staging: comedi: pcmuio: simplify 'n_subdevs' and 's->n_chan'H Hartley Sweeten1-14/+3
The number of subdevices needed by the driver is based on the 'num_asics' reported by the boardinfo and each subdevice always has 24 channels. Simplify the attach a bit. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-24staging: comedi: pcmuio: remove unused boardinfoH Hartley Sweeten1-4/+0
These members of the boardinfo are not used by the driver. Remove them. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-24staging: comedi: pcmuio: kzalloc'ed data does not need clearedH Hartley Sweeten1-3/+0
The 'subpriv' pointer is kzalloc'ed during the attach. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-24staging: comedi: pcmuio: remove 'asic_chan'H Hartley Sweeten1-8/+1
This member of the subdevice private data is always initialize to '0' due to the 'thisasic_chanct' always being zero when it is set during the attach. Simplify the driver a bit by removing it. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-24staging: comedi: pcmuio: remove 'num_asic_chans'H Hartley Sweeten1-10/+3
This member of the subdevice private data is always initialize to s->n_chan if the subdevice supports interrupts and is only used in functions that can be called by the interrupt subdevice. Simplyfy the driver a bit by removing it and just using s->n_chan. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-24staging: comedi: pcmuio: remove 'first_chan'H Hartley Sweeten1-9/+2
This member of the subdevice private data is always initialize to '0' due to the 'byte_no' always being zero when it is set during the attach. Simplify the driver a bit by removing it. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-24staging: comedi: pcmuio: remove unused private data variablesH Hartley Sweeten1-8/+0
These members of the private data are either not referenced or are set but never used by the driver. Remove them. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-24staging: comedi: pcmuio: introduce pcmuio_write()H Hartley Sweeten1-50/+32
Introduce a helper function to handle writing a 24-bit value to the three 8-bit registers associated with a "port" or "page". Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-24staging: comedi: pcmuio: tidy up switch_page()H Hartley Sweeten1-15/+1
All the I/O ports are left unlocked in the driver so the 'pagelock' in the private data is not necessary. The paranoia sanity checks are also unnecessary, Remove them. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-24staging: comedi: pcmuio: tidy up the register map definesH Hartley Sweeten1-65/+42
Add namespace to the register map defines. Gather them together and tidy them up a bit. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-24staging: comedi: pcmuio: remove unused {lock,unlock}_port()H Hartley Sweeten1-33/+0
These functions are #ifdef'ed out and not needed in the driver. Just remove them. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-24staging: comedi: have comedi_set_spriv() allocate the memoryH Hartley Sweeten6-42/+28
As suggested by Ian Abbott, comedi_set_spriv() can only be used to set the subdevice->private pointer to something that can be kfree()'d. Rename the function to comedi_alloc_spriv() and have it kzalloc() the memory as well as set the private pointer. This saves a function call in the drivers and avoids the possibility of incorrectly calling comedi_set_spriv() for some pointer that is not meant to be kfree()'d. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-24Merge 3.10-rc7 into usb-nextGreg Kroah-Hartman3-3/+6
We want the USB fixes and other good stuff in this branch as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-24Merge 3.10-rc7 into driver-core-nextGreg Kroah-Hartman3-3/+6
We want the firmware merge fixes, and other bits, in here now. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-19staging: comedi: addi-data: remove unused 'i_NbrTTLChannel' boardinfoH Hartley Sweeten2-18/+1
None of the addi-data drivers that still use the "common" code have ttl digital i/o. Remove the unnecessary boardinfo as well as the subdevice initialization code. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-19staging: comedi: addi-data: remove unused 'i_Dma' present flagH Hartley Sweeten3-4/+1
None of the addi-data drivers that still use the "common" code support dma. Remove the unnecessaary boardinfo and private data flags. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-19staging: comedi: addi-data: remove unused vars from boardinfoH Hartley Sweeten2-22/+0
Due to the on-going cleanup of the addi-data drivers, the boardinfo used in the "common" code has a number of variables that are not used. Remove the cruft. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-19staging: comedi: addi-data: remove unused defines in addi_common.hH Hartley Sweeten1-5/+0
Due to the on-going cleanup of the addi-data drivers, there are a number of unused defines in addi_common.h. Remove the cruft. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-19staging: comedi: addi-data: simplify the PCI bar readingH Hartley Sweeten2-17/+8
All of the remaining addi-data drivers that use the "common" code either do not have an eeprom or the PCI controller chip is not a PLX PCI 9054. Knowing this we can simplify the common code that reads the PCI bars to get the iobase addresses. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-19staging: comedi: addi-data: remove unused vars from private dataH Hartley Sweeten4-35/+0
Due to the on-going cleanup of the addi-data drivers, the private data used in the "common" code has a number of variables that either are not used at all or or set but never used. Remove all of them from the private data and the unnecessary use in the drivers. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-19staging: rtl8192u: fix comments in r819xU_phy.cXenia Ragiadakou1-433/+475
This patch fixes the comments in r819xU_phy.c by: - replacing "// ..." with "/* .... */" - removing unnecessary comments, the dates and names of developers from comments - fixing some inconsistent comments - fixing some typos - fixing alignment issues Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-19staging: rtl8192u: fix spaces around ',' in r819xU_phy.cXenia Ragiadakou1-31/+31
This patch fixes the whitespace around ',' to meet the linux kernel coding style. Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-19staging: rtl8192u: remove variable 'Ret' in r819xU_phy.cXenia Ragiadakou1-3/+2
This patch removes variable 'Ret' from rtl8192_QueryBBReg() since its value is returned immediately after it is assigned. The name 'Ret', anyway, does not give any insight and the function description comment is sufficiently informative regarding the returned value. Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-19Staging: netlogic: fix missing free_netdev() on error in xlr_net_probe()Wei Yongjun1-3/+2
Fix missing free_netdev() before return from function xlr_net_probe() in the devm_ioremap_resource() error handling case. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-18Staging: silicom: move more assignments out of if conditionsChad Williamson1-19/+34
Remove more assignments from if-statement conditions in bpctl_mod.c, resolving checkpatch.pl errors. Those that remain need more attention than I'm presently prepared to give them. Signed-off-by: Chad Williamson <chad@dahc.us> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-18Staging: silicom: move assignments out of if conditionsChad Williamson1-20/+34
Remove a bunch of assignments from if-statement conditions in bpctl_mod.c, resolving checkpatch.pl errors. (This isn't all of them, but the patch is getting rather long...) Signed-off-by: Chad Williamson <chad@dahc.us> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-18Staging: silicom: remove unnecessary braces in bpctl_mod.cChad Williamson1-35/+23
Remove unnecessary braces in bpctl_mod.c, resolving checkpatch.pl warnings. Signed-off-by: Chad Williamson <chad@dahc.us> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-18staging: rtl8192u: rename general variables in r819xU_phy.cXenia Ragiadakou1-89/+89
This patch renames the following variables: - dwRegAddr and RegAddr into reg_addr - dwData and Data into data - BitShift into bitshift - Offset into offset - NewOffset into new_offset - Bandwidth into bandwidth The renaming was done to remove camel case and unnecessary 'dw' prefix from the above variable names. Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-18staging: rtl8192u: rename *BitMask variables in r819xU_phy.cXenia Ragiadakou1-41/+41
This patch renames BitMask and dwBitMask variables into bitmask to remove camel case. dwBitMask in the given context can be renamed into simply bitmask since its number of bits (dw->32) can be deduced by its type which is u32. Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-18staging: rtl8192u: replace *Value variables in r819xU_phy.cXenia Ragiadakou1-36/+39
This patch renames the variables OriginalValue, NewValue, Original_Value, New_Value and retValue to reg, and the variables bRegValue and dwRegValue to reg_u8 and reg_u32, respectively. This is done primarily in order to reduce the variable name length and consequently line length. Also, it replaces the pair of Original and New variables with one variable. Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-18staging: rtl8192u: fix spaces around relational operators in r819xU_phy.cXenia Ragiadakou1-20/+20
This patch fixes the whitespace around relational operators to meet the linux kernel coding style. Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-18staging: rtl8192u: fix spaces around ';' in r819xU_phy.cXenia Ragiadakou1-6/+6
This patch fixes the whitespace around ';' to meet the linux kernel coding style. Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-18staging: rtl8192u: fix spaces around '=' in r819xU_phy.cXenia Ragiadakou1-23/+23
This patch fixes the whitespace around the assignment operator to meet linux kernel coding style. Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-18staging: imx_drm: imx_ldb: fix 18 bit formatMarkus Niebel1-1/+17
Since 18 bit is supported as datawidth in device tree it should be supported in driver. Beside the LDB channel the IPU channel has also to be configured to use BGR666. Signed-off-by: Markus Niebel <Markus.Niebel@tqs.de> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-18staging: drm/imx: Add LDB supportSascha Hauer3-0/+618
This adds support for the LVDS Display Bridge contained in i.MX5 and i.MX6 SoCs. Bit mapping, data width, and video timings are configurable via device tree. Dual-channel mode is supported for a single high-resolution source. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-18staging/rtl8192u: remove commented out __list_for_each usageDave Jones1-2/+1
Also remove another commented out open-coded list manipulation while we're there. Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-18staging/rtl8187se: Convert __list_for_each use to list_for_eachDave Jones1-2/+2
Also remove commented out list manipulation Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-18staging: octeon-usb: octeon-hcd: eliminate printk()sAaro Koskinen1-2/+1
Replace one printk() with dev_dbg(), and delete the other. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-18staging: octeon-usb: octeon-hcd: delete commented-out codeAaro Koskinen1-1/+0
Delete commented-out code. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-18staging: octeon-usb: octeon-hcd: reformat long commentsAaro Koskinen1-22/+52
Fix some comments to fit into 80 colums. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-18staging: octeon-usb: octeon-hcd: use dev_dbgAaro Koskinen1-88/+77
Replace DEBUG macros with dev_dbg. Some less useful are completely deleted. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-18Merge branch 'v4l_for_linus' of ↵Linus Torvalds3-3/+6
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media Pull media fixes from Mauro Carvalho Chehab: "Series of fixes for 3.10. There are some usual driver fixes (mostly on s5p/exynos playform drivers), plus some fixes at V4L2 core" * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (40 commits) [media] soc_camera: error dev remove and v4l2 call [media] sh_veu: fix the buffer size calculation [media] sh_veu: keep power supply until the m2m context is released [media] sh_veu: invoke v4l2_m2m_job_finish() even if a job has been aborted [media] v4l2-ioctl: don't print the clips list [media] v4l2-ctrls: V4L2_CTRL_CLASS_FM_RX controls are also valid radio controls [media] cx88: fix NULL pointer dereference [media] DocBook/media/v4l: update version number [media] exynos4-is: Remove "sysreg" clock handling [media] exynos4-is: Fix reported colorspace at FIMC-IS-ISP subdev [media] exynos4-is: Ensure fimc-is clocks are not enabled until properly configured [media] exynos4-is: Prevent NULL pointer dereference when firmware isn't loaded [media] s5p-mfc: Add NULL check for allocated buffer [media] s5p-mfc: added missing end-of-lines in debug messages [media] s5p-mfc: v4l2 controls setup routine moved to initialization code [media] s5p-mfc: separate encoder parameters for h264 and mpeg4 [media] s5p-mfc: Remove special clock usage in driver [media] s5p-mfc: Remove unused s5p_mfc_get_decoded_status_v6() function [media] v4l2: mem2mem: save irq flags correctly [media] coda: v4l2-compliance fix: add VIDIOC_CREATE_BUFS support ...
2013-06-17Merge 3.10-rc6 into driver-core-nextGreg Kroah-Hartman6-30/+16
We want these fixes here too. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-17silicom: checkpatch: trailing statementsLorenz Haspel1-4/+8
fixed checkpatch error: trailing statements that should be on next line Signed-off-by: Lorenz Haspel <lorenz@badgers.com> Signed-off-by: Michael Banken <michael.banken@mathe.stud.uni-erlangen.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-17silicom: checkpatch: fixed whitespace errorsLorenz Haspel1-3/+3
started cleanfile also fixed some other whitespace errors cleanfile didn't find Signed-off-by: Lorenz Haspel <lorenz@badgers.com> Signed-off-by: Michael Banken <michael.banken@mathe.stud.uni-erlangen.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-17staging: serqt_usb2: lines over 80 characters fixedBernd Bassimir1-11/+11
Changed name of one variable, so that all lines are now below 80 characters. Signed-off-by: Bernd Bassimir <bassimir.kernel@gmx.de> Signed-off-by: Nico Doerr <nico.doerr@hawo.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>