aboutsummaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)AuthorFilesLines
2010-03-05hwmon: Driver for Andigilog aSC7621 family monitoring chipsGeorge Joseph3-0/+1269
Hwmon driver for Andigilog aSC7621 family monitoring chips. Signed-off-by: George Joseph <[email protected]> Acked-by: Hans de Goede <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (adt7411) Improve lockingWolfram Sang1-7/+14
Add proper locking for the cached variables. Also get rid of ref_is_vdd, which became obsolete. Signed-off-by: Wolfram Sang <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: Add driver for ADT7411 voltage and temperature sensorWolfram Sang3-0/+370
Add basic support for the ADT7411. Reads out all conversion results (via I2C, SPI yet missing) and allows some on-the-fly configuration. Tested with a custom board. Signed-off-by: Sascha Hauer <[email protected]> Signed-off-by: Wolfram Sang <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (w83793) Add watchdog functionalitySven Anders2-4/+481
Add watchdog functionality to the Winbond W83793 driver. Signed-off-by: Sven Anders <[email protected]> Acked-by: Hans de Goede <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (g760a) Make rpm_from_cnt staticJean Delvare1-1/+1
Function rpm_from_cnt is only used internally so it can be made static. Make it inline while we're here, for performance reasons (although hopefully gcc would figure out by itself...) Signed-off-by: Jean Delvare <[email protected]> Cc: Herbert Valerio Riedel <[email protected]> Acked-by: Martin Michlmayr <[email protected]>
2010-03-05hwmon: (it87) Validate auto pwm settingsJean Delvare1-0/+32
Before switching to automatic fan control mode, make sure that all the trip points make sense. Otherwise, the control loop could lead to weird fan behavior. Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (it87) Add support for old automatic fan speed controlJean Delvare1-2/+180
Add support for the automatic fan speed control interface as implemented by IT8705F chips up to revision F and IT8712F chips up to revision G. This implementation fits very well in our standard sysfs interface. I implemented the old and not the new interface because the only chip I have at hand is an old one, and the new interface is more difficult to map to the standard sysfs interface. Adding support later should be possible though, if someone with a supported chip is interested. Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (it87) Use strict_strtol instead of simple_strtolJean Delvare1-15/+44
For consistency and robustness, use strict_strtol instead of simple_strtol. Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (it87) Fix many checkpatch errors and warningsJean Delvare1-75/+87
Fix 20 errors and 11 warnings reported by the checkpatch script. The remainining errors would require more work. The remaining warnings will be addressed later. Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (it87) Add support for beep on alarmJean Delvare1-0/+122
The IT87xxF chips support beeping on alarm, if properly wired and configured. There is one control bit for each input type (temperature, fan, voltage.) Let the user see and change them. Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (it87) Create vid attributes by groupJean Delvare1-8/+7
Only VID-related attributes are left in it87_attributes_opt, so we might as well rename it to it87_attributes_vid and use this group to create all attributes at once. Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (it87) Refactor attributes creation and removalJean Delvare1-130/+103
There is a lot of code redundancy in the creation of the fan and pwm attributes. Move these attributes to arrays so that the code can be simplified. This in turns makes the attributes removal code larger, so move it to a separate function that can be called in both the standard removal case and the error path during probing. Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (it87) Expose the PWM/temperature mappingsJean Delvare1-4/+69
Let the user read the PWM-to-temperature mappings. Until the trip points are also exposed, this is essentially a way to know how the BIOS has set things up. The ability to change the settings will be added later, together with the trip points. Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (it87) Display fan outputs in automatic mode as suchJean Delvare1-38/+61
The it87 driver doesn't yet support automatic fan control. Let it at least tell the user when a fan output is in automatic mode. Also let the user switch from automatic mode (possibly set by the BIOS) to manual mode and back without losing the settings. Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (lm90) Add SMBus alert supportJean Delvare1-0/+63
Tested successfully with an ADM1032 chip on its evaluation board. It should work fine with all other chips as well. At this point this is more of a proof-of-concept, we don't do anything terribly useful on SMBus alert: we simply log the event. But this could later evolve into libsensors signaling so that user-space applications can take an appropriate action. Signed-off-by: Jean Delvare <[email protected]> Cc: David Brownell <[email protected]> Cc: Trent Piepho <[email protected]>
2010-03-05hwmon: (lm90) Restore configuration on exitJean Delvare1-4/+10
Restore the chip configuration when unloading the driver. This ensures we don't leave the chip running if it was initially stopped. Signed-off-by: Jean Delvare <[email protected]>
2010-03-05hwmon: (lm90) Add support for the Winbond/Nuvoton W83L771AWG/ASGJean Delvare2-3/+14
This chips is found on several Zotac Ion ITX boards, amongst others. Signed-off-by: Jean Delvare <[email protected]> Cc: MC Matti <[email protected]> Cc: Manuel Lamotte-Schubert <[email protected]>
2010-03-05Input: wacom - merge out and in prox eventsPing Cheng1-104/+59
Process out and in prox events for Graphire and Tablet PC devices in the same loop to simplify the data parsing logic. Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-03-05Input: gamecon - fix off by one range checkDan Carpenter1-1/+1
It should be >= GC_MAX not > GC_MAX. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-03-05dquot: cleanup dquot transfer routineChristoph Hellwig1-1/+1
Get rid of the transfer dquot operation - it is now always called from the filesystem and if a filesystem really needs it's own (which none currently does) it can just call into it's own routine directly. Rename the now static low-level dquot_transfer helper to __dquot_transfer and vfs_dq_transfer to dquot_transfer to have a consistent namespace, and make the new dquot_transfer return a normal negative errno value which all callers expect. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Jan Kara <[email protected]>
2010-03-04Staging: winbond: fix up wireless api errorsGreg Kroah-Hartman1-11/+3
The wireless core made a number of api changes that caused the winbond driver to break. This patch fixes those errors by making the needed changes to the driver. Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-04Staging: merge staging patches into Linus's main branchGreg Kroah-Hartman478-24373/+29061
There were a number of patches that went into Linus's tree already that conflicted with other changes in the staging branch. This merge resolves those merge conflicts. Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-04Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6Linus Torvalds50-638/+611
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6: (49 commits) drivers/ide: Fix continuation line formats ide: fixed section mismatch warning in cmd640.c ide: ide_timing_compute() fixup ide: make ide_get_best_pio_mode() static via82cxxx: use ->pio_mode value to determine pair device speed tx493xide: use ->pio_mode value to determine pair device speed siimage: use ->pio_mode value to determine pair device speed palm_bk3710: use ->pio_mode value to determine pair device speed it821x: use ->pio_mode value to determine pair device speed cs5536: use ->pio_mode value to determine pair device speed cs5535: use ->pio_mode value to determine pair device speed cmd64x: fix handling of address setup timings amd74xx: use ->pio_mode value to determine pair device speed alim15x3: fix handling of UDMA enable bit alim15x3: fix handling of DMA timings alim15x3: fix handling of command timings alim15x3: fix handling of address setup timings ide-timings: use ->pio_mode value to determine fastest PIO speed ide: change ->set_dma_mode method parameters ide: change ->set_pio_mode method parameters ...
2010-03-04Merge branch 'next' of ↵Linus Torvalds16-770/+1702
git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (28 commits) ioat: cleanup ->timer_fn() and ->cleanup_fn() prototypes ioat3: interrupt coalescing ioat: close potential BUG_ON race in the descriptor cleanup path ioat2: kill pending flag ioat3: use ioat2_quiesce() ioat3: cleanup, don't enable DCA completion writes DMAENGINE: COH 901 318 lli sg offset fix DMAENGINE: COH 901 318 configure channel direction DMAENGINE: COH 901 318 remove irq counting DMAENGINE: COH 901 318 descriptor pool refactoring DMAENGINE: COH 901 318 cleanups dma: Add MPC512x DMA driver Debugging options for the DMA engine subsystem iop-adma: redundant/wrong tests in iop_*_count()? dmatest: fix handling of an even number of xor_sources dmatest: correct raid6 PQ test fsldma: Fix cookie issues fsldma: Fix cookie issues dma: cases IPU_PIX_FMT_BGRA32, BGR32 and ABGR32 are the same in ipu_ch_param_set_size() dma: make Open Firmware device id constant ...
2010-03-04Merge branch 'for-linus' of ↵Linus Torvalds5-28/+27
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (52 commits) init: Open /dev/console from rootfs mqueue: fix typo "failues" -> "failures" mqueue: only set error codes if they are really necessary mqueue: simplify do_open() error handling mqueue: apply mathematics distributivity on mq_bytes calculation mqueue: remove unneeded info->messages initialization mqueue: fix mq_open() file descriptor leak on user-space processes fix race in d_splice_alias() set S_DEAD on unlink() and non-directory rename() victims vfs: add NOFOLLOW flag to umount(2) get rid of ->mnt_parent in tomoyo/realpath hppfs can use existing proc_mnt, no need for do_kern_mount() in there Mirror MS_KERNMOUNT in ->mnt_flags get rid of useless vfsmount_lock use in put_mnt_ns() Take vfsmount_lock to fs/internal.h get rid of insanity with namespace roots in tomoyo take check for new events in namespace (guts of mounts_poll()) to namespace.c Don't mess with generic_permission() under ->d_lock in hpfs sanitize const/signedness for udf nilfs: sanitize const/signedness in dealing with ->d_name.name ... Fix up fairly trivial (famous last words...) conflicts in drivers/infiniband/core/uverbs_main.c and security/tomoyo/realpath.c
2010-03-04Staging: Merge two branches of coding style fixes togetherGreg Kroah-Hartman16-123/+149
Turns out that multiple people sent pretty much the same patch for the same staging drivers. Commit these in two different branches and merge them together to get a more complete coverage of the cleanup and properly credit everyone for the work that they did. Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-04Merge git://git.infradead.org/battery-2.6Linus Torvalds4-49/+138
* git://git.infradead.org/battery-2.6: power_supply: bq27x00: fix voltage and current units power_supply: bq27x00: add status and time properties power_supply: bq27x00: add BQ27500 support power_supply: bq27x00: fix temperature conversion power_supply: bq27x00: remove unused struct fields power_supply: bq27x00: remove double endian swap da9030_battery: fix spelling in comment wm97xx_battery: Clean up some warnings
2010-03-04Staging: dream: camera: sk5k3e2fx: fix code style issuesChihau Chau1-4/+4
This fixes some code style issues about assignments in if conditions. Signed-off-by: Chihau Chau <[email protected]> Acked-by: Pavel Machek <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-04Staging: dream: camera: msm_camera: fix code style issuesChihau Chau1-7/+10
This fixes some code style issues like to add one space after a while or switch statement and before a open parenthesis '(', and to include KERN_ facility level in the printk() functions. Signed-off-by: Chihau Chau <[email protected]> Acked-by: Pavel Machek <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-04Staging: wlan-ng: More checkpatch.pl error cleanupsAndrew Elwell4-25/+28
Signed-off-by: Andrew Elwell <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-04Staging: wlan-ng - checkpatch.pl fixupsAndrew Elwell15-194/+183
Basic fixups in the staging/wlan-ng directory. (First kernel patch - thanks to FOSDEM talk) Signed-off-by: Andrew Elwell <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-04Staging: comedi: comedi_fops.c: Checkpatch cleanupAndrea Gelmini1-7/+5
ERROR: do not initialise externals to 0 or NULL +int comedi_num_legacy_minors = 0; WARNING: braces {} are not necessary for single statement blocks + if (s->subdev_flags & SDF_CMD_READ) { + kill_fasync(&dev->async_queue, SIGIO, POLL_IN); + } WARNING: braces {} are not necessary for single statement blocks + if (s->subdev_flags & SDF_CMD_WRITE) { + kill_fasync(&dev->async_queue, SIGIO, POLL_OUT); + } Signed-off-by: Andrea Gelmini <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-04Staging: comedi: fix suspect code indent in ni_labpc.cStewart Robertson1-3/+9
This is a patch to the ni_labpc.c file that fixes suspect code indent for conditional statements found by the checkpatch.pl tool Signed-off-by: Stewart Robertson <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-04Staging: comedi: fix yet another brace coding style issue in ni_labpc.cMaurice Dawson1-12/+10
This is a patch to the ni_labpc.c file that fixes up all the brace warnings found by the checkpatch.pl tool Signed-off-by: Maurice Dawson <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-04Staging: comedi: fix another brace coding style issues in ni_labpc.cMaurice Dawson1-2/+1
This is a patch to the ni_labpc.c file that fixes up a brace warning found by the checkpatch.pl tool Signed-off-by: Maurice Dawson <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-04Staging: comedi: fix brace coding style issue in ni_labpc.cMaurice Dawson1-4/+2
This is a patch to the ni_labpc.c file that fixes up a brace warning found by the checkpatch.pl tool. Signed-off-by: Maurice Dawson <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-04Staging: comedi: poc: Adding some KERN_ facility levelChihau Chau1-5/+4
This fixes some coding style issues like include KERN_ facility levels in some printk() and one trailing whitespace error. Signed-off-by: Chihau Chau <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-04Staging: dream: camera: msm_camera: fix some code style issuesChihau Chau1-19/+18
This fixes some code style issues like else staments after the close braces '}' and to use __func__ instead of __FUNCTION__. Signed-off-by: Chihau Chau <[email protected]> Acked-by: Pavel Machek <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-04Staging: wlan-ng: fix most of the style issues in hfa384x.hAlessandro Ghedini1-75/+107
This patch fixes all the errors and the majority of the warnings found with checkpatch.pl script in hfa384x.h, following Gábor Stefanik hints Signed-off-by: Alessandro Ghedini <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-04Staging: dream: camera: msm_camera: fix coding style issuesChihau Chau1-3/+3
This fixes some coding style issues like to use __func__ instead __FUNCTION__, "foo *bar" instead "foo* bar" and a initial comment with "/* */" instead "//" Signed-off-by: Chihau Chau <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-04Staging: comedi: fix bracing coding style and 80 character issues in ni_660x.cGraham M Howe1-24/+24
This is a patch to the ni_660x.c file that fixes up the brace and 80 character issues found by the checkpatch tool Signed-off-by: Graham M Howe <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-04Staging: comedi: fix bracing coding style issue in ni_65xx.cGraham M Howe1-14/+17
This is a patch to the ni_65xx.c file that fixes up a brace warning found by the checkpatch.pl tool Signed-off-by: Graham M Howe <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-04Staging: comedi: pcmad: Checkpatch cleanupsBenjamin Adolphi1-10/+9
This fixes all checkpatch issues in the pcmad comedi driver. Signed-off-by: Benjamin Adolphi <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-04Staging: comedi: poc: fix coding style issuesChihau Chau1-4/+3
This fixes a line over 80 characters and a brace warnings. Signed-off-by: Chihau Chau <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-04Merge branch 'for-linus' of ↵Linus Torvalds23-183/+1565
git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (27 commits) Regulators: wm8400 - cleanup platform driver data handling Regulators: wm8994 - clean up driver data after removal Regulators: wm831x-xxx - clean up driver data after removal Regulators: pcap-regulator - clean up driver data after removal Regulators: max8660 - annotate probe and remove methods Regulators: max1586 - annotate probe and remove methods Regulators: lp3971 - fail if platform data was not supplied Regulators: tps6507x-regulator - mark probe method as __devinit Regulators: tps65023-regulator - mark probe method as __devinit Regulators: twl-regulator - mark probe function as __devinit Regulators: fixed - annotate probe and remove methods Regulators: ab3100 - fix probe and remove annotations Regulators: virtual - use sysfs attribute groups twl6030: regulator: Configure STATE register instead of REMAP regulator: Provide optional dummy regulator for consumers regulator: Assume regulators are enabled if they don't report anything regulator: Convert fixed voltage regulator to use enable_time() regulator: Add WM8994 regulator support regulator: enable max8649 regulator driver regulator: trivial: fix typos in user-visible Kconfig text ...
2010-03-04Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds8-1024/+964
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: disable pcmcia ioctl for !ARM, prepare for removal pcmcia: CodingStyle fixes pcmcia: alchemy: fixup wrong comments pcmcia: remove irq_list parameter from pd6729 yenta_socket: ENE CB712 CardBus bridge needs special treatment with Echo Audio Indigo soundcards
2010-03-04Merge branch 'drm-linus' of ↵Linus Torvalds136-6316/+17868
git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (151 commits) vga_switcheroo: disable default y by new rules. drm/nouveau: fix *staging* driver build with switcheroo off. drm/radeon: fix typo in Makefile vga_switcheroo: fix build on platforms with no ACPI drm/radeon: Fix printf type warning in 64bit system. drm/radeon/kms: bump the KMS version number for square tiling support. vga_switcheroo: initial implementation (v15) drm/radeon/kms: do not disable audio engine twice Revert "drm/radeon/kms: disable HDMI audio for now on rv710/rv730" drm/radeon/kms: do not preset audio stuff and start timer when not using audio drm/radeon: r100/r200 ums: block ability for userspace app to trash 0 page and beyond drm/ttm: fix function prototype to match implementation drm/radeon: use ALIGN instead of open coding it drm/radeon/kms: initialize set_surface_reg reg for rs600 asic drm/i915: Use a dmi quirk to skip a broken SDVO TV output. drm/i915: enable/disable LVDS port at DPMS time drm/i915: check for multiple write domains in pin_and_relocate drm/i915: clean-up i915_gem_flush_gpu_write_domain drm/i915: reuse i915_gpu_idle helper drm/i915: ensure lru ordering of fence_list ... Fixed trivial conflicts in drivers/gpu/vga/Kconfig
2010-03-04virtio: console: Use better variable names for fill_queue operationAmit Shah1-12/+15
We want to keep track of the number of buffers added to a vq. Use nr_added_bufs instead of 'ret'. Also, the users of fill_queue() overloaded a local 'err' variable to check the numbers of buffers allocated. Use nr_added_bufs instead of err. Signed-off-by: Amit Shah <[email protected]> Reported-by: Juan Quintela <[email protected]>
2010-03-04virtio: console: Fix type of 'len' as unsigned intAmit Shah1-1/+1
We declare 'len' as int type but it should be 'unsigned int', as get_buf() wants it to be. Signed-off-by: Amit Shah <[email protected]> Reported-by: Juan Quintela <[email protected]>
2010-03-03Merge branch 'coh' into dmaengineDan Williams6-122/+115
Powered by cgit, Gruvboxed by Blaster4385.