These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / rtl8192u / r819xU_firmware.c

diff --git a/kernel/drivers/staging/rtl8192u/r819xU_firmware.c b/kernel/drivers/staging/rtl8192u/r819xU_firmware.c
index d27b1e2..08302df 100644 (file)
--- a/kernel/drivers/staging/rtl8192u/r819xU_firmware.c
+++ b/kernel/drivers/staging/rtl8192u/r819xU_firmware.c
@@ -66,7 +66,7 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,
                skb  = dev_alloc_skb(USB_HWDESC_HEADER_LEN + frag_length + 4);
                if (!skb)
                        return false;
-               memcpy((unsigned char *)(skb->cb),&dev,sizeof(dev));
+               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;
@@ -91,7 +91,7 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,
                if (!priv->ieee80211->check_nic_enough_desc(dev, index) ||
                       (!skb_queue_empty(&priv->ieee80211->skb_waitQ[index])) ||
                       (priv->ieee80211->queue_stop)) {
-                       RT_TRACE(COMP_FIRMWARE,"=====================================================> tx full!\n");
+                       RT_TRACE(COMP_FIRMWARE, "=====================================================> tx full!\n");
                        skb_queue_tail(&priv->ieee80211->skb_waitQ[tcb_desc->queue_index], skb);
                } else {
                        priv->ieee80211->softmac_hard_start_xmit(skb, dev);
@@ -144,7 +144,8 @@ static bool CPUcheck_maincodeok_turnonCPU(struct net_device *dev)
 
        /* Turn On CPU */
        read_nic_dword(dev, CPU_GEN, &CPU_status);
-       write_nic_byte(dev, CPU_GEN, (u8)((CPU_status|CPU_GEN_PWR_STB_CPU)&0xff));
+       write_nic_byte(dev, CPU_GEN,
+                      (u8)((CPU_status | CPU_GEN_PWR_STB_CPU) & 0xff));
        mdelay(1000);
 
        /* Check whether CPU boot OK */
@@ -242,7 +243,7 @@ bool init_firmware(struct net_device *dev)
                 * or read image file from array. Default load from IMG file
                 */
                if (rst_opt == OPT_SYSTEM_RESET) {
-                       rc = request_firmware(&fw_entry, fw_name[init_step],&priv->udev->dev);
+                       rc = request_firmware(&fw_entry, fw_name[init_step], &priv->udev->dev);
                        if (rc < 0) {
                                RT_TRACE(COMP_ERR, "request firmware fail!\n");
                                goto download_firmware_fail;
@@ -254,12 +255,12 @@ bool init_firmware(struct net_device *dev)
                        }
 
                        if (init_step != FW_INIT_STEP1_MAIN) {
-                               memcpy(pfirmware->firmware_buf,fw_entry->data,fw_entry->size);
+                               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);
+                               memcpy(&pfirmware->firmware_buf[128], fw_entry->data, fw_entry->size);
                                mapped_file = pfirmware->firmware_buf;
                                file_length = fw_entry->size + 128;
                        }
@@ -319,7 +320,7 @@ bool init_firmware(struct net_device *dev)
 
                        rt_status = CPUcheck_firmware_ready(dev);
                        if (!rt_status) {
-                               RT_TRACE(COMP_ERR, "CPUcheck_firmware_ready fail(%d)!\n",rt_status);
+                               RT_TRACE(COMP_ERR, "CPUcheck_firmware_ready fail(%d)!\n", rt_status);
                                goto download_firmware_fail;
                        }