All of the typedef statements are replaced. A perl tool supplied by Joe Perches was used to change the definition and all its users. Each conversion is in a separate file, which accounts for the number of patches. The last patch in the series deletes some files that are not needed. Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx> --- Greg, As before, you should be able to pull these patches from git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/r8192E.git Larry --- Larry Finger (166): staging: rtl8192e: Convert typedef BSS_QOS to struct bss_qos staging: rtl8192e: Convert typedef TX_TS_RECORD to struct tx_ts_record staging: rtl8192e: Convert typedef RX_TS_RECORD to struct rx_ts_record staging: rtl8192e: Convert typedef TS_COMMON_INFO to struct ts_common_info staging: rtl8192e: Convert typedef RT_HIGH_THROUGHPUT to struct rt_hi_throughput staging: rtl8192e: Convert typedef RT_HTINFO_STA_ENTRY to struct rt_htinfo_sta_entry staging: rtl8192e: Convert typedef BSS_HT to struct bss_ht staging: rtl8192e: Convert typedef MIMO_RSSI to struct mimo_rssi staging: rtl8192e: Convert typedef MIMOPS_CTRL to struct mimops_ctrl staging: rtl8192e: Convert typedef HT_INFORMATION_ELE to struct ht_info_ele staging: rtl8192e: Convert typedef HT_CAPABILITY_ELE to struct ht_capab_ele staging: rtl8192e: Convert typedef BA_RECORD to struct ba_record staging: rtl8192e: Convert typedef MIMO_EVM to struct mimo_evm staging: rtl8192e: Convert typedef FALSE_ALARM_STATISTICS to struct false_alarm_stats staging: rtl8192e: Convert typedef BB_REGISTER_DEFINITION_T to struct bb_reg_definition staging: rtl8192e: Convert typedef TX_FWINFO_T to struct tx_fwinfo staging: rtl8192e: Convert typedef TX_FWINFO_8190PCI to struct tx_fwinfo_8190pci staging: rtl8192e: Convert typedef LOG_INTERRUPT_8190_T to struct log_int_8190 staging: rtl8192e: Convert typedef phy_ofdm_rx_status_rxsc_sgien_exintfflag to struct phy_ofdm_rx_status_rxsc_sgien_exintfflag staging: rtl8192e: Convert typedef phy_sts_ofdm_819xpci_t to struct phy_sts_ofdm_819xpci staging: rtl8192e: Convert typedef WMM_TSPEC to struct wmm_tspec staging: rtl8192e: Convert typedef OCTET_STRING to struct octet_string staging: rtl8192e: Convert typedef QOS_TSTREAM to struct qos_tstream staging: rtl8192e: Convert typedef STA_QOS to struct sta_qos staging: rtl8192e: Convert typedef RT_SMOOTH_DATA_4RF to struct rt_smooth_data_4rf staging: rtl8192e: Convert typedef RT_PM_WOL_PATTERN_INFO to struct rt_pm_wol_info staging: rtl8192e: Convert typedef RT_POWER_SAVE_CONTROL to struct rt_pwr_save_ctrl staging: rtl8192e: Convert typedef RT_LINK_DETECT_T to struct rt_link_detect staging: rtl8192e: Convert typedef SW_CAM_TABLE to struct sw_cam_table staging: rtl8192e: Convert typedef RT_PMKID_LIST to struct rt_pmkid_list staging: rtl8192e: Convert typedef RT_INTEL_PROMISCUOUS_MODE_INFO to struct rt_intel_promisc_mode staging: rtl8192e: Convert typedef RT_PCI_CAPABILITIES_HEADER to struct rt_pci_capab_header staging: rtl8192e: Convert typedef RX_REORDER_ENTRY to struct rx_reorder_entry staging: rtl8192e: Convert typedef ACM to struct acm staging: rtl8192e: Convert typedef tx_desc to struct tx_desc staging: rtl8192e: Convert typedef CHANNEL_ACCESS_SETTING to struct channel_access_setting staging: rtl8192e: Convert typedef rt_tx_rahis_t to struct rt_tx_rahis staging: rtl8192e: Convert typedef phy_sts_cck_819xpci_t to struct phy_sts_cck_819xpci staging: rtl8192e: Convert typedef tx_desc_cmd to struct tx_desc_cmd staging: rtl8192e: Convert typedef rx_desc to struct rx_desc staging: rtl8192e: Convert typedef rx_fwinfo to struct rx_fwinfo staging: rtl8192e: Convert typedef cmpk_txfb_t to struct cmpk_txfb staging: rtl8192e: Convert typedef cmpk_intr_sta_t to struct cmpk_intr_sta staging: rtl8192e: Convert typedef cmpk_set_cfg_t to struct cmpk_set_cfg staging: rtl8192e: Convert typedef cmpk_tx_status_t to struct cmpk_tx_status staging: rtl8192e: Convert typedef cmpk_rx_dbginfo_t to struct cmpk_rx_dbginfo staging: rtl8192e: Convert typedef cmpk_tx_rahis_t to struct cmpk_tx_rahis staging: rtl8192e: Convert typedef fw_seg_container to struct fw_seg_container staging: rtl8192e: Convert typedef rt_firmware to struct rt_firmware staging: rtl8192e: Convert typedef SwChnlCmd to struct sw_chnl_cmd staging: rtl8192e: Convert typedef rtl_reg_debug to struct rtl_reg_debug staging: rtl8192e: Convert typedef txbbgain_struct to struct txbbgain_struct staging: rtl8192e: Convert typedef tx_ring to struct tx_ring staging: rtl8192e: Convert typedef ccktxbbgain_struct to struct ccktxbbgain staging: rtl8192e: Convert typedef DRxPathSel to struct drx_path_sel staging: rtl8192e: Convert typedef dig_t to struct dig_t staging: rtl8192e: Convert typedef DCMD_TXCMD_T to struct dcmd_txcmd staging: rtl8192e: Convert typedef rtl_fs_debug to struct rtl_fs_debug staging: rtl8192e: Convert typedef tx_pending_t to struct tx_pending staging: rtl8192e: Convert typedef IbssParms to struct ibss_parms staging: rtl8192e: Convert typedef init_gain to struct init_gain staging: rtl8192e: Convert typedef cb_desc to struct cb_desc staging: rtl8192e: Convert typedef bandwidth_autoswitch to struct bandwidth_autoswitch staging: rtl8192e: Convert typedef rate_adaptive to struct rate_adaptive staging: rtl8192e: Convert typedef mp_adapter to struct mp_adapter staging: rtl8192e: Convert typedef ieee_param to struct ieee_param staging: rtl8192e: Convert typedef adhoc_peer_entry_t to struct adhoc_peer_entry staging: rtl8192e: Convert typedef adhoc_peers_info_t to struct adhoc_peers_info staging: rtl8192e: Convert typedef Stats to struct rt_stats staging: rtl8192e: Convert typedef r8192_priv to struct r8192_priv staging: rtl8192e: Convert typedef buffer to struct buffer staging: rtl8192e: Convert delayed_work_struct_rsl to struct delayed_work and work_struct_rsl to struct work_struct staging: rtl8192e: Convert typedef SEQUENCE_CONTROL to union sequence_control staging: rtl8192e: Convert typedef BA_PARAM_SET to union ba_param_set staging: rtl8192e: Convert typedef DELBA_PARAM_SET to union delba_param_set staging: rtl8192e: Convert typedef HT_CAPABILITY to union ht_capability staging: rtl8192e: Convert typedef HT_CAPABILITY_MACPARA to union ht_capability_macpara staging: rtl8192e: Convert typedef QOS_TSINFO to union qos_tsinfo staging: rtl8192e: Convert typedef TSPEC_BODY to union tspec_body staging: rtl8192e: Convert typedef QOS_TCLAS to union qos_tclas staging: rtl8192e: Convert typedef ACI_AIFSN to union aci_aifsn staging: rtl8192e: Convert typedef ECW to union ecw staging: rtl8192e: Convert typedef AC_PARAM to union ac_param staging: rtl8192e: Convert typedef frameqos to union frameqos staging: rtl8192e: Prepare header files to ease use of typedef enum conversion staging: rtl8192e: Convert typedef rtl819x_loopback_e to enum rtl819x_loopback staging: rtl8192e: Convert typedef VERSION_8190 to enum version_8190_loopback staging: rtl8192e: Convert typedef RF_OpType_E to enum rf_optype staging: rtl8192e: Convert typedef POWER_SAVE_MODE to enum power_save_mode staging: rtl8192e: Convert typedef INTERFACE_SELECT_8190PCI to enum interface_select_8190pci staging: rtl8192e: Convert typedef cmpk_element_e to enum cmpk_element staging: rtl8192e: Convert typedef firmware_init_step_e to enum firmware_init_step staging: rtl8192e: Convert typedef opt_rst_type_e to enum opt_rst_type staging: rtl8192e: Convert typedef desc_packet_type_e to enum desc_packet_type staging: rtl8192e: Convert typedef firmware_source_e to enum firmware_source staging: rtl8192e: Convert typedef firmware_status_e to enum firmware_status staging: rtl8192e: Convert typedef BaseBand_Config_Type to enum baseband_config staging: rtl8192e: Convert typedef SwChnlCmdID to enum sw_chnl_cmd_id staging: rtl8192e: Convert typedef HW90_BLOCK_E to enum hw90_block staging: rtl8192e: Convert typedef RF90_RADIO_PATH_E to enum rf90_radio_path staging: rtl8192e: Convert typedef HT_MCS_RATE to enum ht_mcs_rate staging: rtl8192e: Convert typedef HT_CHANNEL_WIDTH to enum ht_channel_width staging: rtl8192e: Convert typedef HT_EXTCHNL_OFFSET to enum ht_extchnl_offset staging: rtl8192e: Convert typedef CHNLOP to enum chnl_op staging: rtl8192e: Convert typedef HT_ACTION to enum ht_action staging: rtl8192e: Convert typedef HT_BW40_SC_E to enum ht_bw40_sc staging: rtl8192e: Convert typedef HT_SPEC_VER to enum ht_spec_ver staging: rtl8192e: Convert typedef HT_AGGRE_MODE_E to enum ht_aggre_mode staging: rtl8192e: Convert typedef HT_IOT_PEER_E to enum ht_iot_peer staging: rtl8192e: Convert typedef HT_IOT_ACTION_E to enum ht_iot_action staging: rtl8192e: Convert typedef HT_IOT_RAFUNC to enum ht_iot_rafunc staging: rtl8192e: Convert typedef RT_HT_CAPBILITY to enum rt_ht_capability staging: rtl8192e: Convert typedef ACK_POLICY to enum ack_policy staging: rtl8192e: Convert typedef QOS_ELE_SUBTYPE to enum qos_ele_subtype staging: rtl8192e: Convert typedef DIRECTION_VALUE to enum direction_value staging: rtl8192e: Convert typedef ACM_METHOD to enum acm_method staging: rtl8192e: Convert typedef TR_SELECT to enum tr_select staging: rtl8192e: Convert typedef nic_t to enum nic_t staging: rtl8192e: Convert typedef RT_EEPROM_TYPE to enum rt_eeprom_type staging: rtl8192e: Convert typedef DCMD_TXCMD_OP to enum dcmg_txcmd_op staging: rtl8192e: Convert typedef RT_RF_TYPE_819xU to enum rt_rf_type_819xu staging: rtl8192e: Convert typedef RF_STEP_E to enum rf_step staging: rtl8192e: Convert typedef RT_STATUS to enum rt_status staging: rtl8192e: Convert typedef RT_CUSTOMER_ID to enum rt_customer_id staging: rtl8192e: Convert typedef RESET_TYPE to enum reset_type staging: rtl8192e: Convert typedef IC_INFERIORITY_8192S to enum ic_inferiority_8192s staging: rtl8192e: Convert typedef PCI_BRIDGE_VENDOR to enum pci_bridge_vendor staging: rtl8192e: Convert typedef TWO_PORT_STATUS to enum two_port_status staging: rtl8192e: Convert typedef DBGP_FLAG_E to enum dbgp_flag staging: rtl8192e: Convert typedef dm_dig_sta_e to enum dm_dig_sta staging: rtl8192e: Convert typedef dm_ratr_sta_e to enum dm_ratr_sta staging: rtl8192e: Convert typedef dm_dig_op_e to enum dm_dig_op_sta staging: rtl8192e: Convert typedef dm_dig_alg_e to enum dm_dig_alg staging: rtl8192e: Convert typedef DM_DIG_TWO_PORT_ALG_E to enum dm_dig_two_port_alg staging: rtl8192e: Convert typedef DM_DIG_EXT_PORT_ALG_E to enum dm_dig_ext_port_alg staging: rtl8192e: Convert typedef dm_dig_dbg_e to enum dm_dig_dbg staging: rtl8192e: Convert typedef dm_dig_connect_e to enum dm_dig_connect staging: rtl8192e: Convert typedef dm_dig_pd_th_e to enum dm_dig_pd_th staging: rtl8192e: Convert typedef dm_dig_cs_ratio_e to enum dm_dig_cs_ratio staging: rtl8192e: Convert typedef DM_CCK_Rx_Path_Method to enum dm_cck_rx_path_method staging: rtl8192e: Convert typedef DM_DBG_E to enum dm_dbg staging: rtl8192e: Convert typedef HAL_DEF_VARIABLE to enum hal_def_variable staging: rtl8192e: Convert typedef HW_VARIABLES to enum hw_variables staging: rtl8192e: Convert typedef RT_OP_MODE to enum rt_op_mode staging: rtl8192e: Convert typedef ACT_CATEGORY to enum act_category staging: rtl8192e: Convert typedef TS_ACTION to enum ts_action staging: rtl8192e: Convert typedef BA_ACTION to enum ba_action staging: rtl8192e: Convert typedef InitialGainOpType to enum init_gain_op_type staging: rtl8192e: Convert typedef LED_CTL_MODE to enum led_ctl_mode staging: rtl8192e: Convert typedef RT_RF_TYPE_DEF to enum rt_rf_type_def staging: rtl8192e: Convert typedef WIRELESS_MODE to enum wireless_mode staging: rtl8192e: Convert typedef WIRELESS_NETWORK_TYPE to enum wireless_network_type staging: rtl8192e: Convert typedef erp_t to enum erp_t staging: rtl8192e: Convert typedef Fsync_State to enum fsync_state staging: rtl8192e: Convert typedef RT_PS_MODE to enum rt_ps_mode staging: rtl8192e: Convert typedef IPS_CALLBACK_FUNCION to enum ips_callback_function staging: rtl8192e: Convert typedef RT_JOIN_ACTION to enum rt_join_action staging: rtl8192e: Convert typedef RT_RF_POWER_STATE to enum rt_rf_power_state staging: rtl8192e: Convert typedef WOLPATTERN_TYPE to enum wol_pattern_type staging: rtl8192e: Convert typedef country_code_type_t to enum country_code_type staging: rtl8192e: Convert typedef SCAN_OPERATION_BACKUP_OPT to enum scan_op_backup_opt staging: rtl8192e: Convert typedef FW_CMD_IO_TYPE to enum fw_cmd_io_type staging: rtl8192e: Convert typedef RATR_TABLE_MODE_8192S to enum ratr_table_mode_8192s staging: rtl8192e: Convert typedef HT_AGGRE_SIZE_E to enum ht_aggre_size staging: rtl8192e: Convert typedefs that can be replaced with #define staging: rtl8192e: Remove files that are not used drivers/staging/rtl8192e/internal.h | 93 - drivers/staging/rtl8192e/kmap_types.h | 20 - drivers/staging/rtl8192e/r8180_93cx6.c | 141 - drivers/staging/rtl8192e/r8180_93cx6.h | 41 - drivers/staging/rtl8192e/r8190P_def.h | 69 +- drivers/staging/rtl8192e/r8190P_hwimg.c | 4538 ----------------------- drivers/staging/rtl8192e/r8190P_hwimg.h | 51 - drivers/staging/rtl8192e/r8190P_rtl8256.c | 38 +- drivers/staging/rtl8192e/r8190P_rtl8256.h | 2 +- drivers/staging/rtl8192e/r8190_rtl8256.c | 677 ---- drivers/staging/rtl8192e/r8190_rtl8256.h | 29 - drivers/staging/rtl8192e/r8192E.h | 1148 ------ drivers/staging/rtl8192e/r8192E_cmdpkt.c | 42 +- drivers/staging/rtl8192e/r8192E_cmdpkt.h | 49 +- drivers/staging/rtl8192e/r8192E_core.c | 5039 -------------------------- drivers/staging/rtl8192e/r8192E_core.c.porig | 5039 -------------------------- drivers/staging/rtl8192e/r8192E_core.c.rej | 5036 ------------------------- drivers/staging/rtl8192e/r8192E_dev.c | 84 +- drivers/staging/rtl8192e/r8192E_dev.h | 10 +- drivers/staging/rtl8192e/r8192E_dm.c | 2554 ------------- drivers/staging/rtl8192e/r8192E_dm.h | 228 -- drivers/staging/rtl8192e/r8192E_firmware.c | 32 +- drivers/staging/rtl8192e/r8192E_firmware.h | 30 +- drivers/staging/rtl8192e/r8192E_hw.h | 4 +- drivers/staging/rtl8192e/r8192E_phy.c | 52 +- drivers/staging/rtl8192e/r8192E_phy.h | 30 +- drivers/staging/rtl8192e/r8192E_wx.c | 1163 ------ drivers/staging/rtl8192e/r8192E_wx.h | 18 - drivers/staging/rtl8192e/r8192_pm.c | 123 - drivers/staging/rtl8192e/r8192_pm.h | 24 - drivers/staging/rtl8192e/r819xE_cmdpkt.c | 444 --- drivers/staging/rtl8192e/r819xE_cmdpkt.h | 207 -- drivers/staging/rtl8192e/r819xE_firmware.c | 351 -- drivers/staging/rtl8192e/r819xE_phy.c | 2225 ------------ drivers/staging/rtl8192e/r819xE_phy.h | 131 - drivers/staging/rtl8192e/readme | 160 - drivers/staging/rtl8192e/rtl819x_BA.h | 20 +- drivers/staging/rtl8192e/rtl819x_BAProc.c | 86 +- drivers/staging/rtl8192e/rtl819x_HT.h | 120 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 94 +- drivers/staging/rtl8192e/rtl819x_Qos.h | 107 +- drivers/staging/rtl8192e/rtl819x_TS.h | 30 +- drivers/staging/rtl8192e/rtl819x_TSProc.c | 76 +- drivers/staging/rtl8192e/rtl_cam.c | 2 +- drivers/staging/rtl8192e/rtl_core.c | 94 +- drivers/staging/rtl8192e/rtl_core.h | 205 +- drivers/staging/rtl8192e/rtl_debug.c | 8 +- drivers/staging/rtl8192e/rtl_debug.h | 10 +- drivers/staging/rtl8192e/rtl_dm.c | 36 +- drivers/staging/rtl8192e/rtl_dm.h | 80 +- drivers/staging/rtl8192e/rtl_pci.h | 8 +- drivers/staging/rtl8192e/rtl_ps.c | 16 +- drivers/staging/rtl8192e/rtl_wx.c | 24 +- drivers/staging/rtl8192e/rtllib.h | 278 +- drivers/staging/rtl8192e/rtllib_crypt.h | 2 +- drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 4 +- drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 4 +- drivers/staging/rtl8192e/rtllib_crypt_wep.c | 6 +- drivers/staging/rtl8192e/rtllib_module.c | 4 +- drivers/staging/rtl8192e/rtllib_rx.c | 58 +- drivers/staging/rtl8192e/rtllib_softmac.c | 22 +- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 6 +- drivers/staging/rtl8192e/rtllib_tx.c | 34 +- drivers/staging/rtl8192e/rtllib_wx.c | 6 +- 64 files changed, 914 insertions(+), 30448 deletions(-) delete mode 100644 drivers/staging/rtl8192e/internal.h delete mode 100644 drivers/staging/rtl8192e/kmap_types.h delete mode 100644 drivers/staging/rtl8192e/r8180_93cx6.c delete mode 100644 drivers/staging/rtl8192e/r8180_93cx6.h delete mode 100644 drivers/staging/rtl8192e/r8190P_hwimg.c delete mode 100644 drivers/staging/rtl8192e/r8190P_hwimg.h delete mode 100644 drivers/staging/rtl8192e/r8190_rtl8256.c delete mode 100644 drivers/staging/rtl8192e/r8190_rtl8256.h delete mode 100644 drivers/staging/rtl8192e/r8192E.h delete mode 100644 drivers/staging/rtl8192e/r8192E_core.c delete mode 100644 drivers/staging/rtl8192e/r8192E_core.c.porig delete mode 100644 drivers/staging/rtl8192e/r8192E_core.c.rej delete mode 100644 drivers/staging/rtl8192e/r8192E_dm.c delete mode 100644 drivers/staging/rtl8192e/r8192E_dm.h delete mode 100644 drivers/staging/rtl8192e/r8192E_wx.c delete mode 100644 drivers/staging/rtl8192e/r8192E_wx.h delete mode 100644 drivers/staging/rtl8192e/r8192_pm.c delete mode 100644 drivers/staging/rtl8192e/r8192_pm.h delete mode 100644 drivers/staging/rtl8192e/r819xE_cmdpkt.c delete mode 100644 drivers/staging/rtl8192e/r819xE_cmdpkt.h delete mode 100644 drivers/staging/rtl8192e/r819xE_firmware.c delete mode 100644 drivers/staging/rtl8192e/r819xE_phy.c delete mode 100644 drivers/staging/rtl8192e/r819xE_phy.h delete mode 100644 drivers/staging/rtl8192e/readme -- 1.7.3.4 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel