OSDN Git Service
Anton Vorontsov [Sat, 12 May 2012 00:17:34 +0000 (17:17 -0700)]
staging: android: persistent_ram: Introduce persistent_ram_new()
The routine just creates a persistent ram zone at a specified address.
For persistent_ram_init_ringbuffer() we'd need to add a
'struct persistent_ram' to the global list, and associate it with a
device. We don't need all this complexity in pstore_ram, so we introduce
the simple function.
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Anton Vorontsov [Sat, 12 May 2012 00:17:25 +0000 (17:17 -0700)]
staging: android: persistent_ram: Introduce persistent_ram_post_init()
Factor post init logic out of __persistent_ram_init(), we'll need
it for the new persistent_ram_new() routine.
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Anton Vorontsov [Sat, 12 May 2012 00:17:17 +0000 (17:17 -0700)]
persistent_ram: Fix buffer size clamping during writes
This is a longstanding bug, almost unnoticeable when calling
persistent_ram_write() for small buffers.
But when called for large data buffers, the write routine behaves
incorrectly, as the size may never update: instead of clamping
the size to the maximum buffer size, buffer_size_add_clamp() returns
an error (which is never checked by the write routine, btw).
To fix this, we now use buffer_size_add() that actually clamps the
size to the max value.
Also remove buffer_size_add_clamp(), it is no longer needed.
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Acked-by: Colin Cross <ccross@android.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Anton Vorontsov [Sat, 12 May 2012 00:17:06 +0000 (17:17 -0700)]
persistent_ram: Remove prz->node
The 'node' struct member is unused, so remove it.
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tim Bird [Thu, 10 May 2012 21:22:59 +0000 (14:22 -0700)]
staging: android: logger: Fix some sparse and whitespace issues
Fix a few sparse warnings, and improve whitespace.
Cc: Brian Swetland <swetland@google.com>
Signed-off-by: Tim Bird <tim.bird@am.sony.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tim Bird [Thu, 10 May 2012 22:11:36 +0000 (15:11 -0700)]
staging: android: logger: Allocate logs dynamically at boot (v3)
This changes the log initialization to be dynamic, but still
at boot time. These changes are a predecessor to implementing
runtime allocation and freeing of logs, to make the Android logger
less hard-coded.
Change from a fixed set of static log structures, to allocation
at init time into a list. Return proper error numbers on log
allocation failure.
Cc: Brian Swetland <swetland@google.com>
Signed-off-by: Tim Bird <tim.bird@am.sony.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Paul Gortmaker [Thu, 10 May 2012 03:10:54 +0000 (23:10 -0400)]
staging: delete all duplicated endian crap from rtl8712 driver
This driver had headers like big_endian.h, little_endian.h, swab.h
and yet we can throw them all in the trash can and the thing
still builds on x86-64 and ppc, just by deleting the references
to the deleted files.
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Paul Gortmaker [Thu, 10 May 2012 02:53:32 +0000 (22:53 -0400)]
staging: wean rtl8712 off of its ancient duplicate of ip.h
This driver should not be carrying around ancient copies of
headers like <linux/ip.h> for its own use. Mapping it onto
the mainline one uncovers no build issues.
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Paul Gortmaker [Thu, 10 May 2012 02:42:45 +0000 (22:42 -0400)]
staging: wean rtl8712 off of its ancient duplicate of if_ether.h
This driver should not be carrying around ancient copies of
headers like <linux/if_ether.h> for its own use. Mapping it
onto the mainline one uncovers no build issues.
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Oleksij Rempel [Thu, 10 May 2012 07:59:39 +0000 (09:59 +0200)]
staging: rts5139: remove unused variable option.ww_enable
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Thu, 10 May 2012 07:59:38 +0000 (09:59 +0200)]
staging: rts5139: remove unused variable in rts51x_chip.h
the SENSE_TYPE_FORMAT_IN_PROGRESS was checked by rts51x_scsi.c
but never set.
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Thu, 10 May 2012 07:59:37 +0000 (09:59 +0200)]
staging: rts5139: remove unused variable in rts51x.h
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Thu, 10 May 2012 07:59:36 +0000 (09:59 +0200)]
staging: rts5139: remove unused TUNE_SD18_*
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Thu, 10 May 2012 07:59:35 +0000 (09:59 +0200)]
staging: rts5139: remove unused polling_time variable
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Thu, 10 May 2012 07:59:34 +0000 (09:59 +0200)]
staging: rts5139: remove unused rcc_bug_fix_en
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Thu, 10 May 2012 07:59:33 +0000 (09:59 +0200)]
staging: rts5139: remove unused rcc_fail_flag variable
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Thu, 10 May 2012 07:59:32 +0000 (09:59 +0200)]
staging: rts5139: remove unused option->needs_remote_wakeup
module parametr needs_remote_wakeup sets
option->needs_remote_wakeup and
rts51x->pusb_intf->needs_remote_wakeup
the second may be used, the first one is never used
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Thu, 10 May 2012 07:59:31 +0000 (09:59 +0200)]
staging: rts5139: remove unused led_blink_speed variable
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Thu, 10 May 2012 07:59:30 +0000 (09:59 +0200)]
staging: rts5139: remove disabled code in rts51x_card.c
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Thu, 10 May 2012 07:59:29 +0000 (09:59 +0200)]
staging: rts5139: make some functions static in ms.c and ms_mg.c
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Thu, 10 May 2012 07:59:28 +0000 (09:59 +0200)]
staging: rts5139: remove unused xd_check_err_code in xd.c
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Thu, 10 May 2012 07:59:27 +0000 (09:59 +0200)]
staging: rts5139: make some functions static in xd.c
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Thu, 10 May 2012 07:59:26 +0000 (09:59 +0200)]
staging: rts5139: make some functions static in sd_cprm.c
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Thu, 10 May 2012 07:59:25 +0000 (09:59 +0200)]
staging: rts5139: make some functions static in sd.*
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Thu, 10 May 2012 07:59:24 +0000 (09:59 +0200)]
staging: rts5139: remove soft_reset_sd_card in sd_cprm.c
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Thu, 10 May 2012 07:59:23 +0000 (09:59 +0200)]
staging: rts5139: remove unused rts51x_reset_pipe in rts51x_transport.*
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Thu, 10 May 2012 07:59:22 +0000 (09:59 +0200)]
staging: rts5139: make some functions static in rts51x_transport.*
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Thu, 10 May 2012 07:59:21 +0000 (09:59 +0200)]
staging: rts5139: remove unsued *host_info in rts51x_scsi.c
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Thu, 10 May 2012 07:59:20 +0000 (09:59 +0200)]
staging: rts5139: make some functions static in rts51x_scsi.c
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Dan Carpenter [Thu, 10 May 2012 15:19:04 +0000 (18:19 +0300)]
Staging: ipack: dereferencing freed memory
We free "dev" then dereference it on the next line.
Cc: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Dan Carpenter [Thu, 10 May 2012 15:18:36 +0000 (18:18 +0300)]
Staging: ipack: returning a freed pointer
If ipack_device_register() returns an error, then we returned a freed
pointer. The caller doesn't use it, but it means we return success to
the user instead of returning an error code.
I kind of rewrote the error handling in this function as a cleanup.
Cc: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Samuel Iglesias Gonsalvez [Wed, 9 May 2012 13:27:21 +0000 (15:27 +0200)]
Staging: ipack: add support for IP-OCTAL mezzanine board
IP-OCTAL is a 8-channels serial port device. There are several models one per
each standard: RS-232, RS-422, RS-485.
This driver can manage all of them.
Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Samuel Iglesias Gonsalvez [Wed, 9 May 2012 13:27:20 +0000 (15:27 +0200)]
Staging: ipack: added support for the TEWS TPCI-200 carrier board
Driver for the carrier board TEWS TPCI-200, a bridge between PCIe bus and
IndustryPack bus.
Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Samuel Iglesias Gonsalvez [Wed, 9 May 2012 13:27:19 +0000 (15:27 +0200)]
Staging: IndustryPack bus for the Linux Kernel
Add IndustryPack bus support for the Linux Kernel.
This is a virtual bus that allows to perform all the operations between
carrier and mezzanine boards.
Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tomas Winkler [Wed, 9 May 2012 13:39:02 +0000 (16:39 +0300)]
mei: update MAINTAINERS file
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tomas Winkler [Wed, 9 May 2012 13:39:01 +0000 (16:39 +0300)]
mei: update Documentation/ioctl/ioctl-number.txt
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tomas Winkler [Wed, 9 May 2012 13:39:00 +0000 (16:39 +0300)]
mei: move doc files Documentation/misc-devices/mei
1. move mei.txt, TODO, and the example code under Documentation/misc-devices/mei
2. update the TODO file
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tomas Winkler [Wed, 9 May 2012 13:38:59 +0000 (16:38 +0300)]
mei: export mei.h for the user space
The header exports API for application layer
1. move under include/linux and add to the export list
2. update include path n the sources
3. update TODO
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tomas Winkler [Wed, 9 May 2012 13:38:58 +0000 (16:38 +0300)]
uuid: add uuid.h to exported header list
uuid is used in mei.h interface
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tomas Winkler [Tue, 8 May 2012 20:04:56 +0000 (23:04 +0300)]
mei: pci_probe/remove: use dev_err instead of printk(KERN_ERR
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tomas Winkler [Tue, 8 May 2012 20:04:55 +0000 (23:04 +0300)]
mei: use pr_err instead of printk(KERN_ERR
pr_ format is more compact and enable utilizing of pr_fmt macro
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Joe Perches [Tue, 8 May 2012 17:11:56 +0000 (10:11 -0700)]
staging: Remove test of is_broadcast with is_multicast
A broadcast packet is a multicast packet, no need to test twice.
Reorder one defective test in rtl_core of is_multi_ether_addr
before is_broadcast_ether_addr as the is_multi returns true for
broadcast frames.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johannes Thumshirn [Sat, 5 May 2012 14:31:52 +0000 (16:31 +0200)]
staging: line6/pcm.c: Removed trailing whitespace
Removed a line of only whitespace
Signed-off-by: Johannes Thumshirn <morbidrsa@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johannes Thumshirn [Sat, 5 May 2012 14:31:51 +0000 (16:31 +0200)]
staging: line6/midi.c: Added space between switch and open parenthesis
Added space between switch and open parenthesis to make checkpatch.pl happy
Signed-off-by: Johannes Thumshirn <morbidrsa@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johannes Thumshirn [Sat, 5 May 2012 14:31:50 +0000 (16:31 +0200)]
staging: line6/midibuf.c changed printk(KERN_DEBUG, ... to pr_debug(
Changed printk(KERN_DEBUG, ...) call to pr_debug call in function
void line6_midibuf_status(struct MidiBuffer *this)
Signed-off-by: Johannes Thumshirn <morbidrsa@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Masanari Iida [Sun, 6 May 2012 23:21:59 +0000 (08:21 +0900)]
staging: wlags49_h2: Fix spelling Endianess to Endianness in wlags49_h2
Correct spelling typo "Endianess" to "Endianness" in wlags49_h2.
Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Justin P. Mattock [Mon, 7 May 2012 14:38:22 +0000 (07:38 -0700)]
staging: rtl8712: Fix typos.
Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Wed, 9 May 2012 16:20:08 +0000 (09:20 -0700)]
staging: comedi: refactor sysfs files in comedi_fops.c
Refactor the sysfs attributes and functions to remove
the need for the forward declarations and use the
DEVICE_ATTR macro to define them.
Instead of individually creating sysfs device attribute
files, wrap them in an attribute_group and use the
sysfs_create_group function to create them.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Tue, 8 May 2012 23:27:55 +0000 (16:27 -0700)]
staging: comedi: rtf520: las0, las1, and lcfg are void __iomem *
The las0, las1, and lcfg variables in struct rtdPrivate are all
ioremap'ed pci resources and should be void __iomem *
not void *.
This quiets a lot of sparse warings for the writel and readl like:
warning: incorrect type in argument 1 (different address spaces)
  expected void const volatile [noderef] <asn:2>*addr
  got void *<noident>
warning: incorrect type in argument 2 (different address spaces)
  expected void volatile [noderef] <asn:2>*addr
  got void *
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Tue, 8 May 2012 23:19:34 +0000 (16:19 -0700)]
staging: comedi: mite: mite_io_addr and daq_io_addr are void __iomem *
The mite_io_addr and daq_io_addr variables in struct mite_struct
are both ioremap'ed pci resources and should be void __iomem *
not void *.
This quiets a lot of sparse warings for the write[lwb],read[lwb]
calls in the comedi mite drives like:
warning: incorrect type in argument 1 (different address spaces)
expected void const volatile [noderef] <asn:2>*addr
got void *<noident>
warning: incorrect type in argument 2 (different address spaces)
expected void volatile [noderef] <asn:2>*addr
got void *
It also exposed some warnings in the mite ni_660x driver where
the daq_io_address was getting cast as a void *const.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Mon, 7 May 2012 19:14:22 +0000 (12:14 -0700)]
staging: comedi: rename addi CamelCase function pointers
Rename the CamelCase variable names for the ADDI subdevice
functions. This makes the code a bit cleaner and easier to
follow.
This will also help with converting the struct addi_board
boardtypes array to C99 style initialization to help with
maintaining the code.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Sat, 5 May 2012 00:09:02 +0000 (17:09 -0700)]
staging: comedi: refactor dt2814 driver and use module_comedi_driver
Move the struct comedi_driver to the end of the source and refactor
the code to remove the forward declarations.
Convert the driver to use the module_comedi_driver() macro which
makes the code smaller and a bit simpler.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Sat, 5 May 2012 00:02:38 +0000 (17:02 -0700)]
staging: comedi: refactor dt282x driver to remove forward declarations
Move the struct comedi_driver and variables to the end of the
source. This is more typical of how other drivers are written and
removes the need for the forward declarations.
Convert the driver to use the module_comedi_driver() macro which
makes the code smaller and a bit simpler.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 4 May 2012 23:49:45 +0000 (16:49 -0700)]
staging: comedi: refactor dt3000 driver to remove forward declarations
Move the module_init/module_exit routines and the associated
struct comedi_driver and other variables to the end of the source.
This is more typical of how other drivers are written.
Also, refactor a couple of the pci helper functions used during the
attach. The removes the need for the forward declarations.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 4 May 2012 23:31:58 +0000 (16:31 -0700)]
staging: comedi: refactor dyna_pci10xx driver to remove forward declarations
Move the struct comedi_driver and associated variables to the
end of the source. This is more typical of how other drivers are
written and removes the need for the forward declarations.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 4 May 2012 23:19:26 +0000 (16:19 -0700)]
staging: comedi: refactor the icp_multi driver to remove forward declarations
Move the setup_channel_list function forward in the souce and the
struct comedi_driver and associated variables to the end of the
source. This is more typical of how other drivers are written and
removes the need for the forward declarations.
Remove the unnecessary comments for the attach/detach functions.
Change the initialization of struct boardtype to c99 syntax and
remove the comments.
Convert the driver to use the module_comedi_driver() macro which
makes the code smaller and a bit simpler.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 4 May 2012 22:57:24 +0000 (15:57 -0700)]
staging: comedi: refactor jr3_pci driver to remove forward declarations
Move the struct comedi_driver and associated variables to the
end of the source. This is more typical of how other drivers are
written and removes the need for the forward declarations.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 4 May 2012 22:51:25 +0000 (15:51 -0700)]
staging: comedi: refactor me4000 driver to remove forward declarations
Move the struct comedi_driver, attach/detach functions, and
associated variables to the end of the source. This is more
typical of how other drivers are written and removes the need
for most of the forward declarations.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 4 May 2012 22:39:55 +0000 (15:39 -0700)]
staging: comedi: refactor me_daq driver to remove forward declarations
Move the module_init/module_exit routines and the associated
struct comedi_driver and other variables to the end of the source.
This is more typical of how other drivers are written and removes
the need for the forward declarations.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 4 May 2012 22:33:17 +0000 (15:33 -0700)]
staging: comedi: refactor mpc624 driver and use module_comedi_driver
Move the struct comedi_driver and associated attach/detach
routines to the end of the source. This is more typical of how
other drivers are written and removes the need for the forward
declarations.
Convert the driver to use the module_comedi_driver() macro which
makes the code smaller and a bit simpler.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 4 May 2012 22:26:44 +0000 (15:26 -0700)]
staging: comedi: refactor mpc8260cpm driver and use module_comedi_driver
Move the module_init/module_exit routines and the associated
struct comedi_driver and other variables to the end of the source.
This is more typical of how other drivers are written and removes
the need for the forward declarations.
Convert the driver to use the module_comedi_driver() macro which
makes the code smaller and a bit simpler.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 4 May 2012 22:19:49 +0000 (15:19 -0700)]
staging: comedi: refactor multiq3 driver and use module_comedi_driver
Move the struct comedi_driver to the end of the source. Convert
the driver to use the module_comedi_driver() macro which makes
the code smaller and a bit simpler.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 4 May 2012 21:37:36 +0000 (14:37 -0700)]
staging: comedi: partial refactor of s626 driver to remove forward declarations
Move the module_init/module_exit routines and the associated
struct comedi_driver and other variables to the end of the source.
This is more typical of how other drivers are written and removes
the need for the forward declarations.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 4 May 2012 21:26:56 +0000 (14:26 -0700)]
staging: comedi: refactor ssv_dnp driver and use module_comedi_driver
Move the module_init/module_exit routines and the associated
struct comedi_driver and other variables to the end of the source.
This is more typical of how other drivers are written and removes
the need for the forward declarations.
Convert the driver to use the module_comedi_driver() macro which
makes the code smaller and a bit simpler.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 4 May 2012 18:50:57 +0000 (11:50 -0700)]
staging: comedi: refactor unioxx5 driver and use module_comedi_driver
Move the module_init/module_exit routines and the associated
struct comedi_drive to the end of the source. This is more typical
of how other drivers are written and removes the need for the
forward declarations.
Convert the driver to use the module_comedi_driver() macro which
makes the code smaller and a bit simpler.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 4 May 2012 18:23:54 +0000 (11:23 -0700)]
staging: comedi: remove debug tracing in vmk80xx driver
The vmk80xx driver uses a non-existant Kconfig symbol to enable
function call debug tracing. This output is really just noise
and doesn't serve any useful purpose. Remove all it's uses in
the driver.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 3 May 2012 22:09:40 +0000 (15:09 -0700)]
staging: comedi: use module_comedi_driver
Convert the refactored comedi drivers to use the module_comedi_driver()
macro which makes the code smaller and a bit simpler.
In the process, rename the driver variables from driver_* to *_driver,
as is more typical with other subsystems, and make sure they are all
static.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Masanari Iida [Tue, 8 May 2012 18:06:46 +0000 (03:06 +0900)]
staging: rts5139: Fix typo in rts5139
Correct spelling typo in rts5139
Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Fri, 4 May 2012 15:14:37 +0000 (17:14 +0200)]
staging: rts5139: remove unused card_power_off
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Fri, 4 May 2012 15:14:36 +0000 (17:14 +0200)]
staging: rts5139: remove unused disable_card_clock
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Fri, 4 May 2012 18:02:46 +0000 (20:02 +0200)]
staging: rts5139: make some functions static in rts51x_card.c and rts51x.c
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Fri, 4 May 2012 15:14:34 +0000 (17:14 +0200)]
staging: rts5139: remove useless rts51x_sys.h
and move USING_POLLING_CYCLE_DELINK to rts51x_chip.h
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Fri, 4 May 2012 15:14:33 +0000 (17:14 +0200)]
staging: rts5139: remove unused clear_first_install_mark
it also removes rts51x_reset_detected_cards.
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Fri, 4 May 2012 15:14:32 +0000 (17:14 +0200)]
staging: rts5139: remove disabled SCSI_SCAN_DELAY code
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Fri, 4 May 2012 15:14:31 +0000 (17:14 +0200)]
staging: rts5139: remove disabled XD_SPEEDUP code
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Fri, 4 May 2012 15:14:30 +0000 (17:14 +0200)]
staging: rts5139: remove disabled SUPPORT_SD_LOCK code.
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Fri, 4 May 2012 15:14:29 +0000 (17:14 +0200)]
staging: rts5139: remove unused LED_AUTO_BLINK code
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Fri, 4 May 2012 15:14:28 +0000 (17:14 +0200)]
staging: rts5139: remove disabled code in rts51x_fop.*
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Fri, 4 May 2012 15:14:27 +0000 (17:14 +0200)]
staging: rts5139: remove disabled code in rts51x_scsi.c
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Fri, 4 May 2012 15:14:26 +0000 (17:14 +0200)]
staging: rts5139: remove disable code in rts51x_transport.c
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Fri, 4 May 2012 15:14:25 +0000 (17:14 +0200)]
staging: rts5139: remove disabled code in rts51x_chip.c
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleksij Rempel [Fri, 4 May 2012 15:14:24 +0000 (17:14 +0200)]
staging: rts5139: remove useless functions in rts51x_card.c
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tomas Melin [Mon, 7 May 2012 19:50:55 +0000 (22:50 +0300)]
Staging: Comedi adv_pci1710: Fixed indentation
Fixed indentation for print messages and code.
Signed-off-by: Tomas Melin <tomas.melin@iki.fi>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tomas Melin [Mon, 7 May 2012 19:50:24 +0000 (22:50 +0300)]
Staging: Comedi adv_pci1710: Combined two conditions
Combined two if statements making the code cleaner, removing one level
of indentation.
Signed-off-by: Tomas Melin <tomas.melin@iki.fi>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tomas Melin [Mon, 7 May 2012 19:49:48 +0000 (22:49 +0300)]
Staging: Comedi adv_pci1710: Cleaned up comments
Removed useless comments and cleaned up text.
Signed-off-by: Tomas Melin <tomas.melin@iki.fi>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tomas Melin [Mon, 7 May 2012 19:49:11 +0000 (22:49 +0300)]
Staging: Comedi adv_pci1710: Move check forward
Simplifies function logic by assuming that n_chan >1 if not <=1.
Removes one level of indentation.
Signed-off-by: Tomas Melin <tomas.melin@iki.fi>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Minchan Kim [Thu, 3 May 2012 06:40:40 +0000 (15:40 +0900)]
staging: zsmalloc: add/fix function comment
Add/fix the comment.
Signed-off-by: Minchan Kim <minchan@kernel.org>
Acked-by: Nitin Gupta <ngupta@vflare.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Minchan Kim [Thu, 3 May 2012 06:40:39 +0000 (15:40 +0900)]
staging: zsmalloc: rename zspage_order with zspage_pages
zspage_order defines how many pages are needed to make a zspage.
So _order_ is rather awkward naming. It already deceive Jonathan
- http://lwn.net/Articles/477067/
" For each size, the code calculates an optimum number of pages (up to 16)"
Let's change from _order_ to _pages_ and some function names.
Signed-off-by: Minchan Kim <minchan@kernel.org>
Acked-by: Nitin Gupta <ngupta@vflare.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Sasha Levin [Mon, 7 May 2012 11:02:22 +0000 (13:02 +0200)]
staging: ramster: depend on NET for sock_* functions
Building ramster without NET would cause linkage issue due to missing
sock_*() functions in cluster/tcp.c
Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
Acked-by: Dan Magenheimer <dan.magenheimer@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Masanari Iida [Mon, 7 May 2012 15:26:07 +0000 (00:26 +0900)]
staging: ramster: Fix typo in zcache-main.c
Correct spelling typo in zcache-main.c
Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Masanari Iida [Tue, 8 May 2012 18:18:17 +0000 (03:18 +0900)]
staging: iio: Fix typo in iio
Correct spelling typo in staging/iio
Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Acked-by: Michael Hennerich<michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Axel Lin [Thu, 3 May 2012 14:56:58 +0000 (22:56 +0800)]
IIO: industrialio-core: Checking NULL instead of IS_ERR for debugfs_create_dir()
If defined CONFIG_DEBUG_FS, debugfs_create_dir returns NULL on failure.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Axel Lin [Thu, 3 May 2012 01:50:51 +0000 (09:50 +0800)]
IIO: industrialio-core: Use simple_open
Use simple_open to replace iio_debugfs_open.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Martyn Welch [Thu, 3 May 2012 16:52:36 +0000 (17:52 +0100)]
MAINTAINERS: Add maintainers for VME subsystem
Add Martyn Welch, Manohar Vanga and Greg Kroah-Hartman as maintainers for
the VME subsystem.
Signed-off-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Martyn Welch [Thu, 3 May 2012 16:36:54 +0000 (17:36 +0100)]
VME: Move API documentation to Documentation folder
The documentation for the VME device driver API is currently in
drivers/vme/vme_api.txt, move this to Documentation/vme_api.txt
Signed-of-by: Martyn Welch <martyn.welch@ge.com>
Acked-by: Rob Landley <rob@landley.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 3 May 2012 00:12:22 +0000 (17:12 -0700)]
vme: vme_ca91cx42.c: local functions should not be exposed globally
Functions not referenced outside of a source file should be marked
static to prevent them from being exposed globally.
Quiets the sparse warnings:
warning: symbol 'ca91cx42_alloc_consistent' was not declared. Should it be static?
warning: symbol 'ca91cx42_free_consistent' was not declared. Should it be static?
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten lin [Thu, 3 May 2012 00:08:38 +0000 (17:08 -0700)]
vme: vme_tsi148.c: local functions should not be exposed globally
Functions not referenced outside of a source file should be marked
static to prevent them from being exposed globally.
Quiets the sparse warnings:
warning: symbol 'tsi148_alloc_consistent' was not declared. Should it be static?
warning: symbol 'tsi148_free_consistent' was not declared. Should it be static?
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tomas Melin [Wed, 2 May 2012 16:15:17 +0000 (19:15 +0300)]
Staging: Comedi adv_pci1710 : Corrected over 80 column warnings
Indentation problems aswell as various comments and code lines longer
than 80 chars fixed in file adv_pci1710.c
Signed-off-by: Tomas Melin <tomas.melin@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Wed, 2 May 2012 00:20:04 +0000 (17:20 -0700)]
staging: comedi: Add helper macro for comedi_driver boilerplate
Introduce the module_comedi_driver macro which is a convenience
macro for comedi driver modules similar to module_platform_driver.
It is intended to be used by drivers where the init/exit section
does nothing but register/unregister the comedi driver. By using
this macro it is possible to eliminate a few lines of boilerplate
code per comedi driver.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Peter Meerwald [Tue, 1 May 2012 23:13:33 +0000 (01:13 +0200)]
staging: iio: call iio_device_unregister() in max517_remove()
Reported-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>