aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-08-08Staging: lustre/lustre/ptlrpc: service.c: Fixed issue with global integer ↵Daniel Machon1-1/+1
being initialized to 0 Fixed global integer initialization issue. Global variables should not be explicitly initialized to 0 or NULL. Signed-off-by: Daniel Machon <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2015-08-08Staging: lustre/lnet/selftest: framework.c: Fixed coding style issuesDaniel Machon1-4/+8
Fixed coding style issues where statement should be on the next line Signed-off-by: Daniel Machon <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2015-08-08Staging: wilc1000: wilc_platform.h: Fixed include guard spelling errorDaniel Machon1-2/+2
Fixed spelling error Signed-off-by: Daniel Machon <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2015-08-08staging: wilc1000: Remove braces for single statement 'if' and 'else'Chandra S Gorentla9-77/+52
Fixes the checkpatch.pl warning - braces {} are not necessary for any arm of this statement Signed-off-by: Chandra S Gorentla <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2015-08-08staging: wilc1000: Remove ' ' before quoted '\n'Chandra S Gorentla4-40/+40
Fixes the checkpatch.pl warning - 'unnecessary whitespace before a quoted newline'. Signed-off-by: Chandra S Gorentla <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2015-08-08staging: wilc1000: Remove unused extern declarationsChandra S Gorentla4-7/+0
'extern' declarations which are not referenced within the file are removed. Signed-off-by: Chandra S Gorentla <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2015-08-08staging: wilc1000: Add space between the bracesChandra S Gorentla1-2/+2
Inserted space between nested braces. This fixes the checkpatch.pl error - space required after that close brace '}'. Signed-off-by: Chandra S Gorentla <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2015-08-08tools: iio: remove unnecessary double pointerJoo Aun Saw2-7/+7
Remove unnecessary double pointer from channel sorting function. Signed-off-by: Joo Aun Saw <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08tools: iio: Set caller's ci_array pointer to NULL after freeJoo Aun Saw1-0/+2
On error, caller's ci_array is freed and set to NULL to avoid potential double free if some other user of this code is not sufficiently careful. Counter is reset to zero for consistency. Signed-off-by: Joo Aun Saw <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio: Fix typos in ABI documentationVladimir Barinov1-3/+3
Fix typos in ABI documentation Signed-off-by: Vladimir Barinov <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio:accel:mma8452: reorder Kconfig entryHartmut Knaack1-12/+12
Move the entry in Kconfig to its alphabetically correct position. Signed-off-by: Hartmut Knaack <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio:accel:mma8452: coding style cleanupHartmut Knaack1-38/+68
Some coding style cleanups, mainly indicated by checkpatch.pl, which includes indentation changes, drop spaces after casts and befor tabs. Also insert empty lines after logical blocks and before unconditional returns. Signed-off-by: Hartmut Knaack <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio:accel:mma8452: rework register definitionsHartmut Knaack1-48/+45
Rework register definitions to be sorted by register and bit number, with bit definitions cascaded under the appropriate register, use GENMASK for consecutive bitmasks and realign properly. Signed-off-by: Hartmut Knaack <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio:accel:mma8452: check values to be writtenHartmut Knaack1-3/+5
Check values to be written to the device for valid lower and upper bounds. Signed-off-by: Hartmut Knaack <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio:accel:mma8452: pass up real error codeHartmut Knaack1-3/+3
Pass up the error code provided by functions. Signed-off-by: Hartmut Knaack <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio:accel:mma8452: drop double includeHartmut Knaack1-1/+0
One inclusion of linux/iio/trigger_consumer.h is sufficient. Fixes: ae6d9ce05691b ("iio: mma8452: Add support for interrupt driven triggers.") Signed-off-by: Hartmut Knaack <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio:accel:mma8452: fix _get_hp_filter_indexHartmut Knaack1-1/+1
To iterate through the available frequencies of mma8452_hp_filter_cutoff[], the array size of a row of that table needs to be provided to _get_int_plus_micros_index(). Fixes: 1e79841a00e46 ("iio: mma8452: Add highpass filter configuration.") Signed-off-by: Hartmut Knaack <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio:accel:bmc150-accel: Use the chip ID to detect sensor variantBastien Nocera1-27/+19
Instead of using the I2C or ACPI ID to determine which variant of the chipset to use, determine that from the chip ID. Under Windows, the same driver is used for those variants and, despite incorrect ACPI data, it is able to load and operate the accelerometer. Fixes the accelerometer failing with: bmc150_accel i2c-BMA250E:00: Invalid chip f8 on the WinBook TW100 Signed-off-by: Bastien Nocera <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio:accel:bmc150-accel: Move bmc150_accel_chip_init()Bastien Nocera1-57/+57
Move bmc150_accel_chip_init() so that we can use bmc150_accel_chip_info_tbl[] in it. Signed-off-by: Bastien Nocera <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08staging: iio_simple_dummy: Fix indentation errorsLars Svensson1-2/+2
Fixing indentation errors in drivers/staging/iio/iio_simple_dummy_events.c. Signed-off-by: Lars Svensson <[email protected]> Acked-by: Daniel Baluta <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio: adis16136: Add ADIS16137 supportLars-Peter Clausen1-0/+6
The ADIS16137 is register map compatible to the ADIS16136, but has a different scale factor for the gyroscope output. Signed-off-by: Lars-Peter Clausen <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio: adis16400: Add ADIS16445 supportLars-Peter Clausen1-0/+26
The ADIS16445 is similar to the ADIS16448, but without the magnetometer and pressure channels as well as different scale factors for the gyroscope and accelerometer outputs. Signed-off-by: Lars-Peter Clausen <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio: adis16400: Add ADIS16367 supportLars-Peter Clausen1-0/+14
The ADIS16367 is mostly register compatible to the ADIS16360. The only difference is the scale factor for the gyroscope output. Signed-off-by: Lars-Peter Clausen <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio: adis16260: Add ADIS16266 supportLars-Peter Clausen1-39/+98
The ADIS16266 is mostly register compatible to the ADIS16260. The difference is a different gyroscope scale factor as well not having the relative angular displacement channel. Signed-off-by: Lars-Peter Clausen <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio: adis16400: Add ADIS16305 supportLars-Peter Clausen1-0/+1
The ADIS16305 is fully register map compatible to the ADIS16300. Signed-off-by: Lars-Peter Clausen <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio: adis16400: adis16300 has product ID and serial numberLars-Peter Clausen1-1/+2
The ADIS16300 has the product ID and serial number registers, they are just not documented. Set the appropriate flags so the driver makes use of them. Signed-off-by: Lars-Peter Clausen <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio: adis16480: Fix scale factorsLars-Peter Clausen1-6/+33
The different devices support by the adis16480 driver have slightly different scales for the gyroscope and accelerometer channels. Signed-off-by: Lars-Peter Clausen <[email protected]> Cc: <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio: Add inverse unit conversion macrosLars-Peter Clausen1-0/+17
Add inverse unit conversion macro to convert from standard IIO units to units that might be used by some devices. Those are useful in combination with scale factors that are specified as IIO_VAL_FRACTIONAL. Typically the denominator for those specifications will contain the maximum raw value the sensor will generate and the numerator the value it maps to in a specific unit. Sometimes datasheets specify those in different units than the standard IIO units (e.g. degree/s instead of rad/s) and so we need to do a unit conversion. From a mathematical point of view it does not make a difference whether we apply the unit conversion to the numerator or the inverse unit conversion to the denominator since (x / y) / z = x / (y * z). But as the denominator is typically a larger value and we are rounding both the numerator and denominator to integer values using the later method gives us a better precision (E.g. the relative error is smaller if we round 8000.3 to 8000 rather than rounding 8.3 to 8). This is where in inverse unit conversion macros will be used. Marked for stable as used by some upcoming fixes. Signed-off-by: Lars-Peter Clausen <[email protected]> Cc: <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio: adis16400: Fix adis16448 gyroscope scaleLars-Peter Clausen1-1/+1
Use the correct scale for the adis16448 gyroscope output. Signed-off-by: Lars-Peter Clausen <[email protected]> Cc: <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio: trigger: Add missing fields in kernel docsCristina Opriceana1-3/+24
Fix kernel docs warnings by adding the missing description for each of the existing function parameters. Signed-off-by: Cristina Opriceana <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio: Documentation: Add trigger name attribute ABI documentationCristina Opriceana1-0/+9
This patch adds an entry in ABI Documentation for the name attribute issued when a trigger is created. Signed-off-by: Cristina Opriceana <[email protected]> Acked-by: Daniel Baluta <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08DocBook: Add initial documentation for IIODaniel Baluta2-1/+698
This is intended to help developers faster find their way inside the Industrial I/O core and reduce time spent on IIO drivers development. Signed-off-by: Daniel Baluta <[email protected]> Acked-by: Crt Mori <[email protected]> Reviewed-by: Lars-Peter Clausen <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio: declare struct to fix warningPengyu Ma1-0/+3
When compile iio related driver the following warning shown: include/linux/iio/trigger.h:35:34: warning: 'struct iio_trigger' declared inside parameter list int (*set_trigger_state)(struct iio_trigger *trig, bool state); include/linux/iio/trigger.h:38:18: warning: 'struct iio_dev' declared inside parameter list struct iio_dev *indio_dev); 'struct iio_dev' and 'struct iio_trigger' was used before declaration, forward declaration for these structs to fix warning. Signed-off-by: Pengyu Ma <[email protected]> Acked-by: Daniel Baluta <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio:accel:stk8312: drop local bufferHartmut Knaack1-5/+1
Drop the local buffer in stk8312_trigger_handler() and use data->buffer instead for bulk reads. Signed-off-by: Hartmut Knaack <[email protected]> Reviewed-by: Tiberiu Breana <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio:accel:stk8312: code style cleanupHartmut Knaack1-3/+2
Adjust some indentation issues to make checkpatch.pl happy in strict mode. Signed-off-by: Hartmut Knaack <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio:accel:stk8312: use appropriate variable typesHartmut Knaack1-4/+4
Adapt some variable types to reduce unnecessary casting. Signed-off-by: Hartmut Knaack <[email protected]> Reviewed-by: Tiberiu Breana <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio:accel:stk8312: rework macro definitionsHartmut Knaack1-12/+13
Make use of BIT to describe register bits, GENMASK for consecutive bitmasks, rename and sort existing definitions, replace magic value with an expressive definition, drop an unused definition. Signed-off-by: Hartmut Knaack <[email protected]> Reviewed-by: Tiberiu Breana <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08iio:accel:stk8312: improve error handlingHartmut Knaack1-22/+38
Improve error handling in the following ways: - set return value on error condition to an appropriate error code - return error code immediately in case of an error (slightly changes code structure) - pass up real error code - add missing error handling - return 0 when error have been caught already - put device back in active mode after error occurs Signed-off-by: Hartmut Knaack <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2015-08-08Merge tag 'arc-v4.2-rc6-fixes' of ↵Linus Torvalds13-116/+718
git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc Pull ARC fixes from Vineet Gupta: "Here's a late pull request for accumulated ARC fixes which came out of extended testing of the new ARCv2 port with LTP etc. llock/scond livelock workaround has been reviewed by PeterZ. The changes look a lot but I've crafted them into finer grained patches for better tracking later. I have some more fixes (ARC Futex backend) ready to go but those will have to wait for tglx to return from vacation. Summary: - Enable a reduced config of HS38 (w/o div-rem, ll64...) - Add software workaround for LLOCK/SCOND livelock - Fallout of a recent pt_regs update" * tag 'arc-v4.2-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: ARCv2: spinlock/rwlock/atomics: reduce 1 instruction in exponential backoff ARC: Make pt_regs regs unsigned ARCv2: spinlock/rwlock: Reset retry delay when starting a new spin-wait cycle ARCv2: spinlock/rwlock/atomics: Delayed retry of failed SCOND with exponential backoff ARC: LLOCK/SCOND based rwlock ARC: LLOCK/SCOND based spin_lock ARC: refactor atomic inline asm operands with symbolic names Revert "ARCv2: STAR 9000837815 workaround hardware exclusive transactions livelock" ARCv2: [axs103_smp] Reduce clk for Quad FPGA configs ARCv2: Fix the peripheral address space detection ARCv2: allow selection of page size for MMUv4 ARCv2: lib: memset: Don't assume 64-bit load/stores ARCv2: lib: memcpy: Missing PREFETCHW ARCv2: add knob for DIV_REV in Kconfig ARC/time: Migrate to new 'set-state' interface
2015-08-08Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhostLinus Torvalds1-0/+4
Pull virtio fix from Michael Tsirkin: "A last minute fix for the new virtio input driver. It seems pretty obvious, and the problem it's fixing would be quite hard to debug" * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: virtio-input: reset device and detach unused during remove
2015-08-08Merge tag 'dm-4.2-fixes-4' of ↵Linus Torvalds2-17/+11
git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm Pull device mapper fixes from Mike Snitzer: - stable fix for a dm_merge_bvec() regression on 32 bit Fedora systems. - fix for a 4.2 DM thinp discard regression due to inability to properly delete a range of blocks in a data mapping btree. * tag 'dm-4.2-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm: dm btree remove: fix bug in remove_one() dm: fix dm_merge_bvec regression on 32 bit systems
2015-08-08Merge tag 'sound-4.2-rc6' of ↵Linus Torvalds16-50/+108
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound Pull sound fixes from Takashi Iwai: "The only bulk changes in this request is ABI updates for ASoC topology API. It's a new API that was introduced in 4.2, and we'd like to avoid ABI change after the release, so it's taken now. As there is no real in-tree user for this API, it should be fairly safe. Other than that, the usual small fixes are found in various drivers: ASoC cs4265, rt5645, intel-sst, firewire, oxygen and HD-audio" * tag 'sound-4.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ASoC: topology: Add private data type and bump ABI version to 3 ASoC: topology: Add ops support to byte controls UAPI ASoC: topology: Update TLV support so we can support more TLV types ASoC: topology: add private data to manifest ASoC: topology: Add subsequence in topology ALSA: hda - one Dell machine needs the headphone white noise fixup ALSA: fireworks/firewire-lib: add support for recent firmware quirk Revert "ALSA: fireworks: add support for AudioFire2 quirk" ASoC: topology: fix typo in soc_tplg_kcontrol_bind_io() ALSA: HDA: Dont check return for snd_hdac_chip_readl ALSA: HDA: Fix stream assignment for host in decoupled mode ASoC: rt5645: Fix lost pin setting for DMIC1 ALSA: oxygen: Fix logical-not-parentheses warning ASoC: Intel: sst_byt: fix initialize 'NULL device *' issue ASoC: Intel: haswell: fix initialize 'NULL device *' issue ASoC: cs4265: Fix setting dai format for Left/Right Justified
2015-08-08Merge tag 'hwmon-for-linus-v4.2-rc6' of ↵Linus Torvalds3-1/+19
git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging Pull hwmon fixes from Guenter Roeck: - Export module alias information in g762 and nct7904 to support auto-loading. - Blacklist Dell Studio XPS 8100 in dell-smm to fix fan control problems. * tag 'hwmon-for-linus-v4.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (g762) Export OF module alias information hwmon: (nct7904) Export I2C module alias information hwmon: (dell-smm) Blacklist Dell Studio XPS 8100
2015-08-08Merge tag 'usb-4.2-rc6' of ↵Linus Torvalds17-16/+120
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb Pull USB fixes from Greg KH: "Here are some USB and PHY fixes for 4.2-rc6 that resolve some reported issues. All of these have been in the linux-next tree for a while, full details on the patches are in the shortlog below" * tag 'usb-4.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: ARM: dts: dra7: Add syscon-pllreset syscon to SATA PHY drivers/usb: Delete XHCI command timer if necessary xhci: fix off by one error in TRB DMA address boundary check usb: udc: core: add device_del() call to error pathway phy: ti-pipe3: i783 workaround for SATA lockup after dpll unlock/relock phy-sun4i-usb: Add missing EXPORT_SYMBOL_GPL for sun4i_usb_phy_set_squelch_detect USB: sierra: add 1199:68AB device ID usb: gadget: f_printer: actually limit the number of instances usb: gadget: f_hid: actually limit the number of instances usb: gadget: f_uac2: fix calculation of uac2->p_interval usb: gadget: bdc: fix a driver crash on disconnect usb: chipidea: ehci_init_driver is intended to call one time USB: qcserial: Add support for Dell Wireless 5809e 4G Modem USB: qcserial/option: make AT URCs work for Sierra Wireless MC7305/MC7355
2015-08-08Merge tag 'staging-4.2-rc6' of ↵Linus Torvalds3-3/+5
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging Pull staging driver fixes from Greg KH: "Here are three bugfixes for some staging driver issues that have been reported. All have been in the linux-next tree for a while" * tag 'staging-4.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: staging: lustre: Include unaligned.h instead of access_ok.h staging: vt6655: vnt_bss_info_changed check conf->beacon_rate is not NULL staging: comedi: das1800: add missing break in switch
2015-08-08Merge tag 'char-misc-4.2-rc6' of ↵Linus Torvalds2-30/+44
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc Pull char/misc fixes from Greg KH: "Here are some extcon fixes for 4.2-rc6 that resolve some reported problems. All have been in linux-next for a while" * tag 'char-misc-4.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: extcon: Fix extcon_cable_get_state() from getting old state after notification extcon: Fix hang and extcon_get/set_cable_state(). extcon: palmas: Fix NULL pointer error
2015-08-08Merge tag 'drm-intel-fixes-2015-08-07' of ↵Linus Torvalds3-6/+25
git://anongit.freedesktop.org/drm-intel Pull drm fixes from Daniel Vetter: "One i915 regression fix and a drm core one since Dave's not around, both introduced in 4.2 so not cc: stable. The fix for the warning Ted reported isn't in here yet since he didn't yet supply a tested-by and I can't repro this one myself (it's in fixup code that needs firmware doing something i915 wouldn't do)" * tag 'drm-intel-fixes-2015-08-07' of git://anongit.freedesktop.org/drm-intel: drm/vblank: Use u32 consistently for vblank counters drm/i915: Allow parsing of variable size child device entries from VBT
2015-08-07staging: rtl8188eu: remove multiple blank lineSudip Mukherjee1-26/+0
Multiple blank lines is against the kernel coding style and checkpatch complains for that. Signed-off-by: Sudip Mukherjee <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2015-08-07staging: rtl8188eu: remove unused functionSudip Mukherjee1-8/+0
The function rtw_init_recvframe() was not being used. Signed-off-by: Sudip Mukherjee <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2015-08-07staging: rtl8188eu: remove exit labelSudip Mukherjee1-6/+2
An exit label which does nothing except return, is not worth having. So remove it. Signed-off-by: Sudip Mukherjee <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>