Merge remote-tracking branch 'staging/staging-next'

[karo-tx-linux.git] / drivers / staging / rtl8192u / r819xU_firmware.c

diff --git a/drivers/staging/rtl8192u/r819xU_firmware.c b/drivers/staging/rtl8192u/r819xU_firmware.c
index bb924ac97e471d9e5613666a18b6f8acb6c0a151..d6a6de3a64f5d6cfd4869f4879293d710ddabf2b 100644 (file)
--- a/drivers/staging/rtl8192u/r819xU_firmware.c
+++ b/drivers/staging/rtl8192u/r819xU_firmware.c
@@ -61,20 +61,16 @@ bool fw_download_code(struct net_device *dev, u8 *code_virtual_address, u32 buff
                /* Allocate skb buffer to contain firmware info and tx descriptor info
                 * add 4 to avoid packet appending overflow.
                 * */
-               #ifdef RTL8192U
                skb  = dev_alloc_skb(USB_HWDESC_HEADER_LEN + frag_length + 4);
-               #else
-               skb  = dev_alloc_skb(frag_length + 4);
-               #endif
+               if (!skb)
+                       return false;
                memcpy((unsigned char *)(skb->cb),&dev,sizeof(dev));
                tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
                tcb_desc->queue_index = TXCMD_QUEUE;
                tcb_desc->bCmdOrInit = DESC_PACKET_TYPE_INIT;
                tcb_desc->bLastIniPkt = bLastIniPkt;
 
-               #ifdef RTL8192U
                skb_reserve(skb, USB_HWDESC_HEADER_LEN);
-               #endif
                seg_ptr = skb->data;
                /*
                 * Transform from little endian to big endian
@@ -299,16 +295,10 @@ bool init_firmware(struct net_device *dev)
                                mapped_file = pfirmware->firmware_buf;
                                file_length = fw_entry->size;
                        } else {
-#ifdef RTL8190P
-                               memcpy(pfirmware->firmware_buf,fw_entry->data,fw_entry->size);
-                               mapped_file = pfirmware->firmware_buf;
-                               file_length = fw_entry->size;
-#else
                                memset(pfirmware->firmware_buf,0,128);
                                memcpy(&pfirmware->firmware_buf[128],fw_entry->data,fw_entry->size);
                                mapped_file = pfirmware->firmware_buf;
                                file_length = fw_entry->size + 128;
-#endif
                        }
                        pfirmware->firmware_buf_size = file_length;
                }else if (rst_opt == OPT_FIRMWARE_RESET ) {
@@ -340,15 +330,6 @@ bool init_firmware(struct net_device *dev)
                         * will set polling bit when firmware code is also configured
                         */
                        pfirmware->firmware_status = FW_STATUS_1_MOVE_BOOT_CODE;
-#ifdef RTL8190P
-                       // To initialize IMEM, CPU move code  from 0x80000080, hence, we send 0x80 byte packet
-                       rt_status = fwSendNullPacket(dev, RTL8190_CPU_START_OFFSET);
-                       if (rt_status != true)
-                       {
-                               RT_TRACE(COMP_INIT, "fwSendNullPacket() fail ! \n");
-                               goto  download_firmware_fail;
-                       }
-#endif
                        //mdelay(1000);
                        /*
                         * To initialize IMEM, CPU move code  from 0x80000080,