Commit Graph

44 Commits

Author SHA1 Message Date
Cho, Yu-Chen
d48e5cffb3 staging/keucr: fix transport other code style
fix keucr transport.c other coding style but not from checkpatch.pl.
replace ternary conditional "?:" with if/else

Signed-off-by: Cho, Yu-Chen <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-18 08:22:41 -07:00
Cho, Yu-Chen
3aa4fc587d staging/keucr: fix keucr transport coding style
fix keucr transport.c transport.h coding style

Signed-off-by: Cho, Yu-Chen <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-18 08:22:40 -07:00
Cho, Yu-Chen
ece114aa78 staging/keucr: fix keucr smil.h coding style
fix keucr smil.h coding style

Signed-off-by: Cho, Yu-Chen <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-18 08:22:40 -07:00
Cho, Yu-Chen
65cdcf3623 staging/keucr: fix keucr smilecc.c coding style
fix keucr smilecc.c coding style

Signed-off-by: Cho, Yu-Chen <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-18 08:22:39 -07:00
Cho, Yu-Chen
8a25a2cf0a staging/keucr: fix keucr scsiglue coding style
fix keucr scsiglue.c coding style

Signed-off-by: Cho, Yu-Chen <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-18 08:22:39 -07:00
Cho, Yu-Chen
70d8370758 staging/keucr: fix keucr msscsi coding style
Fix keucr msscsi.c coding style.
Remove externs ,and move MS_SCSIIrp to end,
because there are not necessary to add extern for MS_SCSIIrp function.

Signed-off-by: Cho, Yu-Chen <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-18 08:22:39 -07:00
Cho, Yu-Chen
333c5ec018 staging/keucr: fix keucr ms coding style
fix keucr ms.c and ms.h coding style

Signed-off-by: Cho, Yu-Chen <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-18 08:22:38 -07:00
Randy Dunlap
fb03d4fc6c staging/keucr: don't use SUCCESS as macro name
Don't use "SUCCESS" as a macro name.  This collides with SCSI's macro
of the same name, but with a different value:

drivers/staging/keucr/smcommon.h:9:9: warning: preprocessor token SUCCESS redefined
include/scsi/scsi.h:463:9: this was the original definition

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-10 11:25:06 -07:00
Randy Dunlap
7fb71adc35 staging/keucr: eliminate sparse warnings in ms.c
Eliminate sparse warnings in ms.c:

drivers/staging/keucr/ms.c:28:58: warning: right shift by bigger than source value
drivers/staging/keucr/ms.c:31:58: warning: right shift by bigger than source value
drivers/staging/keucr/ms.c:789:59: warning: cast truncates bits from constant value (ffffff7f becomes 7f)

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-10 11:19:54 -07:00
Randy Dunlap
d8aba9d5d6 staging/keucr: fix sparse statics and non-ANSI function warnings
Make lots of functions and data static (fixes sparse warnings).
Fix 5 functions to use ANSI format for function parameters (fixes
sparse warnings).

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-10 11:19:52 -07:00
Cho, Yu-Chen
871f847796 staging/keucr: transport usb use pr_<level>
transport.c usb.c use pr_<level> for messages

Signed-off-by: Cho, Yu-Chen <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-04-20 13:55:03 -07:00
Cho, Yu-Chen
548039fd34 staging/keucr: smilmain use pr_<level> for messages
smilmain.c use pr_<level> for messages

Signed-off-by: Cho, Yu-Chen <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-04-20 13:55:02 -07:00
Cho, Yu-Chen
beddfe8428 staging/keucr: scsiglue use pr_<level> for messages
scsiglue.c use pr_<level> for messages

Signed-off-by: Cho, Yu-Chen <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-04-20 13:55:02 -07:00
Cho, Yu-Chen
615df84151 staging/keucr: msscsi use pr_<level> for messages
msscsi.c use pr_<level> for messages

Signed-off-by: Cho, Yu-Chen <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-04-20 13:55:01 -07:00
Lucas De Marchi
25985edced Fix common misspellings
Fixes generated by 'codespell' and manually reviewed.

Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
2011-03-31 11:26:23 -03:00
Ilia Mirkin
306be9e1c1 staging: keucr: Remove NULL check before kfree
This patch was generated by the following semantic patch:
// <smpl>
@@ expression E; @@
- if (E != NULL) { kfree(E); }
+ kfree(E);

@@ expression E; @@
- if (E != NULL) { kfree(E); E = NULL; }
+ kfree(E);
+ E = NULL;
// </smpl>

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-14 11:57:32 -07:00
huajun li
41e568d14e Staging: Merge ENE UB6250 SD card codes from keucr to drivers/usb/storage
The usb portion of this driver can now go into drivers/usb/storage.
This leaves the non-usb portion of the code still in staging.

Signed-off-by: Huajun Li <huajun.li.lee@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-07 13:40:59 -08:00
Jonathan Neuschäfer
2145cff54f staging: keucr: use kernel byteorder functions
Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Reviewed-by: Jack Stone <jwjstone@fastmail.fm>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-07 13:26:56 -08:00
Jonathan Neuschäfer
22a55690c1 staging: keucr: remove unused typedef VOID
Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-07 13:26:56 -08:00
Roel Van Nyen
2f7cf8d1ef staging: keucr: Change the custom counting functions to hweight8 and hweight16
Change the custom counting functions to hweight8 and hweight16

Signed-off-by: Roel Van Nyen <roel.vannyen@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-28 19:03:18 -08:00
Javier Martinez Canillas
1a37f3f476 staging: keucr: Delete use kernel strcmp() & strcpy() from TODO file
staging: keucr: Delete use kernel strcmp() & strcpy() from TODO file

Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
Acked-by: Dan Carpenter <error27@gmail.com>
Reviewed-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Al Cho <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-21 12:16:53 -08:00
Javier Martinez Canillas
1b9f644dfe staging: keucr: Delete StringCmp() and StringCopy custom functions
staging: keucr: Delete StringCmp() and StringCopy custom functions

Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
Acked-by: Dan Carpenter <error27@gmail.com>
Reviewed-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Al Cho <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-21 12:16:53 -08:00
Javier Martinez Canillas
f3d5049ccd staging: keucr: Use memcpy() instead custom StringCopy() and some style cleanups
staging: keucr: Use memcpy() instead custom StringCopy() and some style cleanups

Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
Acked-by: Dan Carpenter <error27@gmail.com>
Reviewed-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Al Cho <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-21 12:16:52 -08:00
Javier Martinez Canillas
1b5b4e17e5 staging: keucr: Use memcmp() instead custom StringCmp() and some style cleanups
staging: keucr: Use memcmp() instead custom StringCmp() and some style cleanups

Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
Acked-by: Dan Carpenter <error27@gmail.com>
Reviewed-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Al Cho <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-21 12:16:52 -08:00
Greg Kroah-Hartman
ea3398a1ae Staging: Merge 2.6.37-rc5 into staging-next
This was done to handle a number of conflicts in the batman-adv
and winbond drivers properly.  It also now allows us to fix up the sysfs
attributes properly that were not in the .37 release due to them being
only in this tree at the time.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-07 10:47:56 -08:00
Al Cho
6efe04ee41 staging: keucr: fix keucr init other coding style
fix keucr init.c other coding style but not from checkpatch.pl.
replace ternary conditional "?:" with if/else.

Signed-off-by: Al Cho <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-29 11:40:31 -08:00
Al Cho
e93192acff staging: keucr: fix keucr init coding style
fix keucr init.c init.h coding style.
only fix coding style check by checkpatch.pl.

Signed-off-by: Al Cho <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-29 11:40:31 -08:00
Jeff Garzik
f281233d3e SCSI host lock push-down
Move the mid-layer's ->queuecommand() invocation from being locked
with the host lock to being unlocked to facilitate speeding up the
critical path for drivers who don't need this lock taken anyway.

The patch below presents a simple SCSI host lock push-down as an
equivalent transformation.  No locking or other behavior should change
with this patch.  All existing bugs and locking orders are preserved.

Additionally, add one parameter to queuecommand,
	struct Scsi_Host *
and remove one parameter from queuecommand,
	void (*done)(struct scsi_cmnd *)

Scsi_Host* is a convenient pointer that most host drivers need anyway,
and 'done' is redundant to struct scsi_cmnd->scsi_done.

Minimal code disturbance was attempted with this change.  Most drivers
needed only two one-line modifications for their host lock push-down.

Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Acked-by: James Bottomley <James.Bottomley@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-11-16 13:33:23 -08:00
Joe Perches
859171ca92 drivers/staging: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16 12:06:47 -08:00
Greg Kroah-Hartman
491acf0032 Staging: Merge 2.6.37-rc2 into staging-next
This was necessary in order  to resolve some conflicts that happened
between -rc1 and -rc2 with the following files:
	drivers/staging/bcm/Bcmchar.c
	drivers/staging/intel_sst/intel_sst_app_interface.c

All should be resolved now.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16 10:44:50 -08:00
Konstantin Katuev
307ae1d3d0 Staging: keucr driver: fix uninitialized variable & proper memset length
There was commented out transfer_flags initialization.
And i think memset should fill entire structure, not only length of
pointer to it.

This makes the driver work properly now on my hardware.

Signed-off-by: Konstantin Katuev <kkatuev@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-10 16:33:57 -08:00
Jesper Juhl
60a1d01bcd staging, keucr: Remove unnecessary casts of void ptr returning alloc function return values
Hi,

The [vk][cmz]alloc(_node) family of functions return void pointers which
it's completely unnecessary/pointless to cast to other pointer types since
that happens implicitly.

This patch removes such casts from drivers/staging/keucr/

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-09 16:44:08 -08:00
Greg Kroah-Hartman
bceadddd92 Staging: keucr: fix up US_ macro change
The usb tree renamed the USB storage defines to make more sense, so this
driver needs the changes as well so that things will compile properly.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-28 09:53:38 -07:00
Tracey Dent
a7b1ef250f Staging: keucr: Makefile: Makefile clean up
Changed <module>-objs to <module>-y in Makefile.
Also, Replace EXTRA_CFLAGS with ccflags-y.

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-08 07:23:44 -07:00
Jason Cooper
b229fad289 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>
2010-10-05 09:22:24 -07:00
Greg Kroah-Hartman
a200adb1c7 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>
2010-09-30 04:34:26 -07:00
Al Cho
e10496041b 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>
2010-09-30 04:33:26 -07:00
Greg Kroah-Hartman
1a0b25ce78 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>
2010-09-21 11:03:41 -07:00
Vasiliy Kulikov
b1f5f54e91 staging: keucr: check kmalloc() return value
kmalloc() may fail, if so return error code.

Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-20 17:03:41 -07:00
Al Cho
a871869245 staging: keucr: fix keucr lost disconnect
keucr lost the disconnect,
so keucr crash when plug-in and then plug-out SD-card quickly.

unmark the part of usb disconnect

Signed-off-by: Al Cho <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-16 12:37:35 -07:00
Randy Dunlap
e23f773ee4 staging/keucr: fix build when CONFIG_PM is not enabled
keucr driver has a build error when CONFIG_PM is not enabled, so fix that.

drivers/staging/keucr/usb.c:42: error: 'struct us_data' has no member named 'suspend_resume_hook'
drivers/staging/keucr/usb.c:43: error: 'struct us_data' has no member named 'suspend_resume_hook'
drivers/staging/keucr/usb.c:64: error: 'struct us_data' has no member named 'suspend_resume_hook'
drivers/staging/keucr/usb.c:65: error: 'struct us_data' has no member named 'suspend_resume_hook'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Al Cho <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-16 12:29:31 -07:00
Randy Dunlap
7311530035 staging/keucr: update TODO list and ask question about it
Update keucr TODO with additional work items.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Al Cho <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-16 12:29:31 -07:00
Greg Kroah-Hartman
2d2f03b022 Staging: keucr: fix up some coding style issues in the .h files
This resolves a few of the coding style issues in the .h files
for this driver.  It doesn't get all of them by far, but it's a
good start.

Cc: Al Cho <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-08 02:49:54 -07:00
Al Cho
126bb03b46 Staging: add USB ENE card reader driver
This driver is for the ENE card reader that can be found in many
different laptops.  It was written by ENE, but cleaned up to
work properly in the kernel tree by Novell.

Signed-off-by: Al Cho <acho@novell.com>
Cc: <yiyingc@ene.com.tw>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-08 02:49:39 -07:00