Merge tag 'staging-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-microblaze.git] / drivers / staging / rtl8192e / rtl8192e / rtl_core.c

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index a51d627..11183b9 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -1973,18 +1973,11 @@ u8 rtl92e_rx_db_to_percent(s8 antpower)
 
 u8 rtl92e_evm_db_to_percent(s8 value)
 {
-       s8 ret_val;
+       s8 ret_val = clamp(-value, 0, 33) * 3;
 
-       ret_val = value;
-
-       if (ret_val >= 0)
-               ret_val = 0;
-       if (ret_val <= -33)
-               ret_val = -33;
-       ret_val = 0 - ret_val;
-       ret_val *= 3;
        if (ret_val == 99)
                ret_val = 100;
+
        return ret_val;
 }
 
@@ -2463,7 +2456,7 @@ static int _rtl92e_pci_probe(struct pci_dev *pdev,
        }
 
 
-       ioaddr = (unsigned long)ioremap_nocache(pmem_start, pmem_len);
+       ioaddr = (unsigned long)ioremap(pmem_start, pmem_len);
        if (ioaddr == (unsigned long)NULL) {
                netdev_err(dev, "ioremap failed!");
                goto err_rel_mem;