OSDN Git Service
Jason Cooper [Thu, 30 Sep 2010 19:15:39 +0000 (15:15 -0400)]
staging: brcm80211: fix checkpatch error 'assignment in if condition'
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Henry Ptasinski <henryp@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jason Cooper [Thu, 30 Sep 2010 19:15:38 +0000 (15:15 -0400)]
staging: brcm80211: fix checkpatch error 'assignment in if condition'
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Henry Ptasinski <henryp@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jason Cooper [Thu, 30 Sep 2010 19:15:37 +0000 (15:15 -0400)]
staging: brcm80211: fix checkpatch error 'assignment in if condition'
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Henry Ptasinski <henryp@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jason Cooper [Thu, 30 Sep 2010 19:15:36 +0000 (15:15 -0400)]
staging: brcm80211: fix checkpatch error 'assignment in if condition'
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Henry Ptasinski <henryp@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jason Cooper [Thu, 30 Sep 2010 19:15:35 +0000 (15:15 -0400)]
staging: brcm80211: fix checkpatch errors 'assignment in if condition'
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Henry Ptasinski <henryp@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jason Cooper [Thu, 30 Sep 2010 19:15:34 +0000 (15:15 -0400)]
staging: brcm80211: fix checkpatch error 'assignment in if condition'
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Henry Ptasinski <henryp@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jason Cooper [Thu, 30 Sep 2010 19:15:33 +0000 (15:15 -0400)]
staging: brcm80211: fix checkpatch error 'assignment in if condition'
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Henry Ptasinski <henryp@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Arnd Bergmann [Mon, 4 Oct 2010 20:55:57 +0000 (22:55 +0200)]
smbfs: move to drivers/staging
smbfs has been scheduled for removal in 2.6.27, so
maybe we can now move it to drivers/staging on the
way out.
smbfs still uses the big kernel lock and nobody
is going to fix that, so we should be getting
rid of it soon.
This removes the 32 bit compat mount and ioctl
handling code, which is implemented in common fs
code, and moves all smbfs related files into
drivers/staging/smbfs.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Tue, 5 Oct 2010 16:06:00 +0000 (09:06 -0700)]
Staging: autofs3: create TODO file
This lists what's going to happen to the filesystem (i.e. removal
in 2.6.38 unless someone steps up to maintain it.)
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Arnd Bergmann [Mon, 4 Oct 2010 20:28:10 +0000 (22:28 +0200)]
autofs3: move to drivers/staging
Nobody appears to be interested in fixing autofs3 bugs
any more and it uses the BKL, which is going away.
Move this to staging for retirement. Unless someone
complains until 2.6.38, we can remove it for good.
The include/linux/auto_fs.h header file is still used
by autofs4, so it remains in place.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Ian Kent <raven@themaw.net>
Cc: autofs@linux.kernel.org
Cc: "H. Peter Anvin" <hpa@zytor.com>
Acked-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Fernando Guzman Lugo [Fri, 1 Oct 2010 02:12:48 +0000 (21:12 -0500)]
staging: tidspbridge: replace iommu custom for opensource implementation
Now the tidspbridge uses the API's from
iovmm module.
Signed-off-by: Fernando Guzman Lugo <x0095840@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ernesto Ramos [Thu, 30 Sep 2010 18:49:36 +0000 (13:49 -0500)]
staging: ti dspbridge: disable all peripherals at bridge_brd_stop
DSP Bridge needs to disable the peripheral clocks when switches to
BRD_STOPPED since that would prevent the domain to enter in OFF state.
Signed-off-by: Ernesto Ramos <ernesto@ti.com>
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ernesto Ramos [Thu, 30 Sep 2010 18:34:13 +0000 (13:34 -0500)]
staging: ti dspbridge: Replace find_lcm with lcm kernel func
Resendig this patch since it was missed in the last merge...
Remove find_lcm within nldr.c and use standard
kernel function lcm().
Signed-off-by: Ernesto Ramos <ernesto@ti.com>
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ernesto Ramos [Thu, 30 Sep 2010 18:33:41 +0000 (13:33 -0500)]
staging: ti dspbridge: remove cmm_xlator_delete wrapper
Resending this patch since it was missed in the last merge...
Remove unnecessary cmm_xlator_delete function and use
kfree() kernel function directly.
Signed-off-by: Ernesto Ramos <ernesto@ti.com>
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Arnd Bergmann [Thu, 30 Sep 2010 08:24:12 +0000 (10:24 +0200)]
staging/bcm: add sparse annotations
This marks up the code where sparse complains in most cases.
Most of the changes are in the ioctl handling code, which
gets __user annotations, finding one unchecked user access.
The rest is mostly about marking functions static when they
are only used in one file.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Arnd Bergmann [Thu, 30 Sep 2010 08:24:11 +0000 (10:24 +0200)]
staging/bcm: fix most build warnings
This removes all warnings I get on a 64 bit build except
for those that look unfixable, where we convert a pointer
to a 32 bit integer and change its byte order!
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Arnd Bergmann [Thu, 30 Sep 2010 08:24:10 +0000 (10:24 +0200)]
staging/ft1000-usb: fix problems found by sparse
In the original code, address space annotations are missing,
which hides a possible unchecked user pointer access.
Two functions use a lot of stack space.
Extern declarations are all in the wrong place, which leads
to type differences between caller and callee in some cases.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Arnd Bergmann [Thu, 30 Sep 2010 08:24:09 +0000 (10:24 +0200)]
staging/ft1000-usb: fix build warnings
This lets us see clearer when stuff breaks.
Most of the changes are fixes for casts between int and pointer
that don't work on 64 bit.
The ioctl function uses a large amount of stack, which gets
fixed by allocating the buffer dynamically.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Arnd Bergmann [Thu, 30 Sep 2010 08:24:08 +0000 (10:24 +0200)]
staging/ft1000-usb: fix unlocked_ioctl prototype
unlocked_ioctl has a "long" return type.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Arnd Bergmann [Thu, 30 Sep 2010 08:24:07 +0000 (10:24 +0200)]
staging: make new character devices nonseekable
As a preparation for changing the default behaviour of llseek to no_llseek,
every file_operations structure should have a .llseek operation.
There are three new instances in staging now, which can all be changed
into no_llseek explicitly since the devices do not need to seek.
Add nonseekable_open where appropriate, to prevent pread/pwrite as well.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Luis R. Rodriguez [Fri, 1 Oct 2010 23:16:34 +0000 (16:16 -0700)]
staging: remove the Atheros otus vendor driver
Atheros originally had posted a vendor driver to support
the Atheros AR9170 devices, the driver was called otus [1].
The otus driver was staging quality but it, along with
other chipset documentation helped the community do a rewrite
for a proper driver. Johannes Berg did the ar9170 [2] work and
Christian Lamparter then followed up with some final touches
for inclusion upstream.
The original goal behind ar9170 was to match all functionality,
performance, stability and quality against Otus. In the end this
proved quite challenging even with GPLv2 firmware.
Christian then decided to work on a replacement driver with
new enhancements to the GPLv2 firmware. It took 1 year, 5 months,
9 days since this merge of ar9170usb upstream to release carl9170
with upstream inclusion intentions but its now there.
We remove the Otus driver now as the carl9170 driver actually
ends up not only replacing but superseding the staging Otus driver!
http://wireless.kernel.org/en/users/Drivers/otus
http://wireless.kernel.org/en/users/Drivers/ar9170
http://wireless.kernel.org/en/users/Drivers/carl9170
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Maurice Dawson [Tue, 28 Sep 2010 16:35:53 +0000 (17:35 +0100)]
Staging: comedi: fix EXPORT SYMBOL coding style issue in ni_labpc.c
This is a patch to the ni_labpc.c file that fixes up, EXPORT SYMBOL(foo)
should immediately follow its function/variable warnings, found by the
checkpatch.pl tool
Signed-off-by: Maurice Dawson <mauricedawson2699@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Thu, 30 Sep 2010 00:11:11 +0000 (17:11 -0700)]
staging: brcm80211: Fix debug section mismatch warning
wl_remove() is now called from places other than the .remove field of struct pci_driver so
do not annotate wl_remove() with __devexit. This removes the debug section mismatch warning
introduced by the previous nonexistant firmware patch.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Nohee Ko [Wed, 29 Sep 2010 22:56:49 +0000 (15:56 -0700)]
staging: brcm80211: fix #ifdef BRCM_FULLMAC mess
This patch fixes "#ifdef BRCM_FULLMAC" mess which shows
in siutils.c/hndpmu.c.
All unnecessary #ifdefs were erased.
Also as a part of this work, bcmutils.c was also modified.
Signed-off-by: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Henry Ptasinski [Wed, 29 Sep 2010 21:50:49 +0000 (14:50 -0700)]
staging: brcm80211: Remove unneeded compile flags.
This removes compile flags that are completely unnecessary when building the
brcmfmac driver.
Also sorts the options to make it a bit easier to look at them.
Signed-off-by: Henry Ptasinski <henryp@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Wed, 29 Sep 2010 18:42:47 +0000 (11:42 -0700)]
staging: brcm80211: cleanup headers
Trim down bcmip.h to only whats needed, purge the rest.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Wed, 29 Sep 2010 18:41:56 +0000 (11:41 -0700)]
staging: brcm80211: cleanup headers
Purge unused and extraneous header, brcm80211/include/proto/802.11e.h
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Wed, 29 Sep 2010 00:35:39 +0000 (17:35 -0700)]
staging: brcm80211: delete unused/obsolete code
Delete unused attempt to debug through /proc.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Tue, 28 Sep 2010 18:34:44 +0000 (11:34 -0700)]
staging: brcm80211: handle missing firmware better
Handle non-extistent firmware more gracefully.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Thu, 30 Sep 2010 11:34:26 +0000 (04:34 -0700)]
Staging: keucr: fix compiler warning
Now that we aren't using the rc_lock variable, delete it to keep gcc
happy and not complaining about it.
Cc: Al Cho <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Al Cho [Fri, 24 Sep 2010 10:50:11 +0000 (18:50 +0800)]
staging: keucr: fix keucr lost disconnect in transport
The other part of keucr lost usb disconnect.
Unplug SDcard after thread scan,the wrong rule in usb_stor_port_reset,
so the driver still fail in stress test.
Signed-off-by: Al Cho <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Arthur Benilov [Fri, 24 Sep 2010 17:26:13 +0000 (19:26 +0200)]
Staging: vme: Assure D16 cycle if required in master_read and master_write
From
a95892fc2246d6dc45f57b7dd68f32b9b28bd0f7 Mon Sep 17 00:00:00 2001
From: Arthur Benilov <arthur.benilov@gmail.com>
Date: Fri, 24 Sep 2010 13:51:07 +0200
Subject: [PATCH] Staging: vme: Assure D16 cycle if required in master_read and master_write
memcpy_fromio() and memcpy_toio() functions apply internally to __memcpy() that
performs data transfer in 32-bits or 8-bits blocks (at least on x86). This makes
impossible to perform D16 cycle with ca91cx42 bridge. Provided modification
assures performing data transfer with 32, 16, and 8 bits chunks.
Signed-off-by: Arthur Benilov <arthur.benilov@iba-group.com>
Signed-off-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Phillip Kurtenbach [Sat, 25 Sep 2010 23:11:09 +0000 (01:11 +0200)]
staging: iio: whitespace cleanup
Fixed whitespace coding style issues.
Signed-off-by: Phillip Kurtenbach <pkurtenbach@gmail.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Vasiliy Kulikov [Tue, 28 Sep 2010 17:08:08 +0000 (21:08 +0400)]
staging: slicoss: use free_netdev(netdev) instead of kfree()
Freeing netdev without free_netdev() leads to net, tx leaks.
I might lead to dereferencing freed pointer.
The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)
@@
struct net_device* dev;
@@
-kfree(dev)
+free_netdev(dev)
Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
Acked-by: Denis Kirjanov <dkirjanov@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Vasiliy Kulikov [Tue, 28 Sep 2010 17:08:01 +0000 (21:08 +0400)]
staging: octeon: use free_netdev(netdev) instead of kfree()
It is not guaranteed that free_netdev() is macro.
Freeing netdev without free_netdev() leads to net, tx leaks.
I might lead to dereferencing freed pointer.
Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
Acked-by: David Daney <ddaney@caviumnetworks.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Vasiliy Kulikov [Tue, 28 Sep 2010 17:07:55 +0000 (21:07 +0400)]
staging: ath6kl: use free_netdev(netdev) instead of kfree()
It is not guaranteed that free_netdev() is macro.
Freeing netdev without free_netdev() leads to net, tx leaks.
I might lead to dereferencing freed pointer.
Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Vasiliy Kulikov [Tue, 28 Sep 2010 17:08:04 +0000 (21:08 +0400)]
staging: otus: use free_netdev(netdev) instead of kfree()
Freeing netdev without free_netdev() leads to net, tx leaks.
I might lead to dereferencing freed pointer.
The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)
@@
struct net_device* dev;
@@
-kfree(dev)
+free_netdev(dev)
Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Vasiliy Kulikov [Tue, 28 Sep 2010 17:08:11 +0000 (21:08 +0400)]
staging: wlags49_h2: use free_netdev(netdev) instead of kfree()
Freeing netdev without free_netdev() leads to net, tx leaks.
I might lead to dereferencing freed pointer.
The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)
@@
struct net_device* dev;
@@
-kfree(dev)
+free_netdev(dev)
Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Vasiliy Kulikov [Tue, 28 Sep 2010 17:49:35 +0000 (21:49 +0400)]
staging: ft1000: fix skb, netdev, memory leaks
ft1000_copy_up_pkt() doesn't free skb on errors.
init_ft1000_card() doesn't free netdev with free_netdev() but with kfree().
init_ft1000_card() doesn't check request_region()'s return value
and doesn't free region on error.
Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Fri, 24 Sep 2010 09:40:01 +0000 (18:40 +0900)]
Staging: rtl8192e: Convert macros to inline functions
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Fri, 24 Sep 2010 09:39:50 +0000 (18:39 +0900)]
Staging: rtl8192e: Clean formatting in rtl8192_hard_start_xmit()
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Fri, 24 Sep 2010 09:39:41 +0000 (18:39 +0900)]
Staging: rtl8192e: Clean up rtl8192_pci_initdescring()
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Fri, 24 Sep 2010 09:39:31 +0000 (18:39 +0900)]
Staging: rtl8192e: Clean formatting in rtl8192_tx()
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Fri, 24 Sep 2010 09:39:18 +0000 (18:39 +0900)]
Staging: rtl8192e: Remove dead code from rtl8192_tx
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Fri, 24 Sep 2010 09:39:09 +0000 (18:39 +0900)]
Staging: rtl8192e: Clean up rtl8192_halt_adapter()
Remove dead code, fix whitespace, clean comments
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Fri, 24 Sep 2010 09:38:59 +0000 (18:38 +0900)]
Staging: rtl8192e: Clean up rtl8192_qos_association_resp()
Fix whitespace, remove dead code.
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Fri, 24 Sep 2010 09:38:51 +0000 (18:38 +0900)]
Staging: rtl8192e: Delete some dead code
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Fri, 24 Sep 2010 09:38:41 +0000 (18:38 +0900)]
Staging: rtl8192e: Clean up formatting in MapHwQueueToFirmwareQueue()
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Fri, 24 Sep 2010 09:38:23 +0000 (18:38 +0900)]
Staging: rtl8192e: Clean up rtl8192_net_update()
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
David Cross [Fri, 24 Sep 2010 00:24:45 +0000 (17:24 -0700)]
Staging: west bridge, removal of " " before ";"
This patch fixes removes all of the the " ;"'s in the west bridge driver
and instead replaces them with ";" only. Although this is a large patch,
this is the only thing that it does. I can break it up on a file basis
if needed.
Signed-off-by: David Cross <david.cross@cypress.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
David Cross [Fri, 24 Sep 2010 00:20:00 +0000 (17:20 -0700)]
Staging: west bridge, cyasgadget fix for usb_gadget_probe_driver
This patch fixes the west bridge cyasgadget driver in order to allow for
compilation against the linux-next tree. This changes
usb_gadget_register_driver to usb_gadget_probe_driver and updates this
function based on the new function definition (bind call).
Signed-off-by: David Cross <david.cross@cypress.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Thu, 30 Sep 2010 01:07:31 +0000 (18:07 -0700)]
Staging: brcm80211: remove Module.symvers file from the tree
This shouldn't have been in the tree, it's generated by the build, so
remove it.
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Andres Salomon [Sun, 26 Sep 2010 02:06:30 +0000 (19:06 -0700)]
staging: olpc_dcon: drop old VT switch code, watch for CONBLANK event
Eons ago, in a galaxy far far away, Jordan committed code to work around
the fact that X might have put the DCON to sleep and then crashed (in that
galaxy, X crashed a lot; crazy, right?)
This code was based on a custom API. These days, we have code which watches
for FB unblanks, and should perform the same function.. Therefore, the older
code can be dropped. We should probably be watching for CONBLANK events to,
so allow those to turn the DCON back on.
Dropping the old code is necessary for building the driver.
Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Andres Salomon [Sun, 26 Sep 2010 02:05:50 +0000 (19:05 -0700)]
staging: olpc_dcon: add people to the Cc list
Some additional folks requested to be Cc'd for OLPC-DCON changes; add them
to the TODO file.
Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Andres Salomon [Sat, 25 Sep 2010 06:50:16 +0000 (23:50 -0700)]
staging: olpc_dcon: remove outdated backlight comment
This comment about killing power to the backlight is ancient, and incorrect
(the code that follows actually does the opposite of what the comment says).
This was due to hardware changes; the comment was for the original OLPC GX2
boards, but when the OLPC LX boards came out, the code was updated for that
hardware.
Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Andres Salomon [Sat, 25 Sep 2010 06:48:34 +0000 (23:48 -0700)]
staging: olpc_dcon: add TODO file
Add and populate a TODO file for the olpc_dcon driver.
Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Andres Salomon [Sat, 25 Sep 2010 02:14:38 +0000 (19:14 -0700)]
staging: olpc_dcon: drop XO-1.5 support for now
The vx855 stuff isn't upstream yet; for now, drop support for XO-1.5.
This will come back once the 1.5 code is in place (and will be in a form
that allows both 1.0 and 1.5 support to be compiled in at the same time),
but for now just remove it. This is necessary to get the driver building.
Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Andres Salomon [Sat, 25 Sep 2010 02:14:09 +0000 (19:14 -0700)]
staging: olpc_dcon: switch back to using olpc_board(0xXX)
...Rather than macros that don't exist. Necessary for building the
driver.
Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Andres Salomon [Sat, 25 Sep 2010 02:13:42 +0000 (19:13 -0700)]
staging: olpc_dcon: add OLPC display controller (DCON) support
This adds DCON support for the OLPC XO. The DCON is found in XO-1 and
XO-1.5 hardware. The XO-1 has a CS5536 southbridge, while the XO-1.5
has a Via chipset; the GPIO magic that's necessary to communicate with
the DCON chip is unfortunately different across both platforms. This
driver supports both.
This driver is in bad state atm, so I'm requesting its inclusion into
staging so it can be cleaned up while staying in the kernel tree.
Original driver by Dave Woodhouse, and modified extensively by
Jordan Crouse, myself, Deepak Saxena, Paul Fox, Daniel Drake, and
probably others that I've missed.
Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Justin P. Mattock [Sat, 25 Sep 2010 00:08:56 +0000 (17:08 -0700)]
staging: update web addresses in staging
The below patch, is a simple fix to a broken web address not using a period in it's
name.
Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Henry Ptasinski [Sun, 26 Sep 2010 20:19:44 +0000 (13:19 -0700)]
staging: brcm80211: Make compiling of brcm80211.ko and brcmfmac.ko mutually exclusive.
Temporary fix until utils get cleaned up.
Signed-off-by: Henry Ptasinski <henryp@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Henry Ptasinski [Sun, 26 Sep 2010 20:18:38 +0000 (13:18 -0700)]
staging: brcm80211: Fix compile issue when BRCM80211_PCI is not set.
Signed-off-by: Henry Ptasinski <henryp@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Thu, 23 Sep 2010 23:36:06 +0000 (16:36 -0700)]
Staging: brcm80211: remove driver specific -W options
A single driver shouldn't be overriding the kernel-wide -W options.
This removes them from the Makefile.
Bonus is that the code at least now will build on a 64bit platform.
Problem is that both drivers can't be built at the same time right now
or bad things happen when linking.
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Cc: jason <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Thu, 23 Sep 2010 23:28:53 +0000 (16:28 -0700)]
Staging: brcm80211: clean up makefile cflag lines
Change to use the proper ccflags-y option, as well as splitting the
options out one-per-line so that we can see what is needed to be cleaned
up and removed over time.
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Cc: jason <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Wed, 22 Sep 2010 19:17:16 +0000 (12:17 -0700)]
Staging: ft1000: mark pcmcia driver broken
The driver hasn't been updated since the .30 kernel release and will
not build due to pcmcia api changes. Mark it broken for now so no
one hits it in their build accidentally.
Cc: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Wed, 22 Sep 2010 15:35:42 +0000 (08:35 -0700)]
Staging: ft1000: fix mode of firmware image file
It should not be executable.
Cc: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Wed, 22 Sep 2010 15:34:49 +0000 (08:34 -0700)]
Staging: ft1000: remove trailing whitespace
Lots of trailing whitespace was removed
Cc: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Wed, 22 Sep 2010 15:24:41 +0000 (08:24 -0700)]
Staging: ft1000: fix build
This fixes the build for the ft100-usb driver so it builds
properly.
Cc: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Wed, 22 Sep 2010 05:56:27 +0000 (07:56 +0200)]
Staging: Add support for Flarion OFDM usb and pcmcia devices.
This drivers add support for following devices:
(usb)-> Qleadtek FLASH-OFDM USB Modem [LR7F04]
-> Qleadtek Express Card
-> Leadtek Multi-band modem HSDPA
Sources for usb:
https://sourceforge.net/projects/ft1000/files/ft1000_usb/ft1000_usb_v01.04.tar.gz/download
(pcmcia) -> Multimedia Net Card
Sources for pcmcia :
https://sourceforge.net/projects/ft1000/files/ft1000_pcmcia_2.6.30-2.6.31.tgz/download
More informations (in Slovak language):
http://ft1000.qintec.sk/home.html
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Tue, 21 Sep 2010 23:58:00 +0000 (16:58 -0700)]
Staging: line6: minor coding style cleanups
This fixes up all of the remaining coding style issues that
make any sense to make in the line6 driver.
Cc: Markus Grabner <grabner@icg.tugraz.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Tue, 21 Sep 2010 23:18:13 +0000 (16:18 -0700)]
staging: line6: remove unneeded EXPORT_SYMBOL() usage
These symbols don't need to be exported as nothing uses them, so don't.
Cc: Markus Grabner <grabner@icg.tugraz.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Tue, 21 Sep 2010 18:03:41 +0000 (11:03 -0700)]
Staging: keucr: prevent the driver from being built as a module.
As there are symbols that conflict with the in-kernel usb-storage
module, we can't build this into the kernel.
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Al Cho <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Max Vozeler [Tue, 21 Sep 2010 15:43:30 +0000 (17:43 +0200)]
staging: usbip: Process event flags without delay
The way the event handler works can cause it to delay
events until eventual wakeup for another event.
For example, on device detach (vhci):
- Write to sysfs detach file
-> usbip_event_add(VDEV_EVENT_DOWN)
-> wakeup()
#define VDEV_EVENT_DOWN (USBIP_EH_SHUTDOWN | USBIP_EH_RESET).
- Event thread wakes up and passes the event to
event_handler() to process.
- It processes and clears the USBIP_EH_SHUTDOWN
flag then returns.
- The outer event loop (event_handler_loop()) calls
wait_event_interruptible().
The processing of the second flag which is part of
VDEV_EVENT_DOWN (USBIP_EH_RESET) did not happen yet.
It is delayed until the next event.
This means the ->reset callback may not happen for
a long time (if ever), leaving the usbip port in a
weird state which prevents its reuse.
This patch changes the handler to process all flags
before waiting for another wakeup.
I have verified this change to fix a problem which
prevented reattach of a usbip device. It also helps
for socket errors which missed the RESET as well.
The delayed event processing also affects the stub
side of usbip and the error handling there.
Signed-off-by: Max Vozeler <mvz@vozeler.com>
Reported-by: Marco Lancione <marco@optikam.com>
Tested-by: Luc Jalbert <ljalbert@optikam.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Max Vozeler [Tue, 21 Sep 2010 15:31:40 +0000 (17:31 +0200)]
staging: usbip: Notify usb core of port status changes
This patch changes vhci to behave like dummy and
other hcds when disconnecting a device.
Previously detaching a device from the root hub
did not notify the usb core of the disconnect and
left the device visible.
Signed-off-by: Max Vozeler <mvz@vozeler.com>
Reported-by: Marco Lancione <marco@optikam.com>
Tested-by: Luc Jalbert <ljalbert@optikam.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Mon, 20 Sep 2010 14:12:50 +0000 (23:12 +0900)]
staging: rtl8192e: Clean up rtl8192_hard_start_xmit()
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Mon, 20 Sep 2010 14:12:40 +0000 (23:12 +0900)]
staging: rtl8192e: Remove some dead code
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Mon, 20 Sep 2010 14:12:29 +0000 (23:12 +0900)]
staging: rtl8192e: Remove dead code in CamResetAllEntry()
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Mon, 20 Sep 2010 14:12:18 +0000 (23:12 +0900)]
staging: rtl8192e: Fix indent of some functions
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Mon, 20 Sep 2010 14:12:09 +0000 (23:12 +0900)]
staging: rtl8192e: Remove dead code from rtl8192_set_chan()
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Mon, 20 Sep 2010 14:11:59 +0000 (23:11 +0900)]
staging: rtl8192e: Remove commented function rtl8192_set_mode()
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Mon, 20 Sep 2010 14:11:49 +0000 (23:11 +0900)]
staging: rtl8192e: Remove empty function force_pci_posting()
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Mon, 20 Sep 2010 14:11:40 +0000 (23:11 +0900)]
staging: rtl8192e: Clean up rtl8192_hard_data_xmit()
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Mon, 20 Sep 2010 14:11:29 +0000 (23:11 +0900)]
staging: rtl8192e: Clean up function headers
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike McCormack [Mon, 20 Sep 2010 14:11:14 +0000 (23:11 +0900)]
staging: rtl8192e: Delete dead and commented out code
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Tracey Dent [Tue, 21 Sep 2010 01:19:42 +0000 (21:19 -0400)]
Staging: rtl8187se: r8185b_init: fixed a lot of checkpatch.pl issues
Fixed numerous coding style issues using checkpatch.pl
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Tracey Dent [Tue, 21 Sep 2010 01:19:41 +0000 (21:19 -0400)]
Staging: rtl8187se: r8180_wx: fixed a lot of checkptahc.pl issues
Fixed numerous coding style issues using checkpatch.pl
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Tracey Dent [Tue, 21 Sep 2010 01:19:40 +0000 (21:19 -0400)]
Staging: rtl8187se: r8180_rtl8225: fixed a lot of checkpatch.pl issues
Fixed numerous coding style issues using checkpatch.pl
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Tracey Dent [Tue, 21 Sep 2010 01:19:39 +0000 (21:19 -0400)]
Staging: rtl8187se: r8180_hw: fixed a lot of checkpatch.pl issues
Fixed numerous coding style issues using checkpatch.pl
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Tracey Dent [Tue, 21 Sep 2010 01:19:38 +0000 (21:19 -0400)]
Staging: rtl8187se: r8180.h: fixed alot of checkpatch.pl issues
Fixed numerous coding style issues
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Victor Rosales [Sun, 19 Sep 2010 20:53:00 +0000 (17:53 -0300)]
staging: winbond: mds.c: Fixed all checkpatch's errors
Just fixed all checkpatch's errors but not the warinings.
Signed-off-by: Victor Rosales <victorhrosales@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pekka Enberg [Sun, 19 Sep 2010 10:04:21 +0000 (13:04 +0300)]
staging: w35und: Add locking problems to TODO list
The w35und uses atomics such as "ThreadCount" and "FireCount" to emulate
locking in the TX paths, for example. Document this bug in the TODO list.
Cc: Lars Lindley <lindley@coyote.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Ruslan Pisarev <ruslan@rpisarev.org.ua>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pekka Enberg [Sun, 19 Sep 2010 10:01:03 +0000 (13:01 +0300)]
staging: w35und: Inline MLMESendFrame() to wbsoft_tx()
The wbsoft_tx() function is a simple wrapper on top of MLMESendFrame() so
inline the latter to the former.
Cc: Lars Lindley <lindley@coyote.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Ruslan Pisarev <ruslan@rpisarev.org.ua>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pekka Enberg [Sun, 19 Sep 2010 10:01:02 +0000 (13:01 +0300)]
staging: w35und: Use NETDEV_TX_BUSY if MLMESendFrame fails
This patch changes MLMESendFrame to return NETDEV_TX_BUSY if MLME frame is in
use so that wbsoft_tx() doesn't blindly return NETDEV_TX_OK in that case.
Cc: Sandro Bonazzola <sandro.bonazzola@gmail.com>
Cc: Lars Lindley <lindley@coyote.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Ruslan Pisarev <ruslan@rpisarev.org.ua>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pekka Enberg [Sun, 19 Sep 2010 09:28:43 +0000 (12:28 +0300)]
staging: w35und: Remove unused fields from struct wbsoft_priv
This patch removes unused fields from "struct wbsoft_priv".
Cc: Lars Lindley <lindley@coyote.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Ruslan Pisarev <ruslan@rpisarev.org.ua>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pekka Enberg [Sun, 19 Sep 2010 09:28:42 +0000 (12:28 +0300)]
staging: w35und: Remove unused spinlocks
This patch removes unused spinlocks from "struct mlme_frame" and "struct
wbsoft_priv".
Cc: Lars Lindley <lindley@coyote.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Ruslan Pisarev <ruslan@rpisarev.org.ua>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pekka Enberg [Sun, 19 Sep 2010 09:28:41 +0000 (12:28 +0300)]
staging: w35und: Inline mlme_s.h to core.h
The mlme_s.h header is included in one place. As the header is very small, just
inline it to core.h.
Cc: Lars Lindley <lindley@coyote.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Ruslan Pisarev <ruslan@rpisarev.org.ua>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pekka Enberg [Sun, 19 Sep 2010 09:28:40 +0000 (12:28 +0300)]
staging: w35und: Remove dead code from mlme_s.h
There's bunch of macros in mlme_s.h that aren't used for anything. Kill them
off.
Cc: Lars Lindley <lindley@coyote.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Ruslan Pisarev <ruslan@rpisarev.org.ua>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pekka Enberg [Sun, 19 Sep 2010 09:28:39 +0000 (12:28 +0300)]
staging: w35und: Kill unused scan_s.h header
The scan_s.h header is not actually used for anything so just kill it off.
Cc: Lars Lindley <lindley@coyote.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Ruslan Pisarev <ruslan@rpisarev.org.ua>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pekka Enberg [Sun, 19 Sep 2010 09:28:38 +0000 (12:28 +0300)]
staging: w35und: Remove remaining typedef declarations
This patch removes remaining typedef declarations from the w35und driver. Most
of them were unused so I just killed them off completely.
Cc: Lars Lindley <lindley@coyote.org>
Acked-by: Pavel Machek <pavel@ucw.cz>
Cc: Ruslan Pisarev <ruslan@rpisarev.org.ua>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pekka Enberg [Sun, 19 Sep 2010 09:28:37 +0000 (12:28 +0300)]
staging: w35und: Kill dead HAL macros in wbhal_f.h
Fixes an uninitialized variable access in _rx_iq_calibration_loop_winbond():
CC [M] drivers/staging/winbond/phy_calibration.o
drivers/staging/winbond/phy_calibration.c: In function ‘_rx_iq_calibration_loop_winbond’:
drivers/staging/winbond/phy_calibration.c:1138: warning: ‘val’ is used uninitialized in this function
Cc: Lars Lindley <lindley@coyote.org>
Acked-by: Pavel Machek <pavel@ucw.cz>
Cc: Ruslan Pisarev <ruslan@rpisarev.org.ua>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>