Tomas Winkler [Thu, 3 Feb 2011 11:42:46 +0000 (13:42 +0200)]
staging/easycap: rename variable s16 to tmp
naming variable s16 is confusing since it is also a type name.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Tomas Winkler [Thu, 3 Feb 2011 11:42:45 +0000 (13:42 +0200)]
staging/easycap: rename variable u8 to tmp
naming variable u8 is confusing since it is also a type name.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Tomas Winkler [Thu, 3 Feb 2011 11:42:44 +0000 (13:42 +0200)]
staging/easycap: rename variable s32 to tmp
1. naming variable s32 is confusing since it is also
a type name.
2. use s32 instead of __s32, the later is for user space
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Tomas Winkler [Thu, 3 Feb 2011 11:42:43 +0000 (13:42 +0200)]
staging/easycap: remove explicit NULL initialization
remove intializations to NULL where not needed and let the compiler
find flows with unitilized variables.
Fix one such flow in easycap_vma_fault function
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Tomas Winkler [Thu, 3 Feb 2011 11:42:42 +0000 (13:42 +0200)]
staging/easycap: improve coding style when checking return value
use idiom 'if (rc)' for checking return value
instead of if (0 != rc)
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Tomas Winkler [Thu, 3 Feb 2011 11:42:41 +0000 (13:42 +0200)]
staging/easycap: fix artificial line breaks
fix style issue:
if (NULL !=
pdata_urb->purb) {
created by the patch:
'staging/easycap: don't cast NULL pointer'
After dropping the casting there is no longer 80 columns
limitation
Reported-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Tomas Winkler [Thu, 3 Feb 2011 11:42:40 +0000 (13:42 +0200)]
staging/easycap: repace #if defined with simpler #ifdef
for sake of readability replace #if defined with #ifdef
and #if (!defined with #ifndef
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Tomas Winkler [Thu, 3 Feb 2011 11:42:39 +0000 (13:42 +0200)]
staging/easycap: kill EASYCAP_NEEDS_UNLOCKED_IOCTL
we can kill this option for in-kernel driver
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Tomas Winkler [Thu, 3 Feb 2011 11:42:38 +0000 (13:42 +0200)]
staging/easycap: remove comment: EASYCAP_NEEDS_ALSA
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Tomas Winkler [Thu, 3 Feb 2011 11:42:37 +0000 (13:42 +0200)]
staging/easycap: don't cast NULL pointer
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 3 Feb 2011 10:07:54 +0000 (11:07 +0100)]
staging: ft1000: Remove unnecessary assignment.
dsp_img_info->version and requested_version have same type
so additional temporary variable creation could be omitted
because variables could be compares directly.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 3 Feb 2011 10:07:53 +0000 (11:07 +0100)]
staging: ft1000: Create common function for buffers check.
Same check was done on three places which make code unreadable.
Put repeat routine to separate function.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 3 Feb 2011 10:07:52 +0000 (11:07 +0100)]
staging: ft1000: Remove unused variables.
Remove variables which was defined and assigned
but never used in function.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 3 Feb 2011 10:07:51 +0000 (11:07 +0100)]
staging: ft1000: Fix indentation in scram_dnldr() function.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 3 Feb 2011 10:07:50 +0000 (11:07 +0100)]
staging: ft1000: Fix coding style in write_blk_fifo() function.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 3 Feb 2011 10:07:49 +0000 (11:07 +0100)]
staging: ft1000: Fix coding style in get_handshake() function.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 3 Feb 2011 10:07:48 +0000 (11:07 +0100)]
staging: ft1000: Fix coding style in hdr_checksum() function.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 3 Feb 2011 10:07:47 +0000 (11:07 +0100)]
staging: ft1000: Fix coding style in put_request_value() function.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 3 Feb 2011 10:07:46 +0000 (11:07 +0100)]
staging: ft1000: Fix coding style in get_request_value() function.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 3 Feb 2011 10:07:45 +0000 (11:07 +0100)]
staging: ft1000: Fix coding style in get_request_type_usb() function.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 3 Feb 2011 10:07:44 +0000 (11:07 +0100)]
staging: ft1000: Fix coding style in get_request_type() function.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 3 Feb 2011 10:07:43 +0000 (11:07 +0100)]
staging: ft1000: Fix coding style in put_handshake_usb() function.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 3 Feb 2011 10:07:42 +0000 (11:07 +0100)]
staging: ft1000: Fix coding style in get_handshake_usb() function.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 3 Feb 2011 10:07:41 +0000 (11:07 +0100)]
staging: ft1000: Fix coding style in put_handshake() function.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 3 Feb 2011 10:07:40 +0000 (11:07 +0100)]
staging: ft1000: Fix coding style in check_usb_db() function.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 3 Feb 2011 10:07:39 +0000 (11:07 +0100)]
staging: ft1000: Remove dead code.
Remove code which was under #if 0.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Joe Perches [Wed, 2 Feb 2011 22:05:57 +0000 (14:05 -0800)]
staging: ath6kl: Remove #define A_OK
Just use 0.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Joe Perches [Wed, 2 Feb 2011 22:05:56 +0000 (14:05 -0800)]
staging: ath6kl: Convert (status != A_OK) to (status)
Just use the status variable as a test not a comparison.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Joe Perches [Wed, 2 Feb 2011 22:05:55 +0000 (14:05 -0800)]
staging: ath6kl: Convert A_INT32 to s32
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Joe Perches [Wed, 2 Feb 2011 22:05:54 +0000 (14:05 -0800)]
staging: ath6kl: Convert A_INT16 to s16
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Joe Perches [Wed, 2 Feb 2011 22:05:53 +0000 (14:05 -0800)]
staging: ath6kl: Convert A_INT8 to s8
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Joe Perches [Wed, 2 Feb 2011 22:05:52 +0000 (14:05 -0800)]
staging: ath6kl: Convert A_UINT64 to u64
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Joe Perches [Wed, 2 Feb 2011 22:05:51 +0000 (14:05 -0800)]
staging: ath6kl: Convert A_UINT32 to u32
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Joe Perches [Wed, 2 Feb 2011 22:05:50 +0000 (14:05 -0800)]
staging: ath6kl: Convert A_UINT16 to u16
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Joe Perches [Wed, 2 Feb 2011 22:05:49 +0000 (14:05 -0800)]
staging: ath6kl: Convert A_UINT8 to u8
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Joe Perches [Wed, 2 Feb 2011 22:05:48 +0000 (14:05 -0800)]
staging: ath6kl: Convert A_CHAR to char
Remove obfuscating A_CHAR uses, just use char.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Joe Perches [Wed, 2 Feb 2011 22:05:47 +0000 (14:05 -0800)]
staging: ath6kl: Remove A_BOOL and TRUE/FALSE
Use kernel bool and true/false.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Wed, 2 Feb 2011 21:35:58 +0000 (13:35 -0800)]
Staging: Merge branch 'staging-next' into 2.6.38-rc3
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>
Alan Cox [Tue, 1 Feb 2011 11:34:40 +0000 (11:34 +0000)]
staging: sep: Further tidying
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>
Alan Cox [Tue, 1 Feb 2011 11:31:40 +0000 (11:31 +0000)]
staging: usbvideo: vicam: Fix build in -next
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Linus Torvalds [Tue, 1 Feb 2011 03:05:49 +0000 (13:05 +1000)]
Linux 2.6.38-rc3
Linus Torvalds [Mon, 31 Jan 2011 23:41:02 +0000 (09:41 +1000)]
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* '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()
Linus Torvalds [Mon, 31 Jan 2011 22:30:31 +0000 (08:30 +1000)]
Merge branch 'fixes' of /home/rmk/linux-2.6-arm
* '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
Linus Torvalds [Mon, 31 Jan 2011 22:27:55 +0000 (08:27 +1000)]
Merge branch 'omap-fixes-for-linus' of git://git./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
Randy Dunlap [Mon, 31 Jan 2011 17:29:14 +0000 (09:29 -0800)]
kernel.h: fix kernel-doc warning
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>
Linus Torvalds [Mon, 31 Jan 2011 22:15:40 +0000 (08:15 +1000)]
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* '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.
Nick Robinson [Mon, 31 Jan 2011 16:56:50 +0000 (10:56 -0600)]
Staging: comedi: Fix checpatch.pl issues in file rtd520.c
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>
Adam Thompson [Sat, 29 Jan 2011 07:08:50 +0000 (02:08 -0500)]
Staging: wlan-ng: fix 2 space coding style issues
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>
Roland Stigge [Sat, 29 Jan 2011 15:27:17 +0000 (16:27 +0100)]
Staging: iio: ad7476_core.c: Fixed i2c -> spi documentation typo
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>
Roland Stigge [Sat, 29 Jan 2011 15:36:46 +0000 (16:36 +0100)]
Staging: iio: max517.c: Fix client obtainment by using iio_dev_get_devdata()
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>
Timo von Holtz [Sun, 30 Jan 2011 21:19:39 +0000 (22:19 +0100)]
Staging: dabusb: fixed coding style issues
Fixed coding style issues
Signed-off-by: Timo von Holtz <tvh@informatik.uni-kiel.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Timo von Holtz [Sun, 30 Jan 2011 19:04:55 +0000 (20:04 +0100)]
Staging: usbvideo: vicam: fixed some coding style issues
fixed coding style issues.
Signed-off-by: Timo von Holtz <tvh@informatik.uni-kiel.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Timo von Holtz [Sun, 30 Jan 2011 18:24:03 +0000 (19:24 +0100)]
Staging: usbvideo: usbvideo: fixed some coding style issues
fixed coding style issues.
Signed-off-by: Timo von Holtz <tvh@informatik.uni-kiel.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Michael S. Tsirkin [Mon, 31 Jan 2011 06:16:20 +0000 (16:46 +1030)]
virtio: update MAINTAINERS
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>
Linus Torvalds [Mon, 31 Jan 2011 22:07:40 +0000 (08:07 +1000)]
Merge branch 'usb-linus' of git://git./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
...
Linus Torvalds [Mon, 31 Jan 2011 22:06:31 +0000 (08:06 +1000)]
Merge branch 'staging-linus' of git://git./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
...
Linus Torvalds [Mon, 31 Jan 2011 22:05:19 +0000 (08:05 +1000)]
Merge branch 'tty-linus' of git://git./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
Greg Kroah-Hartman [Mon, 31 Jan 2011 22:03:00 +0000 (14:03 -0800)]
Revert "appletalk: move to staging"
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>
Mike McCormack [Mon, 31 Jan 2011 13:11:15 +0000 (22:11 +0900)]
Staging: rtl8192e: Remove unused card type
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Mon, 31 Jan 2011 13:11:02 +0000 (22:11 +0900)]
Staging: rtl8192e: Remove unused endian_swap function
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Mon, 31 Jan 2011 13:10:48 +0000 (22:10 +0900)]
Staging: rtl8192e: Remove #if 1 blocks
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Mon, 31 Jan 2011 13:10:38 +0000 (22:10 +0900)]
Staging: rtl8192e: Move static variable to device struct
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Mon, 31 Jan 2011 13:10:12 +0000 (22:10 +0900)]
Staging: rtl8192e: Move static variable to device struct
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Mon, 31 Jan 2011 13:09:58 +0000 (22:09 +0900)]
Staging: rtl8192e: Move static variable to device struct
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Mon, 31 Jan 2011 13:09:44 +0000 (22:09 +0900)]
Staging: rtl8192e: Move static variable to device struct
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Mon, 31 Jan 2011 13:09:27 +0000 (22:09 +0900)]
Staging: rtl8192e: Remove PF_SYNCTHREADifdefs
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Mon, 31 Jan 2011 13:09:15 +0000 (22:09 +0900)]
Staging: rtl8192e: Don't mess with carrier before registering device
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Mon, 31 Jan 2011 13:09:02 +0000 (22:09 +0900)]
Staging: rtl8192e: Remove support for legacy wireless extentions
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Mon, 31 Jan 2011 13:08:36 +0000 (22:08 +0900)]
Staging: rtl8192e: Remove unused struct members
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Mon, 31 Jan 2011 13:08:18 +0000 (22:08 +0900)]
Staging: rtl8192e: Delete dead code
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Mon, 31 Jan 2011 13:08:08 +0000 (22:08 +0900)]
Staging: rtl8192e: Remove unused statistics
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Mon, 31 Jan 2011 13:07:54 +0000 (22:07 +0900)]
Staging: rtl8192e: Remove variable that is never written
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Joe Perches [Fri, 28 Jan 2011 04:04:32 +0000 (20:04 -0800)]
staging: ath6kl: Convert tspecCompliance from A_BOOL to int
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>
Joe Perches [Fri, 28 Jan 2011 04:04:31 +0000 (20:04 -0800)]
staging: ath6kl: Convert sets of scanSpecificSsid to TRUE/FALSE.
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>
Joe Perches [Fri, 28 Jan 2011 04:04:30 +0000 (20:04 -0800)]
staging: ath6kl: Convert A_NETBUF_QUEUE_EMPTY to return TRUE or FALSE
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>
Joe Perches [Fri, 28 Jan 2011 04:04:29 +0000 (20:04 -0800)]
staging: ath6kl: Convert A_UINT8 is_amsdu and is_acl_data_frame to A_BOOL
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>
Joe Perches [Fri, 28 Jan 2011 04:04:28 +0000 (20:04 -0800)]
staging: ath6kl: cfg80211: Convert forceFgScan to A_UINT32
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>
Joe Perches [Fri, 28 Jan 2011 04:04:27 +0000 (20:04 -0800)]
staging: ath6kl: Convert 0 to FALSE
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>
Joe Perches [Fri, 28 Jan 2011 04:04:26 +0000 (20:04 -0800)]
staging: ath6kl: Convert A_BOOL compressed sets from 0 to FALSE
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>
Joe Perches [Fri, 28 Jan 2011 04:04:25 +0000 (20:04 -0800)]
staging: ath6kl: Convert BDADDR_Present uses to TRUE/FALSE bugfix
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>
Joe Perches [Fri, 28 Jan 2011 04:04:24 +0000 (20:04 -0800)]
staging: ath6kl: Convert type of streamExists to A_UINT8
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>
Joe Perches [Fri, 28 Jan 2011 04:04:23 +0000 (20:04 -0800)]
staging: ath6kl: Convert bypasswmi to bool
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>
Joe Perches [Fri, 28 Jan 2011 04:04:22 +0000 (20:04 -0800)]
staging: ath6kl: wmi.h: Convert packed structures with A_BOOL to u32
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>
Joe Perches [Fri, 28 Jan 2011 04:04:21 +0000 (20:04 -0800)]
staging: ath6kl: Remove A_FAILED macro
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>
Joe Perches [Fri, 28 Jan 2011 04:04:20 +0000 (20:04 -0800)]
staging: ath6kl: Remove A_SUCCESS macro
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>
Joe Perches [Fri, 28 Jan 2011 04:04:19 +0000 (20:04 -0800)]
staging: ath6kl: Convert enum A_STATUS to int
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>
Joe Perches [Fri, 28 Jan 2011 04:04:18 +0000 (20:04 -0800)]
staging: ath6kl: Update cfg80211 to recent calling convention changes
Add bool unicast and bool multicast to set_default_key
Return struct net_device * to add_virtual_intf
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>
Russell King [Sun, 30 Jan 2011 16:40:20 +0000 (16:40 +0000)]
ARM: smp_on_up: allow non-ARM SMP processors
Allow non-ARM SMP processors to use the SMP_ON_UP feature. CPUs
supporting SMP must have the new CPU ID format, so check for this first.
Then check for ARM11MPCore, which fails the MPIDR check. Lastly check
the MPIDR reports multiprocessing extensions and that the CPU is part of
a multiprocessing system.
Cc: <stable@kernel.org>
Reported-and-Tested-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Coly Li [Thu, 27 Jan 2011 12:12:35 +0000 (20:12 +0800)]
Staging: wl_cfg80211.c: use BUG_ON correctly
This patch removes explicit unlikely() when using BUG_ON() in
wl_cfg80211.c
Signed-off-by: Coly Li <bosong.ly@taobao.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Julia Lawall [Thu, 27 Jan 2011 15:49:07 +0000 (16:49 +0100)]
staging: msm/lcdc.c: Convert IS_ERR result to PTR_ERR
This code elsewhere returns a negative constant to an indicate an error,
while IS_ERR returns the result of a >= operation.
The semantic patch that fixes this problem is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
expression x;
@@
if (...) { ...
- return IS_ERR(x);
+ return PTR_ERR(x);
}
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Acked-by: David Brown <davidb@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Haiyang Zhang [Wed, 26 Jan 2011 20:12:14 +0000 (12:12 -0800)]
staging: hv: Convert camel cased struct fields in vmbus_private.h to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Haiyang Zhang [Wed, 26 Jan 2011 20:12:13 +0000 (12:12 -0800)]
staging: hv: Convert camel cased struct fields in vmbus_packet_format.h to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Haiyang Zhang [Wed, 26 Jan 2011 20:12:12 +0000 (12:12 -0800)]
staging: hv: Convert camel cased struct fields in vmbus_channel_interface.h to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Haiyang Zhang [Wed, 26 Jan 2011 20:12:11 +0000 (12:12 -0800)]
staging: hv: Convert camel cased struct fields in vmbus_api.h to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Haiyang Zhang [Wed, 26 Jan 2011 20:12:10 +0000 (12:12 -0800)]
staging: hv: Convert camel cased functions in vmbus_drv.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Haiyang Zhang [Wed, 26 Jan 2011 20:12:09 +0000 (12:12 -0800)]
staging: hv: Convert camel cased variables in vmbus_drv.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Haiyang Zhang [Wed, 26 Jan 2011 20:12:08 +0000 (12:12 -0800)]
staging: hv: Convert camel cased functions in connection.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Haiyang Zhang [Wed, 26 Jan 2011 20:12:07 +0000 (12:12 -0800)]
staging: hv: Convert camel cased variables in connection.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Arnd Bergmann [Tue, 25 Jan 2011 22:17:27 +0000 (23:17 +0100)]
appletalk: move to staging
For all I know, Appletalk is dead, the only reasonable
use right now would be nostalgia, and that can be served
well enough by old kernels. The code is largely not
in a bad shape, but it still uses the big kernel lock,
and nobody seems motivated to change that.
FWIW, the last release of MacOS that supported Appletalk
was MacOS X 10.5, made in 2007, and it has been abandoned
by Apple with 10.6. Using TCP/IP instead of Appletalk has
been supported since MacOS 7.6, which was released in
1997 and is able to run on most of the legacy hardware.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: netdev@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Arnd Bergmann [Tue, 25 Jan 2011 22:17:21 +0000 (23:17 +0100)]
staging: remove smbfs
smbfs got moved to staging in 2.6.37, so we can
finally remove it in the 2.6.39 merge window.
All users should by now have migrated to cifs.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: linux-cifs@vger.kernel.org
Cc: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
projects / GitHub / mt8127 / android_kernel_alcatel_ttab.git / log