aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-01-08hwmon: (vt1211) Use pr_fmt and pr_<level>Joe Perches1-17/+13
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (via686a) Use pr_fmt and pr_<level>Joe Perches1-5/+5
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (via-cputemp) Use pr_fmt and pr_<level>Joe Perches1-5/+5
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (smsc47m1) Use pr_fmt and pr_<level>Joe Perches1-16/+15
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (smsc47b397) Use pr_fmt and pr_<level>Joe Perches1-7/+6
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (sis5595) Use pr_fmt and pr_<level>Joe Perches1-5/+5
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (pkgtemp) Use pr_fmt and pr_<level>Joe Perches1-3/+4
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (pcf8591) Use pr_fmt and pr_<level>Joe Perches1-2/+3
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (lm70) Use pr_fmt and pr_<level>Joe Perches1-2/+3
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (lis3lv02d) Use pr_fmt and pr_<level>Joe Perches1-12/+11
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (ibmaem) Use pr_fmt and pr_<level>Joe Perches1-1/+3
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (core) Use pr_fmt and pr_<level>Joe Perches1-1/+3
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (hwmon-vid) Use pr_fmt and pr_<level>Joe Perches1-5/+6
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (hp_accel) Use pr_fmt and pr_<level>Joe Perches1-6/+7
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (f71882fg) Use pr_fmt and pr_<level>Joe Perches1-11/+12
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (f71805f) Use pr_fmt and pr_<level>Joe Perches1-16/+13
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (dme1737) Use pr_fmt and pr_<level>Joe Perches1-6/+6
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (coretemp) Use pr_fmt and pr_<level>Joe Perches1-5/+6
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (asus_atk0110) Use pr_fmt and pr_<level>Joe Perches1-3/+4
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (asb1000) Use pr_fmt and pr_<level>Joe Perches1-4/+5
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (adt7470) Use pr_fmt and pr_<level>Joe Perches1-1/+3
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (abituguru3) Use pr_fmt and pr_<level>Joe Perches1-26/+19
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Added a few static strings to standardize logging messages. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-08hwmon: (abituguru) Use pr_fmt and pr_<level>Joe Perches1-19/+17
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Added a few static strings to standardize logging messages. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-01-07pata_platform: Remove CONFIG_HAVE_PATA_PLATFORM's dependencies.Nick Bowler1-8/+8
CONFIG_HAVE_PATA_PLATFORM, by virtue of where its defined, has a dependency on CONFG_ATA and CONFIG_ATA_SFF. This causes Kconfig warnings when it is selected by various architectures, such as warning: (ARCH_VEXPRESS && <choice> || ARCH_RPC && <choice> || MACH_VPAC270 && ARCH_PXA || MACH_REALVIEW_PB11MP && ARCH_REALVIEW || MACH_REALVIEW_PBA8 && ARCH_REALVIEW || MACH_REALVIEW_PBX && ARCH_REALVIEW || MACH_BAST_IDE && ARCH_S3C2410 || MACH_ANUBIS && ARCH_S3C2410) selects HAVE_PATA_PLATFORM which has unmet direct dependencies (ATA && ATA_SFF) Since this option is only used to control visibility of the CONFIG_PATA_PLATFORM option and isn't itself visible in the menu, it is straightforward to simply remove these dependencies rather than adjust all the architectures. Signed-off-by: Nick Bowler <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2011-01-07pata_hpt37x: actually limit HPT370 to UltraDMA/66Sergei Shtylyov1-5/+5
The driver clearly tries to limit HPT370[A] to UltraDMA/66 if the PCI clock is less than 50 MHz but due to cut&paste type mistake this code has no effect... Signed-off-by: Sergei Shtylyov <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2011-01-07pata_hpt3x2n: coding style cleanupSergei Shtylyov1-39/+47
Fix 8 errors and 3 warnings given by checkpatch.pl: - *switch* and *case* not on the same indentation level; - no space between *for*/*switch*/*while* and open parenthesis; - space between an unary operator and its operand; - spaces before tabs; - lines over 80 characters. In addition to these changes, also do the following: - add new line after variable definitions; - fix the style of some multi-line comments. Signed-off-by: Sergei Shtylyov <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2011-01-07pata_hpt37x: coding style cleanupSergei Shtylyov1-81/+101
Fix 12 errors and 15 warnings given by checkpatch.pl: - *switch* and *case* not on the same indentation level; - no space between *for*/*switch*/*while* and open parenthesis; - space between an unary operator and its operand; - drive blacklist arrays not being *const*; - spaces before tabs; - lines over 80 characters. In addition to these changes, also do the following: - add new line after variable definitions; - fix the style of some multi-line comments. Signed-off-by: Sergei Shtylyov <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2011-01-07pata_hpt366: coding style cleanupSergei Shtylyov1-22/+29
Fix 2 errors and 11 warnings given by checkpatch.pl: - *switch* and *case* not on the same indentation level; - no space between *switch* and open parenthesis; - drive blacklist arrays not being *const*; - spaces before tabs; - lines over 80 characters. In addition to these changes, also add new line after variable definition in hpt36x_init_chipset()... Signed-off-by: Sergei Shtylyov <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2011-01-07pata_hpt3x2n: calculate average f_CNTSergei Shtylyov1-3/+14
Allow hpt3x2n_pci_clock() to calculate the average f_CNT register value iff HighPoint BIOS hasn't saved one, just like the 'pata_hpt37x' driver (reading the full 16-bit register, unlike what that driver does), so that this driver would work correctly on e.g. non-x86 machine with 66 MHz PCI. I'm not sure why Alan has only done this in one driver and not the other... Signed-off-by: Sergei Shtylyov <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2011-01-07pata_hpt3x2n: clarify about HPT371N supportSergei Shtylyov2-6/+4
Commit 28e21c8c0d44cd63bad4c62f94ef0c5a1cb8402c (pata_hpt3x2n: Add HPT371N support and other bits) forgot to update the driver's Kconfig entry, heading comment, and module description (that also wrongly claims support of HPT302) which may confuse users... Signed-off-by: Sergei Shtylyov <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2011-01-07pata_hpt{37x|3x2n}: SATA mode filteringSergei Shtylyov2-22/+93
The Marvell bridge chips used on HighPoint SATA cards do not seem to support the UltraDMA modes 1, 2, and 3 as well as any MWDMA modes; these cards are based on HPT372/372A/372N/374 chips (judging from the vendor drivers), so the Linux drivers need to have a mode_filter() method for these chips... Signed-off-by: Sergei Shtylyov <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2011-01-07Merge branch 'for-next' of ↵Linus Torvalds17-400/+701
git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus: hfsplus: %L-to-%ll, macro correction, and remove unneeded braces hfsplus: spaces/indentation clean-up hfsplus: C99 comments clean-up hfsplus: over 80 character lines clean-up hfsplus: fix an artifact in ioctl flag checking hfsplus: flush disk caches in sync and fsync hfsplus: optimize fsync hfsplus: split up inode flags hfsplus: write up fsync for directories hfsplus: simplify fsync hfsplus: avoid useless work in hfsplus_sync_fs hfsplus: make sure sync writes out all metadata hfsplus: use raw bio access for partition tables hfsplus: use raw bio access for the volume headers hfsplus: always use hfsplus_sync_fs to write the volume header hfsplus: silence a few debug printks hfsplus: fix option parsing during remount Fix up conflicts due to VFS changes in fs/hfsplus/{hfsplus_fs.h,unicode.c}
2011-01-07Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds45-1365/+1596
* 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (77 commits) spi/omap: Fix DMA API usage in OMAP MCSPI driver spi/imx: correct the test on platform_get_irq() return value spi/topcliff: Typo fix threhold to threshold spi/dw_spi Typo change diable to disable. spi/fsl_espi: change the read behaviour of the SPIRF spi/mpc52xx-psc-spi: move probe/remove to proper sections spi/dw_spi: add DMA support spi/dw_spi: change to EXPORT_SYMBOL_GPL for exported APIs spi/dw_spi: Fix too short timeout in spi polling loop spi/pl022: convert running variable spi/pl022: convert busy flag to a bool spi/pl022: pass the returned sglen to the DMA engine spi/pl022: map the buffers on the DMA engine spi/topcliff_pch: Fix data transfer issue spi/imx: remove autodetection spi/pxa2xx: pass of_node to spi device and set a parent device spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes. spi/pxa2xx: Add chipselect support for Sodaville spi/pxa2xx: Consider CE4100's FIFO depth spi/pxa2xx: Add CE4100 support ...
2011-01-07Merge branch 'for-2.6.38' of ↵Linus Torvalds62-275/+703
git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu * 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (30 commits) gameport: use this_cpu_read instead of lookup x86: udelay: Use this_cpu_read to avoid address calculation x86: Use this_cpu_inc_return for nmi counter x86: Replace uses of current_cpu_data with this_cpu ops x86: Use this_cpu_ops to optimize code vmstat: User per cpu atomics to avoid interrupt disable / enable irq_work: Use per cpu atomics instead of regular atomics cpuops: Use cmpxchg for xchg to avoid lock semantics x86: this_cpu_cmpxchg and this_cpu_xchg operations percpu: Generic this_cpu_cmpxchg() and this_cpu_xchg support percpu,x86: relocate this_cpu_add_return() and friends connector: Use this_cpu operations xen: Use this_cpu_inc_return taskstats: Use this_cpu_ops random: Use this_cpu_inc_return fs: Use this_cpu_inc_return in buffer.c highmem: Use this_cpu_xx_return() operations vmstat: Use this_cpu_inc_return for vm statistics x86: Support for this_cpu_add, sub, dec, inc_return percpu: Generic support for this_cpu_add, sub, dec, inc_return ... Fixed up conflicts: in arch/x86/kernel/{apic/nmi.c, apic/x2apic_uv_x.c, process.c} as per Tejun.
2011-01-07Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wqLinus Torvalds80-156/+289
* 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (33 commits) usb: don't use flush_scheduled_work() speedtch: don't abuse struct delayed_work media/video: don't use flush_scheduled_work() media/video: explicitly flush request_module work ioc4: use static work_struct for ioc4_load_modules() init: don't call flush_scheduled_work() from do_initcalls() s390: don't use flush_scheduled_work() rtc: don't use flush_scheduled_work() mmc: update workqueue usages mfd: update workqueue usages dvb: don't use flush_scheduled_work() leds-wm8350: don't use flush_scheduled_work() mISDN: don't use flush_scheduled_work() macintosh/ams: don't use flush_scheduled_work() vmwgfx: don't use flush_scheduled_work() tpm: don't use flush_scheduled_work() sonypi: don't use flush_scheduled_work() hvsi: don't use flush_scheduled_work() xen: don't use flush_scheduled_work() gdrom: don't use flush_scheduled_work() ... Fixed up trivial conflict in drivers/media/video/bt8xx/bttv-input.c as per Tejun.
2011-01-08HID: roccat: Update sysfs attribute docStefan Achatz3-28/+28
Updated sysfs attribute documentation to reflect recent changes in driver design. The device specific attributes moved from the driver to the respective roccat char device. Signed-off-by: Stefan Achatz <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2011-01-08HID: roccat: don't use #pragma packJiri Kosina3-54/+30
Replace #pragma pack ocurences with __atribute__((__packed__)); Signed-off-by: Jiri Kosina <[email protected]>
2011-01-08HID: roccat: Add support for Roccat Kone[+] v2Stefan Achatz7-0/+1187
This patch adds support for Roccat Kone[+] gaming mouse. Kone[+] is an enhanced version of the old Kone with more memory for macros, a better sensor and more functionality. This driver is conceptual similar to the existing Kone and Pyra drivers. Userland tools can soon be found at http://sourceforge.net/projects/roccat Signed-off-by: Stefan Achatz <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2011-01-08HID: roccat: reduce number of functions in kone and pyra driversStefan Achatz2-173/+53
The profile number is now passed via bin_attribute->private instead of function parameter to reduce number of functions. Signed-off-by: Stefan Achatz <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2011-01-08HID: roccat: declare meaning of pack pragma usage in driver headersStefan Achatz2-0/+6
Using pack pragma to prevent padding bytes in binary data structures used for hardware communication. Explanation of these pragmas was requested. Signed-off-by: Stefan Achatz <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2011-01-08HID: roccat: use class for char device for sysfs attribute creationStefan Achatz4-384/+209
Adding sysfs attributes to an already created device raises no userland notification. Now the device drivers associate the devices attributes with a class and use this for roccat event char device creation. Signed-off-by: Stefan Achatz <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2011-01-08sysfs: Introducing binary attributes for struct classStefan Achatz2-2/+40
Added dev_bin_attrs to struct class similar to existing dev_attrs. Signed-off-by: Stefan Achatz <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2011-01-08Merge branches 'upstream' and 'upstream-fixes' into for-linusJiri Kosina3-2/+28
2011-01-07msm: add SMP support for msmJeff Ohlstein4-0/+208
Signed-off-by: Jeff Ohlstein <[email protected]> Signed-off-by: David Brown <[email protected]>
2011-01-07msm: hotplug: support cpu hotplug on msmJeff Ohlstein2-0/+93
Signed-off-by: Jeff Ohlstein <[email protected]> Signed-off-by: David Brown <[email protected]>
2011-01-07msm: timer: SMP timer support for msmJeff Ohlstein3-24/+108
The msm provides timer hardware that is private to each core. Each timer has separate counter and match registers, so we create separate clock_event_devices for each core. For the global clocksource, use cpu 0's counter. Signed-off-by: Jeff Ohlstein <[email protected]> Signed-off-by: David Brown <[email protected]>
2011-01-07msm: scm-boot: Support for setting cold/warm boot addressesStepan Moskovchenko3-1/+78
Add support for setting the cold boot address of core 1 and the warm boot addresses of cores 0 and 1 using a secure domain call. Signed-off-by: Stepan Moskovchenko <[email protected]> Signed-off-by: David Brown <[email protected]>
2011-01-07msm: Secure Channel Manager (SCM) supportStephen Boyd4-0/+333
SCM is the protocol used to communicate between the secure and non-secure code executing on the applications processor. The non-secure side uses a physically contiguous buffer to pass information to the secure side; where the buffer conforms to a format that is agreed upon by both sides. The use of a buffer allows multiple pending requests to be in flight on the secure side. It also benefits use cases where the command or response buffer contains large chunks of data. Reviewed-by: Saravana Kannan <[email protected]> Signed-off-by: Stephen Boyd <[email protected]> Signed-off-by: David Brown <[email protected]>
2011-01-07Merge branch 'sched-fixes-for-linus' of ↵Linus Torvalds8-36/+34
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: Constify function scope static struct sched_param usage sched: Fix strncmp operation sched: Move sched_autogroup_exit() to free_signal_struct() sched: Fix struct autogroup memory leak sched: Mark autogroup_init() __init sched: Consolidate the name of root_task_group and init_task_group
2011-01-07Merge branch 'x86-apic-cleanups-for-linus' of ↵Linus Torvalds9-228/+75
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-apic-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: apic: Cleanup and simplify setup_local_APIC() x86: Further simplify mp_irq info handling x86: Unify 3 similar ways of saving mp_irqs info x86, ioapic: Avoid writing io_apic id if already correct x86, x2apic: Don't map lapic addr for preenabled x2apic systems x86, sfi: Use register_lapic_address() x86, apic: Use register_lapic_address() in init_apic_mapping() x86, apic: Remove early_init_lapic_mapping() x86, apic: Unify identical register_lapic_address() functions