summaryrefslogtreecommitdiff
path: root/drivers/staging
AgeCommit message (Collapse)Author
2013-06-23console/font: Refactor font support code selection logicGeert Uytterhoeven
The current Makefile rules to build font support are messy and buggy. Replace them by Kconfig rules: - Introduce CONFIG_FONT_SUPPORT, which controls the building of all font code, - Select CONFIG_FONT_SUPPORT for all drivers that use fonts, - Select CONFIG_FONT_8x16 for all drivers that default to the VGA8x16 font, - Drop the bogus console dependency for CONFIG_VIDEO_VIVI, - Always process drivers/video/console/Makefile, as some drivers need fonts even if CONFIG_VT is not set. This fixes (if CONFIG_SOLO6X10=y and there are no built-in console drivers): drivers/built-in.o: In function `solo_osd_print': drivers/staging/media/solo6x10/solo6x10-enc.c:144: undefined reference to `.find_font' This fixes (if CONFIG_VT=n): drivers/built-in.o: In function `vivi_init': vivi.c:(.init.text+0x1a3da): undefined reference to `find_font' Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> [original part] Acked-by: Randy Dunlap <rdunlap@infradead.org> [drivers/video/Makefile]
2013-06-23Revert "staging/solo6x10: depend on CONFIG_FONTS"Geert Uytterhoeven
This reverts commit 8c090cfbf980581454ae4caae731574fedd7dce8. CONFIG_FONTS is not about enabling font support, but about enabling manual selection of built-in fonts. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2013-06-21[media] go7007: fix return 0 for unsupported devices in go7007_usb_probe()Alexey Khoroshilov
probe() should not return 0 for unsupported devices, but go7007_usb_probe() does. The patch fixes it to return -ENODEV. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2013-06-20Merge branch 'linus' into patchworkMauro Carvalho Chehab
* linus: (1465 commits) ARM: tegra30: clocks: Fix pciex clock registration lseek(fd, n, SEEK_END) does *not* go to eof - n Linux 3.10-rc6 smp.h: Use local_irq_{save,restore}() in !SMP version of on_each_cpu(). powerpc: Fix missing/delayed calls to irq_work powerpc: Fix emulation of illegal instructions on PowerNV platform powerpc: Fix stack overflow crash in resume_kernel when ftracing snd_pcm_link(): fix a leak... use can_lookup() instead of direct checks of ->i_op->lookup move exit_task_namespaces() outside of exit_notify() fput: task_work_add() can fail if the caller has passed exit_task_work() xfs: don't shutdown log recovery on validation errors xfs: ensure btree root split sets blkno correctly xfs: fix implicit padding in directory and attr CRC formats xfs: don't emit v5 superblock warnings on write mei: me: clear interrupts on the resume path mei: nfc: fix nfc device freeing mei: init: Flush scheduled work before resetting the device sctp: fully initialize sctp_outq in sctp_outq_init netiucv: Hold rtnl between name allocation and device registration. ...
2013-06-20net: Add missing dependencies on NETDEVICESBen Hutchings
ETRAX_ETHERNET selects ETHERNET and MII, which depend on NETDEVICES. I don't think anything should select NETDEVICES, so make it a dependency. It also doesn't need to select or depend on ETHERNET, which has nothing to do with the Ethernet library functions. BPCTL selects MII, which depends on NETDEVICES. But everything in the drivers/staging/silicom directory is related to net devices, so make NET_VENDOR_SILICOM depend on NETDEVICES and remove the now-redundant dependencies on NET. Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
2013-06-20net: Move MII out from under NET_CORE and hide itBen Hutchings
All drivers that select MII also need to select NET_CORE because MII depends on it. This is a bit ridiculous because NET_CORE is just a menu option that doesn't enable any code by itself. There is also no need for it to be a visible option, since its users all select it. Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2013-06-19staging: comedi: addi-data: remove unused 'i_NbrTTLChannel' boardinfoH Hartley Sweeten
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 Sweeten
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 Sweeten
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 Sweeten
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 Sweeten
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 Sweeten
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 Ragiadakou
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 Ragiadakou
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 Ragiadakou
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 Yongjun
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-19[media] davinci_vpfe: Clean up media entity after unregistering subdevSakari Ailus
media_entity_cleanup() frees the links array which will be accessed by media_entity_remove_links() called by v4l2_device_unregister_subdev(). Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2013-06-18Staging: silicom: move more assignments out of if conditionsChad Williamson
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 Williamson
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 Williamson
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 Ragiadakou
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 Ragiadakou
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 Ragiadakou
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 Ragiadakou
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 Ragiadakou
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 Ragiadakou
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 Niebel
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 Hauer
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 Jones
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 Jones
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 Koskinen
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 Koskinen
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 Koskinen
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 Koskinen
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 Torvalds
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-18staging/rtl8192u: convert skb->tail into skb_tail_pointer(skb)Isaku Yamahata
The change set of 7a884dc "[SK_BUFF]: Convert skb->tail to sk_buff_data_t" converted skb->tail from pointer into sk_buff_data_t. Thus skb->tail is not always pointer, the area pointed by skb->tail should be accessed via skb_tail_pointer(). Found by inspection. Compile tested only. Cc: Simon Horman <horms@verge.net.au> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: devel@driverdev.osuosl.org Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Reviewed-by: Simon Horman <horms@verge.net.au> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
2013-06-17Merge 3.10-rc6 into driver-core-nextGreg Kroah-Hartman
We want these fixes here too. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-17silicom: checkpatch: trailing statementsLorenz Haspel
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 Haspel
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 Bassimir
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>
2013-06-17staging: serqt_usb2: Fixed coding style CamelCasesBernd Bassimir
Changed names of several variables, that contained CamelCases. 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>
2013-06-17staging: rtl8192u: fix function arguments position in r819xU_phy.cXenia Ragiadakou
This patch fixes the alignment of function arguments to make it uniform across the driver trying to keep the line size below 80 characters. Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-17staging: rtl8192u: fix spaces around ( and ) in r819xU_phy.cXenia Ragiadakou
This patch removes whitespace after ')' and before ')' following the linux kernel coding style conventions. Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-17staging: rtl8192u: remove commented-out code in r819xU_phy.cXenia Ragiadakou
This patch removes commented-out code to improve code readability. Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-17staging: rtl8192u: fix spaces around for and while in r819xU_phy.cXenia Ragiadakou
This patch fixes whitespace around 'for' and 'while' following the linux kernel coding style conventions. Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-17staging: rtl8192u: fix spaces around 'if' in r819xU_phy.cXenia Ragiadakou
This patch fixes whitepace around 'if' following the linux kernel coding style convention. Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-17staging: rtl8192u: fix return statements in r819xU_phy.cXenia Ragiadakou
This patch fixes the following checkpatch error: ERROR: return is not a function, parentheses are not required Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-17staging: rtl8192u: fix braces in r819xU_phy.cXenia Ragiadakou
This patch fixes the brace position and the whitespace around braces. That corrects the following checkpatch errors: ERROR: that open brace { should be on the previous line ERROR: else should follow close brace '}' ERROR: space required after that close brace '}' Also, it removes completely an if(0) statement, instead of correcting its braces. Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-17staging: rtl8192u: fix bitshift calculation in r819xU_phy.cXenia Ragiadakou
This patch uses the ffs linux built-in routine in the computation of the bitshift to take advantage of architecture specific instructions that implement this computation more efficiently. Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-17staging: vt6656: mac.c MACvDisableKeyEntry remove dead code wOffsetMalcolm Priestley
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>