OSDN Git Service
Alan Cox [Fri, 7 Aug 2009 18:24:51 +0000 (19:24 +0100)]
Staging: sep: fix flow API
We can return NULL - much cleaner
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Fri, 7 Aug 2009 18:24:43 +0000 (19:24 +0100)]
Staging: sep: clean up after switching to passing sep
Various function calls can now be cleaned up
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Fri, 7 Aug 2009 18:24:36 +0000 (19:24 +0100)]
Staging: sep: Use filp->private_data to create proper device instances
Move from using a sep_dev global. The workqueue still uses it and we use the
pointer in order to know if a device was found.
This requires some restructuring as the pci probe and the init module logic
are all rather messed up and only worked by luck.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Fri, 7 Aug 2009 18:24:26 +0000 (19:24 +0100)]
Staging: sep: Fix PCI irq usage
Don't read the IRQ from the device, the device has no idea what is going on
in the full bus topology and remapping above PCI. Use the pdev->irq field.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Fri, 7 Aug 2009 18:24:18 +0000 (19:24 +0100)]
Staging: sep: rename some fields
Make them more Linuxlike - also favour _bus over _phys
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Fri, 7 Aug 2009 18:24:08 +0000 (19:24 +0100)]
Staging: sep: use O_NDELAY instead of magic APIs
Open is still completely bogus in this driver but we'll tackle that later -
for now fix the bogus API
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Fri, 7 Aug 2009 18:24:00 +0000 (19:24 +0100)]
Staging: sep: fix time handler
Cleaning up the code reveals an obvious thinko
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Fri, 7 Aug 2009 18:23:50 +0000 (19:23 +0100)]
Staging: sep: forward declaration removal time
Exterminate! Exterminate! Exterminate!
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Fri, 7 Aug 2009 18:23:41 +0000 (19:23 +0100)]
Staging: sep: squish some of the wrapper functions
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Fri, 7 Aug 2009 18:23:34 +0000 (19:23 +0100)]
Staging: sep: kill off unused code
Now it is static we can see what code is unused
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Fri, 7 Aug 2009 18:23:26 +0000 (19:23 +0100)]
Staging: sep: make everything static
Now we have it in one file we can make it all static and see what falls out
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Fri, 7 Aug 2009 18:23:19 +0000 (19:23 +0100)]
Staging: sep: merge the two files
Now we have it trimmed down a bit merge the two pieces so we can clean it up
properly. Code moves but no changes in functions.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Fri, 7 Aug 2009 18:23:11 +0000 (19:23 +0100)]
Staging: sep: kill lock wrapper
We don't need wrappers for this so clean them up
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Fri, 7 Aug 2009 18:23:04 +0000 (19:23 +0100)]
Staging: sep: statically initialize the fops like other drivers
This doesn't need to be done at runtime so do it at compile time
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Fri, 7 Aug 2009 18:22:57 +0000 (19:22 +0100)]
Staging: sep: function shuffle
Shuffle the functions into a more normal order. Don't however change any of
them.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Fri, 7 Aug 2009 18:11:48 +0000 (19:11 +0100)]
Staging: sep: Put all the ARM bits together
I suspect these can be killed off entirely
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Thu, 6 Aug 2009 19:46:22 +0000 (20:46 +0100)]
Staging: sep: priceless ...
Remove some rather pointless goto calls
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Thu, 6 Aug 2009 19:46:08 +0000 (20:46 +0100)]
Staging: sep: first pass after indent
Again all formatting
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Thu, 6 Aug 2009 19:45:57 +0000 (20:45 +0100)]
Staging: sep: indent pass
Ok time to indent and get the code in vague shape. No other changes in this
patch.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Thu, 6 Aug 2009 19:45:47 +0000 (20:45 +0100)]
Staging: sep: do something about all the printk macros
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Thu, 6 Aug 2009 19:45:35 +0000 (20:45 +0100)]
Staging: sep: We have two different repeats of the same logic
So how about a little helper
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Thu, 6 Aug 2009 19:45:24 +0000 (20:45 +0100)]
Staging: sep: rework write_register/read_register
Replace the macros with an inline to get type safety and pass sep_dev
instead of the reg pointer
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Thu, 6 Aug 2009 19:45:07 +0000 (20:45 +0100)]
Staging: sep: Create a structure to hold all the current crap spewed about as globals
For now keep the field names matching the variable names
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Thu, 6 Aug 2009 19:44:46 +0000 (20:44 +0100)]
Staging: rar/sep: Remove C++isms from the headers
C++ header wrapping goes on the user space side
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Thu, 6 Aug 2009 19:44:09 +0000 (20:44 +0100)]
Staging: sep: Fix rar build
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Thu, 6 Aug 2009 19:44:37 +0000 (20:44 +0100)]
Staging: rar/sep: Don't use random VENDOR_ID macros but the proper names
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Thu, 6 Aug 2009 19:44:29 +0000 (20:44 +0100)]
Staging: rar: fix some initial type problems
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Thu, 6 Aug 2009 19:44:18 +0000 (20:44 +0100)]
Staging: sep: Move the RAR support into staging where it is supposed to be
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Allyn [Thu, 6 Aug 2009 19:43:59 +0000 (20:43 +0100)]
Staging: sep: Upstream revision 3 of the security processor kernel driver
Upstream revision 3 of the security processor kernel driver;
now located in drivers/staging
This revision adds an initial TODO file
This driver no longer requires to have the firmware compiled in
it with the CONFIG_EXTRA_FIRMWARE configuration option.
Furthermore, we now have the right to distribute the firmware
binaries.
This is the Linux kernel driver for the Security Processor, which is
a hardware device the provides cryptographic, secure storage, and
key management services.
Please be aware that this patch does not contain any encryption
algorithm. It only transports data to and from user space
applications to the security processor.
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Wed, 29 Jul 2009 13:54:11 +0000 (06:54 -0700)]
Staging: pata_rdc: remove the driver from the staging tree
Now that a "real" driver is in the libata tree for this hardware, we need
to remove the staging driver as it is no longer needed.
Cc: Kevin Huang <Kevin.Huang@rdc.com.tw>
Cc: Tomy Wang <Tomy.Wang@rdc.com.tw>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Wed, 29 Jul 2009 00:05:51 +0000 (17:05 -0700)]
Staging: remove epl driver
This is no longer maintained upstream, and no one cares about it at all,
so delete it.
The fact that it is duplicating an existing network driver also is a
good reason to remove it, it's causing nothing but trouble right now.
Cc: Daniel Krueger <daniel.krueger@systec-electronic.com>
Cc: Ronald Sieber <Ronald.Sieber@systec-electronic.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Fri, 11 Sep 2009 16:51:31 +0000 (09:51 -0700)]
Staging: vme: change to VME_BUS
Turns out the m68k arch already has a CONFIG_VME, so use
CONFIG_VME_BUS instead.
Thanks to Geet Uytterhoeven for pointing this out.
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Martyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Martyn Welch [Fri, 28 Aug 2009 10:28:56 +0000 (11:28 +0100)]
Staging: vme: Separate the list of TODOs from the API documentation
This patch moves the API documentation to it's own file and provides a
proper list of TODOs.
Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Martyn Welch [Thu, 27 Aug 2009 16:00:40 +0000 (17:00 +0100)]
Staging: vme: Update support for the Universe II VME driver
This patch starts the reworking of the vme_ca91cx42.c for the VME core. The
driver seems to have only supported the Universe II for a long time, I have no
hardware to check to see if it would work on the Universe I.
This patch is compile tested with minimal run-time testing. It enables basic
support for slave and master windows and interrupts. The master windows have
undergone basic run testing.
Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Martyn Welch [Tue, 11 Aug 2009 16:44:56 +0000 (17:44 +0100)]
Staging: vme: add VME Location Monitor management mechanism
Extend the image and DMA channel resource management methods to control the
location monitor resource. The location monitor should be controlled as it can
only be used at a single location at a time.
Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Martyn Welch [Tue, 11 Aug 2009 15:20:22 +0000 (16:20 +0100)]
Staging: Use proper mutexes in the tsi-148 VME driver
The VME core and tsi-148 driver currently use semaphores as mutexes. Switch to proper
mutex implementation.
Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com>
Reviewed-by: Emilio G. Cota <cota@braap.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Martyn Welch [Tue, 11 Aug 2009 13:37:15 +0000 (14:37 +0100)]
Staging: Update VME vme_user module
* Add ifdef wrapper to vme_user.h
* Correct Initialisation routine
* Add remove routine to correct probe routine
* Remove old test routines
Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Martyn Welch [Tue, 11 Aug 2009 12:50:49 +0000 (13:50 +0100)]
Staging: vme: Add syncronize interrupts before removing callback
As identified by Jiri, there is no syncronisation before callback is removed.
Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com>
Cc: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Emilio G. Cota [Mon, 10 Aug 2009 14:52:42 +0000 (16:52 +0200)]
Staging: vme: fix {master,slave}_get check bug
It's checking the wrong functions; fix it.
Signed-off-by: Emilio G. Cota <cota@braap.org>
Acked-by: Martyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Martyn Welch [Thu, 6 Aug 2009 08:43:07 +0000 (09:43 +0100)]
Staging: vme: Extend VME core probing for special matches
Add the ability to define all slots and current slot in the VME buses bind
table.
Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Martyn Welch [Wed, 5 Aug 2009 16:38:31 +0000 (17:38 +0100)]
Staging: vme: Correct tsi-148 VME interrupt free routine
As identified by Jiri, the VME interrupt free routine removes the service
routine before disabling the interrupt. Re-order operations to be performed in
the reverse of the request routine.
Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com>
Cc: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Martyn Welch [Fri, 31 Jul 2009 13:07:53 +0000 (14:07 +0100)]
Staging: vme: add TODO file
This describes the current vme api, along with a list of things
that needs to be fixed up.
Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Martyn Welch [Fri, 31 Jul 2009 08:28:17 +0000 (09:28 +0100)]
Staging: vme: add Tundra TSI148 VME-PCI Bridge driver
Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Martyn Welch [Fri, 31 Jul 2009 08:28:17 +0000 (09:28 +0100)]
Staging: vme: add Universe I/II bridge driver
Currently this code doesn't compile, so it is disabled.
That should be fixed up...
Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Martyn Welch [Fri, 31 Jul 2009 08:28:17 +0000 (09:28 +0100)]
Staging: vme: add VME userspace driver
Adds a VME userspace access driver
Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Martyn Welch [Fri, 31 Jul 2009 08:28:17 +0000 (09:28 +0100)]
Staging: VME Framework for the Linux Kernel
This framework aims to colelese, extend and improve the VME Linux
drivers found at vmelinux.org, universe2.sourceforge.net and
openfmi.net/frs/?group_id=144. The last 2 drivers appear to be forks of
the original code found at vmelinux.org though have extended the
codebase.
Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roel Kluin [Fri, 7 Aug 2009 22:35:31 +0000 (00:35 +0200)]
Staging: vt6655: fix possible Read buffer overflow
If pDevice->sOpts.nRxDescs{0,1} or nTxDescs[{0,1}] is zero, the loop ends with
i == 0, and we write aRD{0,1}Ring[-1]. apTD{0,1}Rings[-1] respectively.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jim Lieb [Wed, 12 Aug 2009 21:54:16 +0000 (14:54 -0700)]
Staging: vt665x: remove tbit.h part 2
Remove use of tbit macros adn remove header file.
Signed-off-by: Jim Lieb <lieb@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jim Lieb [Wed, 12 Aug 2009 21:54:15 +0000 (14:54 -0700)]
Staging: vt665x: remove tbit.h
Remove use of tbit macros and remove the header file.
Signed-off-by: Jim Lieb <lieb@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jim Lieb [Wed, 12 Aug 2009 21:54:14 +0000 (14:54 -0700)]
Staging: vt665x: cleanup USB definitions
Remove gratuitous macros re-defining usb functions.
One result is to make kcompat.h now identical in both driver dirs
Signed-off-by: Jim Lieb <lieb@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jim Lieb [Wed, 12 Aug 2009 21:54:13 +0000 (14:54 -0700)]
Staging: vt665x: remove tpci.h file in vt6656
Remove tpci.h. It is not even used in the usb version
Minor cleanup of janitor work missed earlier.
Signed-off-by: Jim Lieb <lieb@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jim Lieb [Wed, 12 Aug 2009 21:54:12 +0000 (14:54 -0700)]
Staging: vt665x: remove tpci.h file
Convert pci register/command defs to use kernel definitions.
Remove tpci.h.
Signed-off-by: Jim Lieb <lieb@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jim Lieb [Wed, 12 Aug 2009 21:54:11 +0000 (14:54 -0700)]
Staging: vt665x: Remove umem.h Part 2
Remove references to umem.h macros and refer directly to memcpy
functions. Delete the include file.
Signed-off-by: Jim Lieb <lieb@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jim Lieb [Wed, 12 Aug 2009 21:54:10 +0000 (14:54 -0700)]
Staging: vt665x: Remove umem.h Part 1
Remove references to umem.h macros and refer directly to memcpy
functions. Delete the include file.
Signed-off-by: Jim Lieb <lieb@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jim Lieb [Wed, 12 Aug 2009 21:54:09 +0000 (14:54 -0700)]
Staging: vt665x: Clean up include files, Part 2
Remove cplusplus lines from include files
Remove needless ifdefs on includes to conform with C
conventions. Remove misc commented code/includes
Update TODO
Signed-off-by: Jim Lieb <lieb@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jim Lieb [Wed, 12 Aug 2009 21:54:08 +0000 (14:54 -0700)]
Staging: vt665x: Clean up include files, Part 1
Remove cplusplus lines from include files
Remove needless ifdefs on includes to conform with C
conventions. Remove misc commented code/includes
Update TODO
Signed-off-by: Jim Lieb <lieb@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jim Lieb [Wed, 12 Aug 2009 21:54:07 +0000 (14:54 -0700)]
Staging: vt665x: Typedef and macro cleanup Part 2
Clean up unused typedefs and macros to remove Win32'isms and
misc non-linux constructs. Text edits to referencing
source for less frequently used macros.
Signed-off-by: Jim Lieb <lieb@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jim Lieb [Wed, 12 Aug 2009 21:54:06 +0000 (14:54 -0700)]
Staging: vt665x: Typedef and macro cleanup Part 1
Clean up unused typedefs and macros to remove Win32'isms and
misc non-linux constructs. Text edits to referencing
source for less frequently used macros.
Signed-off-by: Jim Lieb <lieb@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Bartlomiej Zolnierkiewicz [Wed, 12 Aug 2009 21:54:05 +0000 (14:54 -0700)]
Staging: vt6656: add TODO
Cc: Forest Bond <forest@alittletooquiet.net>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Jim Lieb <lieb@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Bartlomiej Zolnierkiewicz [Wed, 12 Aug 2009 21:54:04 +0000 (14:54 -0700)]
Staging: vt6655: add TODO
Cc: Forest Bond <forest@alittletooquiet.net>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Jim Lieb <lieb@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jim Lieb [Wed, 12 Aug 2009 21:54:03 +0000 (14:54 -0700)]
Staging: vt665x: Text janitor in prep for driver merge, part 2
Text only changes to remove textual differences between the vt6655
and vt6656 trees in prep for driver merge.
Signed-off-by: Jim Lieb <lieb@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jim Lieb [Thu, 30 Jul 2009 17:30:32 +0000 (10:30 -0700)]
Staging: vt665x: Text janitor in prep for driver merge
These changes in vt6656 match changes in vt6655 to minimize text differences
prior to merging the two trees into a single driver source.
Signed-off-by: Jim Lieb <lieb@canonical.com>
Cc: Forest Bond <forest@alittletooquiet.net>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jim Lieb [Thu, 30 Jul 2009 17:27:21 +0000 (10:27 -0700)]
Staging: vt6655 textual cleanup in prep for driver merge
The vt6655 and vt6656 drivers are from a common origin but
have drifted apart with minor textual differences. There
are two changes:
s/DEVICE_PRT/DBG_PRT/g
and
s/byPktTyp/byPktType/g
This significantly reduces the differences between the two file sets
in preparation to merging the common code. A few whitespace and text bits were
also adjusted.
Signed-off-by: Jim Lieb <lieb@canonical.com>
Cc: Forest Bond <forest@alittletooquiet.net>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jim Lieb [Fri, 24 Jul 2009 00:22:42 +0000 (17:22 -0700)]
Staging: vt665x: 64bit compile fixes Part 2
Fix compile problems with 64bit. These issues could cause corrupted
address crashes. Cleanup definition use to use more portable kernel
typedefs etc.
Signed-off-by: Jim Lieb <lieb@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jim Lieb [Fri, 24 Jul 2009 00:20:49 +0000 (17:20 -0700)]
Staging: vt665x: 64bit compile fixes Part 1
Fix compile problems with 64bit. These issues could cause corrupted
address crashes. In the process, replaced some definitions to use more
portable kernel types.
Signed-off-by: Jim Lieb <lieb@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jaswinder Singh Rajput [Fri, 14 Aug 2009 06:24:37 +0000 (11:54 +0530)]
Staging: otus: includecheck fix: drivers/staging/otus/usbdrv.h
fix the following 'make includecheck' warning:
drivers/staging/otus/usbdrv.h: linux/usb.h is included more than once.
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Bill Pemberton [Thu, 6 Aug 2009 19:22:01 +0000 (15:22 -0400)]
Staging: serqt_usb2: fix qt_open parameters
The parameter list for qt_open() was from the old non usb-serial
driver.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Randy Dunlap [Thu, 6 Aug 2009 23:09:35 +0000 (16:09 -0700)]
Staging: udlfb: fix printk format warning
Fix printk format warning: use %td for ptrdiff:
drivers/staging/udlfb/udlfb.h:209: warning: format '%d' expects type 'int', but argument 3 has type 'long int'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alexander Beregalov [Thu, 6 Aug 2009 23:09:34 +0000 (16:09 -0700)]
Staging: rt2860: remove dependency on WIRELESS_EXT version
As the driver is in mainline now we can remove such dependencies.
WIRELESS_EXT is 22 now.
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike Galbraith [Fri, 31 Jul 2009 05:52:58 +0000 (07:52 +0200)]
Staging: rt2870sta interface names
The rest of the known universe prefers wlanN for wireless interface names, to
the point that some distro configuration tools, such as opensuse's Yast, don't
even allow the user to enter a name, and simply pre-select "wlan".
Signed-off-by: Mike Galbraith <efault@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Julia Lawall [Tue, 28 Jul 2009 15:52:56 +0000 (17:52 +0200)]
Staging: dst: correct error-handling code
dst_state_alloc returns an ERR_PTR value in an error case instead of NULL.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@match exists@
expression x, E;
statement S1, S2;
@@
x = dst_state_alloc(...)
... when != x = E
(
* if (x == NULL || ...) S1 else S2
|
* if (x == NULL && ...) S1 else S2
)
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Stoyan Gaydarov [Wed, 22 Jul 2009 03:02:27 +0000 (22:02 -0500)]
Staging: ARRAY_SIZE changes
These changes were a direct result of using a semantic patch
More information can be found at http://www.emn.fr/x-info/coccinelle/
Signed-off-by: Stoyan Gaydarov <sgayda2@uiuc.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Julia Lawall [Mon, 27 Jul 2009 19:59:48 +0000 (21:59 +0200)]
Staging: Correct use of ! and &
Correct priority problem in the use of ! and &.
The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@ expression E; constant C; @@
- !E & C
+ !(E & C)
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Uwe Kleine-König [Thu, 23 Jul 2009 06:33:56 +0000 (08:33 +0200)]
Staging: fix typos "man[ae]g?ment" -> "management"
This patch was generated by running
git grep -E -l 'man[ae]g?ment' drivers/staging | xargs -r perl -p -i -e 's/\bman[ae]g?ment\b/management/g'
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Shan Wei [Fri, 24 Jul 2009 08:57:35 +0000 (16:57 +0800)]
Staging: usb-ip: vhci_hdc:Fix the returned error value
Compared with other drivers, the "ret" should be nagative and
returned. But in vhci_hdc, it always return 0;
I dont't use the driver, and I'm not familiar with the code.
Hope the patch is helpful.
Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Felipe Balbi [Tue, 21 Jul 2009 12:52:26 +0000 (15:52 +0300)]
Staging: cpc-usb: add one todo entry
we need to get rid of those driver-specific error codes
Signed-off-by: Felipe Balbi <me@felipebalbi.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Felipe Balbi [Tue, 21 Jul 2009 12:52:25 +0000 (15:52 +0300)]
Staging: cpc-usb: convert comment style in cpcusb.h
Signed-off-by: Felipe Balbi <me@felipebalbi.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Felipe Balbi [Tue, 21 Jul 2009 12:52:24 +0000 (15:52 +0300)]
Staging: cpc-usb: convert comment style in cpc_int.h
Signed-off-by: Felipe Balbi <me@felipebalbi.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Felipe Balbi [Tue, 21 Jul 2009 14:35:50 +0000 (17:35 +0300)]
Staging: cpc-usb: convert comment style in cpc.h
Signed-off-by: Felipe Balbi <me@felipebalbi.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brian G. Merrell [Tue, 21 Jul 2009 06:46:13 +0000 (00:46 -0600)]
Staging: USB-IP code cleanup
This includes fixes for all of the legit checkpatch.pl errors and
warnings. I have also included several of the suggestions from the
linux-kernel mailing list when the USB-IP code was first added.
Signed-off-by: Brian G. Merrell <bgmerrell@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Julia Lawall [Sat, 18 Jul 2009 15:25:30 +0000 (17:25 +0200)]
Staging: meilhaus: convert nested spin_lock_irqsave to spin_lock
If spin_lock_irqsave is called twice in a row with the same second
argument, the interrupt state at the point of the second call overwrites
the value saved by the first call. Indeed, the second call does not need
to save the interrupt state, so it is changed to a simple spin_lock.
The semantic match that finds this problem is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@
expression lock1,lock2;
expression flags;
@@
*spin_lock_irqsave(lock1,flags)
... when != flags
*spin_lock_irqsave(lock2,flags)
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Cc: David Kiliani <mail@davidkiliani.de>
Cc: Meilhaus Support <support@meilhaus.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pavel Machek [Sat, 8 Aug 2009 13:40:50 +0000 (15:40 +0200)]
Staging: dream: Synaptics touchscreen: check that smbus is available
Check that SMBUS APIs are available in touchscreen driver.
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Arve Hjønnevåg [Sat, 8 Aug 2009 13:03:15 +0000 (15:03 +0200)]
Staging: dream: add support for input on GPIO pins
Support for input devices connected to GPIO pins. This adds support
for HTC Dream's keyboard and its trackball. Generic support already
exists for keyboard on GPIO, but this one is more advanced because it
can detect shadow key presses (and actually works with Dream :-).
(It also contains Kconfig/Makefile changes, including some that were
missing from previous commit. Sorry.)
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pavel Machek [Sat, 8 Aug 2009 12:27:02 +0000 (14:27 +0200)]
Staging: Dream: separate Kconfig/Makefile into subdirectory
Separate Kconfig/Makefile glue from dream into subdirectory. I plan to
add few more drivers, and changing staging/Makefile each time sounds
like inviting conflicts.
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jiri Slaby [Sat, 8 Aug 2009 09:33:58 +0000 (11:33 +0200)]
Staging: dream, fix buf overflow
In vfe_send_msg_no_payload there is a wrong struct vfe_message allocation.
It allocates only sizeof(pointer to vfe_message) for a whole structure.
Add a dereference to the sizeof to allocate sizeof(vfe_message).
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pavel Machek [Tue, 4 Aug 2009 22:00:10 +0000 (00:00 +0200)]
Staging: dream: synaptics touchscreen for dream: documentation
This adds pointer to hardware documentation, and adds code comment
from Arve.
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pavel Machek [Tue, 21 Jul 2009 10:04:26 +0000 (12:04 +0200)]
Staging: HTC Dream: touchscreen: more cleanups
This separates coefficient computation into separate function, so that
main probe does not have 1001 variables, and is of a more reasonable
size.
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Cc: Arve Hjønnevåg <arve@android.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pavel Machek [Mon, 20 Jul 2009 21:59:11 +0000 (23:59 +0200)]
Staging: HTC Dream: Cleanup Dream touchscreen driver
This is first part of touchscreen cleanups. I did not remove
earlysuspend functionality for now (to help Google merge the changes).
I mainly introduced helpers to reduce code duplication, and split huge
functions into smaller ones.
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Cc: Arve Hjønnevåg <arve@android.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Arve Hjønnevåg [Mon, 20 Jul 2009 10:53:40 +0000 (12:53 +0200)]
Staging: HTC Dream: touchscreen driver for staging
This adds support for synaptic touchscreen, used in HTC dream
cellphone.
This is original version from Arve, fixed only to compile; I do have
cleaner version, but I broken something inside, and this will preserve
authorship better. I originally tried to push the driver directly to
input/touchscreen, but the driver has some issues with interrupt
handling that are more difficult to fix than I expected at first.
Signed-off-by: Arve Hjønnevåg <arve@android.com>
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Pavel Machek [Tue, 21 Jul 2009 10:38:46 +0000 (12:38 +0200)]
Staging: htc: Dream: limit Kconfig for only MSM platforms
Limit SMD communication glue to MSM platform. It is closely tied to
MSM architecture.
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Mon, 14 Sep 2009 21:34:20 +0000 (14:34 -0700)]
Staging: hv: update the TODO file
Remove a few items that have already been resolved.
There are only a few checkpatch issues, they need to be resolved
by larger code logic changes that are not "simple" changes.
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Bill Pemberton [Sat, 12 Sep 2009 01:46:46 +0000 (21:46 -0400)]
Staging: hv: Remove List.h
List.h is no longer used and can be removed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Bill Pemberton [Sat, 12 Sep 2009 01:46:45 +0000 (21:46 -0400)]
Staging: hv: remove use of internal list routines in RndisFilter
The hv driver has it's own linked list routines. This removes them
from RndisFilter.c
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Bill Pemberton [Sat, 12 Sep 2009 01:46:44 +0000 (21:46 -0400)]
Staging: hv: remove more usages of internal list routines
The hv driver has it's own linked list routines. This removes them
from more places in hv.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Bill Pemberton [Sat, 12 Sep 2009 01:46:43 +0000 (21:46 -0400)]
Staging: hv: remove use of internal list routines in NetVsc
The hv driver has it's own linked list routines. This removes them
from NetVsc and uses the kernels routines instead.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Haiyang Zhang [Tue, 8 Sep 2009 20:12:55 +0000 (20:12 +0000)]
Staging: hv: Add Haiyang's email to the TODO file
Add Haiyang's email to the TODO file.
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Wed, 2 Sep 2009 18:53:59 +0000 (11:53 -0700)]
Staging: hv: remove function pointer typedefs from vmbus.h
It's amazing the hoops that people go through to make code work
when they don't opensource the whole thing. Passing these types
of function pointers around for no good reason is a mess, this needs
to be unwound as everything is now in the open.
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Wed, 2 Sep 2009 18:44:19 +0000 (11:44 -0700)]
Staging: hv: remove PFN_CHANNEL_CALLBACK
Come on people, it doesn't get simpler than this, why
have a typedef for something so tiny...
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Wed, 2 Sep 2009 18:28:55 +0000 (11:28 -0700)]
Staging: hv: remove function pointer typedefs from StorVscApi.h
function pointer typedefs are allowed in the kernel, but only if they
make sense, which they really do not here, as they are not passed around
with any kind of frequency. So just spell them all out, it makes the
code smaller and easier to understand overall.
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Wed, 2 Sep 2009 18:24:48 +0000 (11:24 -0700)]
Staging: hv: remove function pointer typedefs from NetVscApi.h
function pointer typedefs are allowed in the kernel, but only if they
make sense, which they really do not here, as they are not passed around
with any kind of frequency. So just spell them all out, it makes the
code smaller and easier to understand overall.
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>