leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
248,996 Commits 2 Branches 0 Tags 5.1 GiB
898f699e7f
Commit Graph

145 Commits

Author SHA1 Message Date
Jeff Mahoney
9f908a9eaa staging: ft1000: Remove unnecessary EXPORT_SYMBOLs 
ft1000-pcmcia uses EXPORT_SYMBOL unnecessarily for sharing symbols
 inside the same module. For some reason, this is causing section
 conflicts on ia64 as well, even though neither are static.

 error: __ksymtab_stop_ft1000_card causes a section type conflict
 error: __ksymtab_init_ft1000_card causes a section type conflict

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-04-25 17:08:31 -07:00
Linus Torvalds
df9b29d13e Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 
* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (28 commits)
  staging: usbip: bugfix for isochronous packets and optimization
  staging: usbip: bugfix add number of packets for isochronous frames
  staging: usbip: bugfixes related to kthread conversion
  staging: usbip: fix shutdown problems.
  staging: hv: Fix GARP not sent after Quick Migration
  staging: IIO: IMU: ADIS16400: Avoid using printk facility directly
  staging: IIO: IMU: ADIS16400: Fix product ID check, skip embedded revision number
  staging: IIO: IMU: ADIS16400: Make sure only enabled scan_elements are pushed into the ring
  staging: IIO: IMU: ADIS16400: Fix addresses of GYRO and ACCEL calibration offset
  staging: IIO: IMU: ADIS16400: Add delay after self test
  staging: IIO: IMU: ADIS16400: Fix up SPI messages cs_change behavior
  staging/rtl81*: build as loadable modules only
  staging: brcm80211: removed 'is_amsdu causing toss' log spam
  staging: brcm80211: fix for 'Short CCK' log spam
  staging: brcm80211: fix for 'AC_BE txop..' logs spammed problem
  staging: memrar: remove driver from tree
  staging: sep: remove last memrar remnants
  staging: fix hv_mouse build, needs delay.h
  staging: fix olpc_dcon build errors
  staging: sm7xx: fixed defines
  ...

Fix up trivial conflict in drivers/staging/memrar/memrar_handler.c
(deleted vs trivial spelling fixes)
 2011-04-07 11:36:44 -07:00
pixo
14e5d8ef5b staging: ft1000-pcmcia: Fix ft1000_dnld() to work also on 64bit architectures. 
Firmware file needs to be read by 4bytes also on 64 bit architectures.
Change long type to u32 and also extend checking. Tested on 32 and also
64 bit architectures.

Signed-off-by: Stano Lanci <chl.pixo@gmail.com>
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>

Tested-by: Stano Lanci <chl.pixo@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-04-04 21:33:27 -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
Marek Belisko
6d2b672195 staging: ft1000: Fix coding style in ft1000_proc_drvmsg function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-03-14 11:51:21 -07:00
Marek Belisko
fc796a6502 staging: ft1000: Fix coding style in ft1000_dsp_prov function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-03-14 11:51:21 -07:00
Marek Belisko
8b2dab1cf8 staging: ft1000: Fix coding style in ft1000_receive_cmd function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-03-14 11:51:21 -07:00
Marek Belisko
53cd3aa619 staging: ft1000: Fix coding style in ft1000_chkcard function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-03-14 11:51:20 -07:00
Marek Belisko
a007e842af staging: ft1000: Fix coding style in ft1000_close function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-03-14 11:51:20 -07:00
Marek Belisko
a01ffcd69f staging: ft1000: Fix coding style in ft1000_open function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-03-14 11:51:20 -07:00
Marek Belisko
bee1b21cfa staging: ft1000: Fix coding style in ft1000_copy_up_pkt function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-03-14 11:51:19 -07:00
Marek Belisko
6b2a66f250 staging: ft1000: Fix coding style in ft1000_submit_rx_urb function. 
Fix coding style and also replace printk with proper pr_err
function.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-03-14 11:51:19 -07:00
Marek Belisko
e31e33855a staging: ft1000: Fix coding style in ft1000_start_xmit function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-03-14 11:51:19 -07:00
Marek Belisko
d8dfaf4c94 staging: ft1000: Fix coding style in ft1000_copy_down_pkt function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-03-14 11:51:18 -07:00
Marek Belisko
251c72f84a staging: ft1000: Fix coding style in ft1000_usb_transmit_complete function. 
Fix coding style and also replace printk with proper pr_err
function.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-03-14 11:51:18 -07:00
Marek Belisko
2dd9017b47 staging: ft1000: Fix coding style in ft1000_reset function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-03-14 11:51:17 -07:00
Marek Belisko
05a7c39c36 staging: ft1000: Fix coding style in reg_ft1000_netdev function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-03-14 11:51:17 -07:00
Marek Belisko
f135da0359 staging: ft1000: Change return value for init_ft1000_netdev function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-03-14 11:51:17 -07:00
Marek Belisko
6c284c7b06 staging: ft1000: Fix coding style in init_ft1000_netdev function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-03-14 11:51:16 -07:00
Marek Belisko
cb3aa5d5b5 staging: ft1000: Fix identation in ftnet_ops struct. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-03-14 11:51:16 -07:00
Marek Belisko
3071c12ea7 staging: ft1000: Fix coding style in ft1000_reset_card function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-03-14 11:51:16 -07:00
Marek Belisko
84a60963e2 staging: ft1000: Fix coding style in ft1000_reset_asic function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-03-14 11:51:15 -07:00
Marek Belisko
3529bd4164 staging: ft1000: Fix coding style in dsp_reload function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-03-14 11:51:15 -07:00
Marek Belisko
68e79bccce staging: ft1000: Fix coding style in card_send_command function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-03-14 11:51:14 -07:00
Marek Belisko
a209efadf0 staging: ft1000: Replace camelcase CardSendCommand function name. 
Replace CardSendCommand by card_send_command.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-03-14 11:51:14 -07:00
Alexander Beregalov
2f48131636 staging: ft1000: optimize kmalloc to kzalloc 
Use kzalloc rather than kmalloc followed by memset with 0.
Found by coccinelle.

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-03-09 15:54:32 -08:00
Uwe Kleine-König
aec563b4f0 staging/trivial: fix typos concerning "address" 
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-02-18 13:30:09 -08:00
Marek Belisko
bcd2d92e62 staging: ft1000: Remove unnecessary check in write_blk_fifo(). 
byte_length = word_length * 4;

if (byte_length % 4) ...

word_length * 4 is always aligned at 4 bytes. Remove pointless
check.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-02-09 14:55:51 -08:00
Marek Belisko
677aaa4306 staging: ft1000: Fix coding style in card_reset_dsp function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-02-09 14:55:51 -08:00
Marek Belisko
8bfef50259 staging: ft1000: Fix coding style in fix_ft1000_write_dpram32 fucntion. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-02-09 14:55:51 -08:00
Marek Belisko
71e3335d55 staging: ft1000: Fix coding style in fix_ft1000_read_dpram32 function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-02-09 14:55:51 -08:00
Marek Belisko
460bd5ddab staging: ft1000: Fix coding style in ft1000_read/write_dpram16 functions. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-02-09 14:55:50 -08:00
Marek Belisko
e3fc923d4d staging: ft1000: Fix coding style in ft1000_read/write_dpram32 functions. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-02-09 14:55:50 -08:00
Marek Belisko
31da7c09de staging: ft1000: Fix coding style in ft1000_write/read_register functions. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-02-09 14:55:50 -08:00
Marek Belisko
4a526fca84 staging: ft1000: Fix return values type. 
Change return values type from u16 to int because all functions
use ft1000_control function which return int.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-02-09 14:55:49 -08:00
Marek Belisko
dc080fdaca staging: ft1000: Remove unused header ft1000_hw.h 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-02-09 14:55:49 -08:00
Marek Belisko
537a20aba6 staging: ft1000: Fix coding style in ft1000_control function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-02-09 14:55:49 -08:00
Marek Belisko
dfc9539fe8 staging: ft1000: Remove unnecessary assignment. 
dsp_img_info->version and requested_version have same type
so additional temporary variable creation could be omitted
because variables could be compares directly.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-02-04 12:43:44 -08:00
Marek Belisko
e7af078630 staging: ft1000: Create common function for buffers check. 
Same check was done on three places which make code unreadable.
Put repeat routine to separate function.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-02-04 12:43:43 -08:00
Marek Belisko
672dfeba92 staging: ft1000: Remove unused variables. 
Remove variables which was defined and assigned
but never used in function.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-02-04 12:43:43 -08:00
Marek Belisko
6f953fbbf6 staging: ft1000: Fix indentation in scram_dnldr() function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-02-04 12:43:43 -08:00
Marek Belisko
857af455c8 staging: ft1000: Fix coding style in write_blk_fifo() function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-02-04 12:43:43 -08:00
Marek Belisko
d7a7318b38 staging: ft1000: Fix coding style in get_handshake() function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-02-04 12:43:42 -08:00
Marek Belisko
78395f672a staging: ft1000: Fix coding style in hdr_checksum() function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-02-04 12:43:42 -08:00
Marek Belisko
cc4f65bfbf staging: ft1000: Fix coding style in put_request_value() function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-02-04 12:43:42 -08:00
Marek Belisko
114a06ae84 staging: ft1000: Fix coding style in get_request_value() function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-02-04 12:43:41 -08:00
Marek Belisko
c3ed5d2f25 staging: ft1000: Fix coding style in get_request_type_usb() function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-02-04 12:43:41 -08:00
Marek Belisko
9b43f37468 staging: ft1000: Fix coding style in get_request_type() function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-02-04 12:43:41 -08:00
Marek Belisko
5acc5396af staging: ft1000: Fix coding style in put_handshake_usb() function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-02-04 12:43:41 -08:00
Marek Belisko
5865a18eaa staging: ft1000: Fix coding style in get_handshake_usb() function. 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-02-04 12:43:40 -08:00