]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
staging: rtl8192u: remove code inside #ifdef RTL8190P in r819xU_firmware.c
authorXenia Ragiadakou <burzalodowa@gmail.com>
Sat, 21 Sep 2013 20:42:31 +0000 (23:42 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 25 Sep 2013 23:51:24 +0000 (16:51 -0700)
This patch removes the unused code that resides inside #ifdef RTL8190P since
RTL8190P is not defined.

Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8192u/r819xU_firmware.c

index 106740eef3351e523ff2553ad5ced80a60780072..d6a6de3a64f5d6cfd4869f4879293d710ddabf2b 100644 (file)
@@ -295,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 ) {
@@ -336,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,