diff options
Diffstat (limited to 'drivers/staging/rtl8192su/r819xU_firmware.c')
| -rw-r--r-- | drivers/staging/rtl8192su/r819xU_firmware.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/staging/rtl8192su/r819xU_firmware.c b/drivers/staging/rtl8192su/r819xU_firmware.c index 219f71e8cda7..6a10bc11d97a 100644 --- a/drivers/staging/rtl8192su/r819xU_firmware.c +++ b/drivers/staging/rtl8192su/r819xU_firmware.c @@ -11,14 +11,12 @@ * NDIS_STATUS_FAILURE - the following initialization process should be terminated * NDIS_STATUS_SUCCESS - if firmware initialization process success **************************************************************************************************/ -//#include "ieee80211.h" #include "r8192U.h" #include "r8192U_hw.h" #include "r819xU_firmware_img.h" #include "r819xU_firmware.h" -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) #include <linux/firmware.h> -#endif + void firmware_init_param(struct net_device *dev) { struct r8192_priv *priv = ieee80211_priv(dev); @@ -339,11 +337,8 @@ bool init_firmware(struct net_device *dev) * Download boot, main, and data image for System reset. * Download data image for firmware reseta */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) - priv->firmware_source = FW_SOURCE_HEADER_FILE; -#else priv->firmware_source = FW_SOURCE_IMG_FILE; -#endif + for(init_step = starting_state; init_step <= FW_INIT_STEP2_DATA; init_step++) { /* * Open Image file, and map file to contineous memory if open file success. @@ -352,7 +347,6 @@ bool init_firmware(struct net_device *dev) if(rst_opt == OPT_SYSTEM_RESET) { switch(priv->firmware_source) { case FW_SOURCE_IMG_FILE: -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) if(pfirmware->firmware_buf_size[init_step] == 0) { rc = request_firmware(&fw_entry, fw_name[init_step],&priv->udev->dev); if(rc < 0 ) { @@ -383,16 +377,12 @@ bool init_firmware(struct net_device *dev) } //pfirmware->firmware_buf_size = file_length; -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) if(rst_opt == OPT_SYSTEM_RESET) { release_firmware(fw_entry); } -#endif } mapped_file = pfirmware->firmware_buf[init_step]; file_length = pfirmware->firmware_buf_size[init_step]; -#endif - break; case FW_SOURCE_HEADER_FILE: |