summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-02-02staging: ath6kl: Remove A_BOOL and TRUE/FALSEJoe Perches
Use kernel bool and true/false. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-02Staging: Merge branch 'staging-next' into 2.6.38-rc3Greg Kroah-Hartman
This was done to resolve conflicts in the following files due to patches in Linus's tree and in the staging-next tree: drivers/staging/brcm80211/brcmsmac/wl_mac80211.c drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-01staging: sep: Further tidyingAlan Cox
More debug printk pruning and turn down some that the user can cause intentionally to debug level. Tidy up the ioctl code a bit more Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-01staging: usbvideo: vicam: Fix build in -nextAlan Cox
Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-01Linux 2.6.38-rc3Linus Torvalds
2011-01-31Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: NFS: NFSv4 readdir loses entries NFS: Micro-optimize nfs4_decode_dirent() NFS: Fix an NFS client lockdep issue NFS construct consistent co_ownerid for v4.1 NFS: nfs_wcc_update_inode() should set nfsi->attr_gencount NFS improve pnfs_put_deviceid_cache debug print NFS fix cb_sequence error processing NFS do not find client in NFSv4 pg_authenticate NLM: Fix "kernel BUG at fs/lockd/host.c:417!" or ".../host.c:283!" NFS: Prevent memory allocation failure in nfsacl_encode() NFS: nfsacl_{encode,decode} should return signed integer NFS: Fix "kernel BUG at fs/nfs/nfs3xdr.c:1338!" NFS: Fix "kernel BUG at fs/aio.c:554!" NFS4: Avoid potential NULL pointer dereference in decode_and_add_ds(). NFS: fix handling of malloc failure during nfs_flush_multi()
2011-01-31Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds
* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm: ARM: smp_on_up: allow non-ARM SMP processors ARM: io: ensure inb/outb() et.al. are properly ordered on ARMv6+ ARM: initrd: disable initrd if passed address overlaps reserved region ARM: footbridge: fix debug macros ARM: mmci: round down the bytes transferred on error ARM: mmci: complete the transaction on error ARM: 6642/1: mmci: calculate remaining bytes at error correctly
2011-01-31Merge branch 'omap-fixes-for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: arch/arm/mach-omap2/dma.c: Convert IS_ERR result to PTR_ERR arm: omap2: mux: fix compile warning omap1: Simplify use of omap_irq_flags omap2+: Fix unused variable warning for omap_irq_base
2011-01-31kernel.h: fix kernel-doc warningRandy Dunlap
Fix kernel-doc warning in kernel.h from commit 7ef88ad56145 ("BUILD_BUG_ON: make it handle more cases"): Warning(include/linux/kernel.h:605): No description found for parameter 'condition' Warning(include/linux/kernel.h:605): Excess function parameter 'cond' description in 'BUILD_BUG_ON' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-01-31Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfsLinus Torvalds
* 'for-linus' of git://oss.sgi.com/xfs/xfs: xfs: xfs_bmap_add_extent_delay_real should init br_startblock xfs: fix dquot shaker deadlock xfs: handle CIl transaction commit failures correctly xfs: limit extsize to size of AGs and/or MAXEXTLEN xfs: prevent extsize alignment from exceeding maximum extent size xfs: limit extent length for allocation to AG size xfs: speculative delayed allocation uses rounddown_power_of_2 badly xfs: fix efi item leak on forced shutdown xfs: fix log ticket leak on forced shutdown.
2011-01-31Staging: comedi: Fix checpatch.pl issues in file rtd520.cNick Robinson
This patch fixes the checkpatch errors listed below: ERROR: code indent should use tabs where possible WARNING: space prohibited between function name and open parenthesis '(' WARNING: please, no spaces at the start of a line WARNING: braces {} are not necessary for single statement blocks WARNING: printk() should include KERN_ facility level Signed-off-by: Nick Robinson <nr33@msstate.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31Staging: wlan-ng: fix 2 space coding style issuesAdam Thompson
This patch to p80211conv.c fixes to space coding style warnings found with checkpatch.pl Signed-off-by: Adam Thompson <adam@lotpblog.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31Staging: iio: ad7476_core.c: Fixed i2c -> spi documentation typoRoland Stigge
ad7476_core.c: Fixed i2c -> spi documentation typo Minor documentation fix in comment Signed-off-by: Roland Stigge <stigge@antcom.de> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31Staging: iio: max517.c: Fix client obtainment by using iio_dev_get_devdata()Roland Stigge
max517.c: Fix client obtainment by using iio_dev_get_devdata() This patch uses dev_get_drvdata() and iio_dev_get_devdata() instead of to_i2c_client() (broken!) to obtain i2c_client data. Further, some minor typo fixes are included. Signed-off-by: Roland Stigge <stigge@antcom.de> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31Staging: dabusb: fixed coding style issuesTimo von Holtz
Fixed coding style issues Signed-off-by: Timo von Holtz <tvh@informatik.uni-kiel.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31Staging: usbvideo: vicam: fixed some coding style issuesTimo von Holtz
fixed coding style issues. Signed-off-by: Timo von Holtz <tvh@informatik.uni-kiel.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31Staging: usbvideo: usbvideo: fixed some coding style issuesTimo von Holtz
fixed coding style issues. Signed-off-by: Timo von Holtz <tvh@informatik.uni-kiel.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31virtio: update MAINTAINERSMichael S. Tsirkin
Patches should keep coming through Rusty but it helps if I'm Cc'd as well. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-01-31Merge branch 'usb-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 * 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (42 commits) usb: gadget: composite: avoid access beyond array max length USB: serial: handle Data Carrier Detect changes USB: gadget: Fix endpoint representation in ci13xxx_udc USB: gadget: Fix error path in ci13xxx_udc gadget probe function usb: pch_udc: Fix the worning log issue at gadget driver remove USB: serial: Updated support for ICOM devices USB: ehci-mxc: add work-around for efika mx/sb bug USB: unbreak ehci-mxc on otg port of i.MX27 drivers: update to pl2303 usb-serial to support Motorola cables USB: adding USB support for Cinterion's HC2x, EU3 and PH8 products USB serial: add missing .usb_driver field in serial drivers USB: ehci-fsl: Fix 'have_sysif_regs' detection USB: g_printer: fix bug in module parameter definitions USB: g_printer: fix bug in unregistration USB: uss720: remove duplicate USB device MAINTAINERS: add ueagle-atm entry USB: EHCI: fix DMA deallocation bug USB: pch_udc: support new device ML7213 IOH usb: pch_udc: Fixed issue which does not work with g_serial usb: set ep_dev async suspend should be later than device_initialize ...
2011-01-31Merge branch 'staging-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 * 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (26 commits) staging: r8712u: Add new device IDs staging: brcm80211: fix suspend/resume issue in brcmsmac staging: brcm80211: remove assert to avoid panic since 2.6.37 kernel Staging: iio: Aditional fixpoint formatted output bugfix staging: usbip: vhci: use urb->dev->portnum to find port staging: usbip: vhci: handle EAGAIN from SO_RCVTIMEO staging: usbip: vhci: friendly log messages for connection errors staging: usbip: vhci: refuse to enqueue for dead connections staging: usbip: vhci: give back URBs from in-flight unlink requests staging: usbip: vhci: update reference count for usb_device staging: usbip: stub: update refcounts for devices and interfaces staging: tidspbridge: replace mbox callback with notifier_call staging: comedi: ni_labpc: Use shared IRQ for PCMCIA card Staging: speakup: &&/|| confusion in silent_store() iio: Fixpoint formatted output bugfix staging: rt2860: Fix incorrect netif_stop_queue usage warning staging: r8712u: Fix memory leak in firmware loading staging: tidspbridge: configure full L1 MMU range staging: rt2870sta: Add ID for Linksys WUSB100v2 Staging: xgfib: put parenthesis in the right place ...
2011-01-31Merge branch 'tty-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 * 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: tty/serial: fix apbuart build n_hdlc: fix read and write locking serial: unbreak billionton CF card tty: use for_each_console() and WARN() on sysfs failures vt: fix issue when fbcon wants to takeover a second time. Fix up trivial conflict in drivers/tty/tty_io.c
2011-01-31Revert "appletalk: move to staging"Greg Kroah-Hartman
This reverts commit a6238f21736af3f47bdebf3895f477f5f23f1af9 Appletalk got some patches to fix up the BLK usage in it in the network tree, so this removal isn't needed. Cc: Arnd Bergmann <arnd@arndb.de> Cc: <acme@ghostprotocols.net> Cc: netdev@vger.kernel.org, Cc: David Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31Staging: rtl8192e: Remove unused card typeMike McCormack
Signed-off-by: Mike McCormack <mikem@ring3k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31Staging: rtl8192e: Remove unused endian_swap functionMike McCormack
Signed-off-by: Mike McCormack <mikem@ring3k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31Staging: rtl8192e: Remove #if 1 blocksMike McCormack
Signed-off-by: Mike McCormack <mikem@ring3k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31Staging: rtl8192e: Move static variable to device structMike McCormack
Signed-off-by: Mike McCormack <mikem@ring3k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31Staging: rtl8192e: Move static variable to device structMike McCormack
Signed-off-by: Mike McCormack <mikem@ring3k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31Staging: rtl8192e: Move static variable to device structMike McCormack
Signed-off-by: Mike McCormack <mikem@ring3k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31Staging: rtl8192e: Move static variable to device structMike McCormack
Signed-off-by: Mike McCormack <mikem@ring3k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31Staging: rtl8192e: Remove PF_SYNCTHREADifdefsMike McCormack
Signed-off-by: Mike McCormack <mikem@ring3k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31Staging: rtl8192e: Don't mess with carrier before registering deviceMike McCormack
Signed-off-by: Mike McCormack <mikem@ring3k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31Staging: rtl8192e: Remove support for legacy wireless extentionsMike McCormack
Signed-off-by: Mike McCormack <mikem@ring3k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31Staging: rtl8192e: Remove unused struct membersMike McCormack
Signed-off-by: Mike McCormack <mikem@ring3k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31Staging: rtl8192e: Delete dead codeMike McCormack
Signed-off-by: Mike McCormack <mikem@ring3k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31Staging: rtl8192e: Remove unused statisticsMike McCormack
Signed-off-by: Mike McCormack <mikem@ring3k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31Staging: rtl8192e: Remove variable that is never writtenMike McCormack
Signed-off-by: Mike McCormack <mikem@ring3k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31staging: ath6kl: Convert tspecCompliance from A_BOOL to intJoe Perches
Make the use in wmi_verify_tspec_params match the declaration of the variable. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Vipin Mehta <vipin.mehta@atheros.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31staging: ath6kl: Convert sets of scanSpecificSsid to TRUE/FALSE.Joe Perches
Don't use 0/1 for an A_BOOL. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Vipin Mehta <vipin.mehta@atheros.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31staging: ath6kl: Convert A_NETBUF_QUEUE_EMPTY to return TRUE or FALSEJoe Perches
Make the return an A_BOOL not int. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Vipin Mehta <vipin.mehta@atheros.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31staging: ath6kl: Convert A_UINT8 is_amsdu and is_acl_data_frame to A_BOOLJoe Perches
Use A_BOOL as appropriate for actual variable uses. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Vipin Mehta <vipin.mehta@atheros.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31staging: ath6kl: cfg80211: Convert forceFgScan to A_UINT32Joe Perches
It's declared that way in the prototype, use it that way too. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Vipin Mehta <vipin.mehta@atheros.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31staging: ath6kl: Convert 0 to FALSEJoe Perches
Convert a set of an A_BOOL from 0 to FALSE. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Vipin Mehta <vipin.mehta@atheros.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31staging: ath6kl: Convert A_BOOL compressed sets from 0 to FALSEJoe Perches
Use the appropriate define. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Vipin Mehta <vipin.mehta@atheros.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31staging: ath6kl: Convert BDADDR_Present uses to TRUE/FALSE bugfixJoe Perches
The previous uses of BDADDR_Present set the initial value to A_ERROR (-1) when not present and A_OK (0) when present. A later test for (!BDADDR_Present) was therefore logically inverted. Convert the values to TRUE/FALSE and the test is now logically correct. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Vipin Mehta <vipin.mehta@atheros.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31staging: ath6kl: Convert type of streamExists to A_UINT8Joe Perches
Make the declaration type match the assigned from type. It's not a bool, it's a u8. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Vipin Mehta <vipin.mehta@atheros.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31staging: ath6kl: Convert bypasswmi to boolJoe Perches
Types should match logical uses. Remove unused extern, make static. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Vipin Mehta <vipin.mehta@atheros.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31staging: ath6kl: wmi.h: Convert packed structures with A_BOOL to u32Joe Perches
These structures are device native and need to be 4 bytes long. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Vipin Mehta <vipin.mehta@atheros.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31staging: ath6kl: Remove A_FAILED macroJoe Perches
Remove obfuscating A_FAILED(foo) macro. Just test for foo instead. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Vipin Mehta <vipin.mehta@atheros.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31staging: ath6kl: Remove A_SUCCESS macroJoe Perches
Remove obfuscating A_SUCCESS(foo) macro. Just test for !foo instead. Reformat a few macros that used A_SUCCESS for better readability. Add do { foo } while (0) surrounds to those macros too. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Vipin Mehta <vipin.mehta@atheros.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-31staging: ath6kl: Convert enum A_STATUS to intJoe Perches
Convert enum members to int as well. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Vipin Mehta <vipin.mehta@atheros.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>