- 08 Jan, 2014 25 commits
-
-
Liu Ying authored
This patch declares the function of_get_tve_mode as a static one to fix this sparse warning: drivers/staging/imx-drm/imx-tve.c:563:11: warning: \ symbol 'of_get_tve_mode' was not declared. \ Should it be static? Acked-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Liu Ying <Ying.Liu@freescale.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Greg Kroah-Hartman authored
Merge tag 'iio-for-3.14c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next Jonathan writes: Third round of new drivers, features and cleanups for IIO in the 3.14 cycle. One new driver a spot of new functionality and a cleanup. * New driver for the Capella CM32181 ambient light sensor. This is the first driver directly from Kevin at Capella with more already in the pipeline. * Support for configurable predividers on the mxs lradc * Convert a field to a bitmap in mxs lradc instead of using an array of unsigned longs to store boolean values.
-
Martin Hofmann authored
This patch fixes the usage of printk in wpactl.c concering one missing log level occurence and some whitespaces before a newline. Signed-off-by: Martin Hofmann <martin.hofmann@studium.uni-erlangen.de> Signed-off-by: Michael Gunselmann <michael.gunselmann@studium.uni-erlangen.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Martin Hofmann authored
wpactl.h contained some typedefs for enums. These were removed in this patch. Also, a typedef for a type "unsigned long long" that was only instantiated in one place was removed and its declaration altered. Signed-off-by: Martin Hofmann <martin.hofmann@studium.uni-erlangen.de> Signed-off-by: Michael Gunselmann <michael.gunselmann@studium.uni-erlangen.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Martin Hofmann authored
This patch fixes indentation style belonging to function calls as well as some run-away closing parentheses when calling functions. Signed-off-by: Martin Hofmann <martin.hofmann@studium.uni-erlangen.de> Signed-off-by: Michael Gunselmann <michael.gunselmann@studium.uni-erlangen.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Martin Hofmann authored
This patch removes some unnecessary braces concerning if-statements in the file wroute.c Signed-off-by: Martin Hofmann <martin.hofmann@studium.uni-erlangen.de> Signed-off-by: Michael Gunselmann <michael.gunselmann@studium.uni-erlangen.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Martin Hofmann authored
The file wroute.c contained some silly casts. This patch removes them. Signed-off-by: Martin Hofmann <martin.hofmann@studium.uni-erlangen.de> Signed-off-by: Michael Gunselmann <michael.gunselmann@studium.uni-erlangen.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Martin Hofmann authored
The file 80211hdr.h contained the macro WLAN_GET_FC_PRVER(n). The big endian fashion of this macro had unbalanced parentheses. This patch removes the parentheses in question. Signed-off-by: Martin Hofmann <martin.hofmann@studium.uni-erlangen.de> Signed-off-by: Michael Gunselmann <michael.gunselmann@studium.uni-erlangen.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Dan Carpenter authored
We dereference "param->u.wpa_key.key" on the next line so the check here is inconsistent. This is only called from iwctl_siwencodeext() and "param->u.wpa_key.key" is a valid pointer. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Dan Carpenter authored
key_len == MAX_KEY_LEN is valid but we return an error. Introduced-by: 6b7200fe ('Staging: vt6655: memory corruption in check in wpa_set_wpadev()') Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Malcolm Priestley authored
uBeaconInterval becomes u32 get next TBTT value using vendor's equation as shown. This patch was checked against the original code and yields exactly the same value. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Malcolm Priestley authored
value uLowNextTBTT yields wrong value. ULL is needed with qwTSF Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Cc: stable@vger.kernel.org # v3.9+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Simon Schuster authored
Long lines are split into multiple ones to reduce the line length. Additionally some alignment fixes are made that previous patches missed. Unfortunately, due to the high indentation levels present in parts of bssdb.c, this patch leaves some lines which are longer than 80 characters. Signed-off-by: Sebastian Rachuj <sebastian.rachuj@studium.uni-erlangen.de> Signed-off-by: Simon Schuster <linux@rationality.eu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Sebastian Rachuj authored
Explicit comparisons of pointers agains NULL (like if (p != NULL) ...) are not as readable as the implicit comparison (like if (p) ...). This patch converts all these explicit comparisons to implicit ones. Signed-off-by: Sebastian Rachuj <sebastian.rachuj@studium.uni-erlangen.de> Signed-off-by: Simon Schuster <linux@rationality.eu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Sebastian Rachuj authored
Removes unrequired parentheses around comparisons in complex conditions. Signed-off-by: Sebastian Rachuj <sebastian.rachuj@studium.uni-erlangen.de> Signed-off-by: Simon Schuster <linux@rationality.eu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Simon Schuster authored
This patch reduces the level of indentation in bssdb.c of the vt6656 driver by transforming nested conditions to a series of logical conjunctions. E.g. if (cond1) { if (cond2) { block(); } } is transformed to if (cond1 && cond2) { block(); } Signed-off-by: Sebastian Rachuj <sebastian.rachuj@studium.uni-erlangen.de> Signed-off-by: Simon Schuster <linux@rationality.eu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Simon Schuster authored
Conforming to the linux coding style guidelines, a single line block of an if statement does not require curly braces unless another block of the if cascade requires them. Therefore unnecessary curly braces are removed by this patch and missing ones are added. Signed-off-by: Sebastian Rachuj <sebastian.rachuj@studium.uni-erlangen.de> Signed-off-by: Simon Schuster <linux@rationality.eu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Simon Schuster authored
This patch combines single ifs within the block of an else to a single else if statement. Therefore code that looks like that else { if (cond) { statements; } else { other_statements; } } is converted to code that looks like that else if (cond) { statements; } else { other_statements; } Signed-off-by: Sebastian Rachuj <sebastian.rachuj@studium.uni-erlangen.de> Signed-off-by: Simon Schuster <linux@rationality.eu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Simon Schuster authored
A space in a format string is unnecessary if it is followed by a line feed. These spaces are removed by this patch. Signed-off-by: Sebastian Rachuj <sebastian.rachuj@studium.uni-erlangen.de> Signed-off-by: Simon Schuster <linux@rationality.eu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Simon Schuster authored
An else belongs in the same line as the closing curly brace of the previous block. Hence, this patch removes line feeds separating a curly brace from the corresponding else. Signed-off-by: Sebastian Rachuj <sebastian.rachuj@studium.uni-erlangen.de> Signed-off-by: Simon Schuster <linux@rationality.eu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Simon Schuster authored
Adds missing spaces between an if-statement and its condition as well as between the condition and the following curly brace. At casts there is also a space added between the type and the variable. Spaces that either follow an opening parenthese or the sizeof operator or that preceed semicolons are removed as well. Signed-off-by: Sebastian Rachuj <sebastian.rachuj@studium.uni-erlangen.de> Signed-off-by: Simon Schuster <linux@rationality.eu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Simon Schuster authored
Adds spaces around operators (like &&, ||, !=, +, ...) and removes spaces before postfix increment and decrement operators. Parentheses around return values are removed, too. Signed-off-by: Sebastian Rachuj <sebastian.rachuj@studium.uni-erlangen.de> Signed-off-by: Simon Schuster <linux@rationality.eu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Simon Schuster authored
After some blocks in bssdb.c there are semicolons that are not required to be there. Therefore they are removed with this patch. Signed-off-by: Sebastian Rachuj <sebastian.rachuj@studium.uni-erlangen.de> Signed-off-by: Simon Schuster <linux@rationality.eu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Simon Schuster authored
Changes C99-style comments to C89-style ones to conform to the linux coding guidelines. Additionally removes plus and minus signs from the function description comments. Signed-off-by: Sebastian Rachuj <sebastian.rachuj@studium.uni-erlangen.de> Signed-off-by: Simon Schuster <linux@rationality.eu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Simon Schuster authored
Corrects indentation by using tabs instead of spaces. This also includes modification of the alignment of multi-line expressions and statements. Signed-off-by: Sebastian Rachuj <sebastian.rachuj@studium.uni-erlangen.de> Signed-off-by: Simon Schuster <linux@rationality.eu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
- 01 Jan, 2014 5 commits
-
-
Alexandre Belloni authored
mxs_lradc.is_divided was an unsigned long array. Convert it to a bitmap to save some memory. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-
Hector Palacios authored
Added write_raw function to manipulate the optional divider_by_two through the scaling attribute out of the available scales. Signed-off-by: Hector Palacios <hector.palacios@digi.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Marek Vasut <marex@denx.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-
Hector Palacios authored
Adds in_voltageX_scale_available file for every channel to read the different available scales. There are two scales per channel: [0] = divider_by_two disabled (default) [1] = divider_by_two enabled The scale is a struct made of integer and nano parts to build a long decimal number. Signed-off-by: Hector Palacios <hector.palacios@digi.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Marek Vasut <marex@denx.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-
Hector Palacios authored
Some LRADC channels have fixed pre-dividers and all have an optional divider by two which allows a maximum input voltage of VDDIO - 50mV. This patch - adds the scaling info flag to all channels - grabs the max reference voltage per channel (where the fixed pre-dividers apply) - allows to read the scaling attribute (computed from the Vref) Signed-off-by: Hector Palacios <hector.palacios@digi.com>. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Marek Vasut <marex@denx.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-
Kevin Tsai authored
Add Capella Microsystem CM32181 Ambient Light Sensor IIO driver. This driver will convert raw data to lux value under open-air condition. Change the calibscale based on the cover material. Signed-off-by: Kevin Tsai <ktsai@capellamicro.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-
- 24 Dec, 2013 2 commits
-
-
Greg Kroah-Hartman authored
Merge tag 'iio-for-3.14b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next Jonathan writes: 2nd round of new IIO drivers, features and cleanups for the 3.14 cycle. New drivers * HID inclinometer driver. * DHT11 humidity driver. Note that previous humidity drivers have been in hwmon, but no one was ever entirely happy with that, and they should find a more comfortable home in IIO (their original placement in hwmon was my fault - oops). As this is our first humidity driver, core support is also added. New features * Two of mxs-lradc channels are internally wired to a temperature sensor, make this explicit in the driver by providing the relevant temperature channel. * Add support for blocking IO on buffers. * Add a data_available call back to the interface between buffer implementations and the core. This is much cleaner than the old, 'stufftoread' flag. Implemented in the kfifo buffer. Cleanups * Last user of the old event configuration interface is converted and the old interface dropped. Nice to be rid of this thanks to Lars-Peter's hard work! * Replace all remaining instances of the IIO_ST macro with explicit filling of the scan_type structure within struct iio_chan_spec. This macro was a bad idea, that rapidly ceased to cover all elements of the structure. Miss reading of the macro arguements has led to a number of bugs so lets just get rid of it. The final removal patch is awaiting for some fixes to make their way into mainline. In a couple of drivers, no elements of scan_type were even being used so in those case, it has been dropped entirely. * Drop a couple of of_match_ptr helper uses in drivers where devicetree is not optional and hence the structures being protected by this always exist. * Fix up some cases where data was read from a device in a particular byte order, but he code placed it into a s16 or similar. These were highlighted by Sparse. * Use the new ATTRIBUTE_GROUPS macro to drop some boiler plate in the triggers core code. * ad7746 and ad7280a - stop storing buffers on the stack, giving cleaner code and possibly avoiding issues with i2c bus drivers that assume they can dma directly into the buffer. Note that this cannot currently happen as the the i2c_smbus_read_i2c_block_data function has a memcpy from the buffer actually passed to the bus driver. I missed this element of the commit message and don't think it is major enough to rebase the iio tree. * ad5791 and ad5504 stop storing buffers on the stack for an SPI driver. Unlike the i2c drivers, this is a real issue for SPI drivers which can dma directly into the buffer supplied.
-
Greg Kroah-Hartman authored
This resolves a merge issue with drivers/staging/imx-drm/imx-drm-core.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
- 22 Dec, 2013 8 commits
-
-
Linus Torvalds authored
-
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds authored
Pull ARM SoC fixes from Olof Johansson: "Much smaller batch of fixes this week. Biggest one is a revert of an OMAP display change that removed some non-DT pinmux code that was still needed for 3.13 to get DSI displays to work. There's also a fix that resolves some misdescribed GPIO controller resources on shmobile. The rest are mostly smaller fixes, a couple of MAINTAINERS updates, etc" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: Revert "ARM: OMAP2+: Remove legacy mux code for display.c" MAINTAINERS: Add keystone clock drivers MAINTAINERS: Add keystone git tree information ARM: s3c64xx: dt: Fix boot failure due to double clock initialization ARM: shmobile: r8a7790: Fix GPIO resources in DTS irqchip: renesas-intc-irqpin: Fix register bitfield shift calculation ARM: shmobile: lager: phy fixup needs CONFIG_PHYLIB
-
git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394Linus Torvalds authored
Pull firewire fixlet from Stefan Richter: "A one-liner to reenable WRITE SAME over SBP-2 like in v3.8...v3.12. Buggy targets which could malfunction when being subjected to this command are already sufficiently protected by a scsi_level check in sd + SCSI core" * tag 'firewire-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394: firewire: sbp2: bring back WRITE SAME support
-
git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pendingLinus Torvalds authored
Pull SCSI target fixes from Nicholas Bellinger: "Mostly minor items this time around, the most notable being a FILEIO backend change to enforce hw_max_sectors based upon the current block_size to address a bug where large sized I/Os (> 1M) where being rejected" * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: qla2xxx: Fix scsi_host leak on qlt_lport_register callback failure target: Remove extra percpu_ref_init target/file: Update hw_max_sectors based on current block_size iser-target: Move INIT_WORK setup into isert_create_device_ib_res iscsi-target: Fix incorrect np->np_thread NULL assignment qla2xxx: Fix schedule_delayed_work() for target timeout calculations iser-target: fix error return code in isert_create_device_ib_res() iscsi-target: Fix-up all zero data-length CDBs with R/W_BIT set target: Remove write-only stats fields and lock from struct se_node_acl iscsi-target: return -EINVAL on oversized configfs parameter
-
git://git.kvack.org/~bcrl/aio-nextLinus Torvalds authored
Pull AIO leak fixes from Ben LaHaise: "I've put these two patches plus Linus's change through a round of tests, and it passes millions of iterations of the aio numa migratepage test, as well as a number of repetitions of a few simple read and write tests. The first patch fixes the memory leak Kent introduced, while the second patch makes aio_migratepage() much more paranoid and robust" * git://git.kvack.org/~bcrl/aio-next: aio/migratepages: make aio migrate pages sane aio: fix kioctx leak introduced by "aio: Fix a trinity splat"
-
Linus Torvalds authored
Since commit 36bc08cc ("fs/aio: Add support to aio ring pages migration") the aio ring setup code has used a special per-ring backing inode for the page allocations, rather than just using random anonymous pages. However, rather than remembering the pages as it allocated them, it would allocate the pages, insert them into the file mapping (dirty, so that they couldn't be free'd), and then forget about them. And then to look them up again, it would mmap the mapping, and then use "get_user_pages()" to get back an array of the pages we just created. Now, not only is that incredibly inefficient, it also leaked all the pages if the mmap failed (which could happen due to excessive number of mappings, for example). So clean it all up, making it much more straightforward. Also remove some left-overs of the previous (broken) mm_populate() usage that was removed in commit d6c355c7 ("aio: fix race in ring buffer page lookup introduced by page migration support") but left the pointless and now misleading MAP_POPULATE flag around. Tested-and-acked-by: Benjamin LaHaise <bcrl@kvack.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-
Sachin Kamat authored
'hmc5843_of_match' is always compiled in. Hence the helper macro is not needed. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-
Sachin Kamat authored
'cm36651_of_match' is always compiled in. Hence the helper macro is not needed. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-