Commit graph

286,663 commits

Author SHA1 Message Date
Larry Finger
0fd4442586 staging: rtl8192e: Convert typedef RT_STATUS to enum rt_status
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:33 -05:00
Larry Finger
6f44d2bdfc staging: rtl8192e: Convert typedef RF_STEP_E to enum rf_step
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:33 -05:00
Larry Finger
fc6094f670 staging: rtl8192e: Convert typedef RT_RF_TYPE_819xU to enum rt_rf_type_819xu
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:32 -05:00
Larry Finger
aec1148c5b staging: rtl8192e: Convert typedef DCMD_TXCMD_OP to enum dcmg_txcmd_op
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:31 -05:00
Larry Finger
e9463775ed staging: rtl8192e: Convert typedef RT_EEPROM_TYPE to enum rt_eeprom_type
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:30 -05:00
Larry Finger
b55941afbf staging: rtl8192e: Convert typedef nic_t to enum nic_t
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:28 -05:00
Larry Finger
39b2a4aed0 staging: rtl8192e: Convert typedef TR_SELECT to enum tr_select
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:27 -05:00
Larry Finger
379a20fb29 staging: rtl8192e: Convert typedef ACM_METHOD to enum acm_method
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:26 -05:00
Larry Finger
f12dfcb016 staging: rtl8192e: Convert typedef DIRECTION_VALUE to enum direction_value
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:26 -05:00
Larry Finger
f58a1cd97e staging: rtl8192e: Convert typedef QOS_ELE_SUBTYPE to enum qos_ele_subtype
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:25 -05:00
Larry Finger
4164e4de6c staging: rtl8192e: Convert typedef ACK_POLICY to enum ack_policy
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:24 -05:00
Larry Finger
bb9a7b3f23 staging: rtl8192e: Convert typedef RT_HT_CAPBILITY to enum rt_ht_capability
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:23 -05:00
Larry Finger
d745c1074a staging: rtl8192e: Convert typedef HT_IOT_RAFUNC to enum ht_iot_rafunc
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:22 -05:00
Larry Finger
dd8f8ba262 staging: rtl8192e: Convert typedef HT_IOT_ACTION_E to enum ht_iot_action
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:21 -05:00
Larry Finger
a866534606 staging: rtl8192e: Convert typedef HT_IOT_PEER_E to enum ht_iot_peer
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:20 -05:00
Larry Finger
d1936afc52 staging: rtl8192e: Convert typedef HT_AGGRE_MODE_E to enum ht_aggre_mode
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:19 -05:00
Larry Finger
d2eff5c3bf staging: rtl8192e: Convert typedef HT_SPEC_VER to enum ht_spec_ver
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:18 -05:00
Larry Finger
11b639c3e2 staging: rtl8192e: Convert typedef HT_BW40_SC_E to enum ht_bw40_sc
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:18 -05:00
Larry Finger
c4e6d760d8 staging: rtl8192e: Convert typedef HT_ACTION to enum ht_action
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:17 -05:00
Larry Finger
c1c5d07416 staging: rtl8192e: Convert typedef CHNLOP to enum chnl_op
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:16 -05:00
Larry Finger
b678bd1ff5 staging: rtl8192e: Convert typedef HT_EXTCHNL_OFFSET to enum ht_extchnl_offset
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:49:30 -05:00
Larry Finger
6e579119b1 staging: rtl8192e: Convert typedef HT_CHANNEL_WIDTH to enum ht_channel_width
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:49:01 -05:00
Larry Finger
cc8abb261d staging: rtl8192e: Convert typedef HT_MCS_RATE to enum ht_mcs_rate
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:48:31 -05:00
Larry Finger
43602f2c50 staging: rtl8192e: Convert typedef RF90_RADIO_PATH_E to enum rf90_radio_path
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:48:19 -05:00
Larry Finger
afa087ddd8 staging: rtl8192e: Convert typedef HW90_BLOCK_E to enum hw90_block
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:48:08 -05:00
Larry Finger
e75c3c4a8c staging: rtl8192e: Convert typedef SwChnlCmdID to enum sw_chnl_cmd_id
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:47:57 -05:00
Larry Finger
800119e7fa staging: rtl8192e: Convert typedef BaseBand_Config_Type to enum baseband_config
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:47:41 -05:00
Larry Finger
d4b8c17703 staging: rtl8192e: Convert typedef firmware_status_e to enum firmware_status
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:47:21 -05:00
Larry Finger
9659e7f527 staging: rtl8192e: Convert typedef firmware_source_e to enum firmware_source
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:47:03 -05:00
Larry Finger
8ce50cf33a staging: rtl8192e: Convert typedef desc_packet_type_e to enum desc_packet_type
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:37:43 -05:00
Larry Finger
6bf04003c7 staging: rtl8192e: Convert typedef opt_rst_type_e to enum opt_rst_type
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:37:10 -05:00
Larry Finger
cec0769542 staging: rtl8192e: Convert typedef firmware_init_step_e to enum firmware_init_step
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:36:35 -05:00
Larry Finger
8fa81ed4c9 staging: rtl8192e: Convert typedef cmpk_element_e to enum cmpk_element
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:36:11 -05:00
Larry Finger
97844d1562 staging: rtl8192e: Convert typedef INTERFACE_SELECT_8190PCI to enum interface_select_8190pci
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:35:41 -05:00
Larry Finger
12f5bc97f4 staging: rtl8192e: Convert typedef POWER_SAVE_MODE to enum power_save_mode
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:35:13 -05:00
Larry Finger
0ad0141d18 staging: rtl8192e: Convert typedef RF_OpType_E to enum rf_optype
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:34:43 -05:00
Larry Finger
1238aa49ef staging: rtl8192e: Convert typedef VERSION_8190 to enum version_8190_loopback
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:34:14 -05:00
Larry Finger
70f9f79c48 staging: rtl8192e: Convert typedef rtl819x_loopback_e to enum rtl819x_loopback
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:31:21 -05:00
Takashi Iwai
9c4e84d3b8 ALSA: hda - Fix Center/LFE mixer element creations for Realtek
The commit 23c09b0090
    ALSA: hda - Support multiple speakers by Realtek auto-parser
changes the return value from alc_get_line_out_pfx(), and it breaks
the center/LFE mixer split check.  The caller must test with a string
"CLFE" now.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-08-24 17:27:52 +02:00
Larry Finger
d3b2c17251 staging: rtl8192e: Prepare header files to ease use of typedef enum conversion
The tool that I am using fails for certain conditions. This patch makes trivial
changes to the source to allow the tool to work for all cases.

I also remove some artifacts left from the typedef struct conversion.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:23:46 -05:00
Heiko Carstens
8adb4ca344 [S390] memory hotplug: only unassign assigned increments
Make sure that only assigned storage increments are unassigned when
attaching a storage element.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2011-08-24 17:15:24 +02:00
Michael Holzheu
e1202edadb [S390] Change default action from reipl to stop for on_restart
The main purpose for PSW restart will be kdump. Therefore customers will
issue "system restart" for creating a dump. If kdump is not enabled,
currently "PSW restart" will reboot the system and then no dump can
be created any more. In order to still allow a manual stand-alone dump in
the case a user issues "PSW restart" on a system that has not enabled
kdump we now stop the system.

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2011-08-24 17:15:24 +02:00
Julia Lawall
798620fb1d [S390] arch/s390/kernel/ipl.c: correct error detection check
reipl_fcp_kset was just initialized, so it appears that it should be tested
instead of reipl_kset.

Signed-off-by: Julia Lawall <julia@diku.dk>
Reported-by: Suman Saha <sumsaha@gmail.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2011-08-24 17:15:24 +02:00
Julia Lawall
ba465d830e [S390] drivers/s390/block/dasd_ioctl.c: add missing kfree
Data is only used to temporarily hold information to be copied to the user
level, so it should be freed before leaving the function.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@exists@
local idexpression x;
statement S,S1;
expression E;
identifier fl;
expression *ptr != NULL;
@@

x = \(kmalloc\|kzalloc\|kcalloc\)(...);
...
if (x == NULL) S
<... when != x
     when != if (...) { <+...kfree(x)...+> }
     when any
     when != true x == NULL
x->fl
...>
(
if (x == NULL) S1
|
if (...) { ... when != x
               when forall
(
 return \(0\|<+...x...+>\|ptr\);
|
* return ...;
)
}
)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2011-08-24 17:15:23 +02:00
Heiko Carstens
27e7318c3e [S390] nss,initrd: kernel image and initrd must be in different segments
When IPL'ing from a block device and an NSS should be created we must
make sure that the kernel image and the initrd are in different 1MB
segments. Otherwise creating the NSS will fail.
So we make sure the initrd is 4MB behind the end of the kernel image
like we do already when IPL via the VM reader is performed.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2011-08-24 17:15:23 +02:00
Justin P. Mattock
81d66c70b5 mm/vmscan.c: fix a typo in a comment "relaimed" to "reclaimed"
Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-08-24 16:45:10 +02:00
Jiri Kosina
d446014162 Merge branches 'wiimote' and 'upstream-fixes' into for-linus 2011-08-24 16:41:52 +02:00
Dan Carpenter
ba623a774f HID: unlock on error path in hid_device_probe()
We recently introduced locking into this function, but we missed an
error path which needs an unlock.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2011-08-24 16:39:23 +02:00
Takashi Iwai
e92d4b08d7 ALSA: hda - Rewrite Lenovo X200 quirk with pincfg-fix using auto-parser
Introduce the pincfg table to patch_conexant.c for fixing up the extra
pin-configuration for auto-parser.  As an example, Lenovo X200 model is
replaced with this new mechanism.  (This also fixes the wrong mixer
elements for docking-station I/O in the previous model quirk
automagically.)

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-08-24 16:24:04 +02:00
Shaohua Li
56ebdaf2fa block: simplify force plug flush code a little bit
Cleaning up the code a little bit. attempt_plug_merge() traverses the plug
list anyway, we can do the request counting there, so stack size is reduced
a little bit.
The motivation here is I suspect if we should count the requests for each
queue (task could handle multiple disks in the meantime), but my test doesn't
show it's worthy doing. If somebody proves we should do it, below change
will make that more easier.

Signed-off-by: Shaohua Li <shli@kernel.org>
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
2011-08-24 16:04:34 +02:00