staging: rtl8192e: Rename MacBlkCtrl and remove double definition

Rename constant MacBlkCtrl to MAC_BLK_CTRL to avoid CamelCase which is
not accepted by checkpatch. Remove double definition.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/8c0c46860fdb71660183fce567f7bc80e1d1ad36.1675792435.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index cb45596..a258730 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -1861,7 +1861,7 @@ void rtl92e_stop_adapter(struct net_device *dev, bool reset)
 
 
                        rtl92e_writeb(dev, PMR, 0x5);
-                       rtl92e_writeb(dev, MacBlkCtrl, 0xa);
+                       rtl92e_writeb(dev, MAC_BLK_CTRL, 0xa);
                }
        }
 

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h
index 2b49820..8b8a870 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h
@@ -242,7 +242,7 @@ enum _RTL8192PCI_HW {
        DRIVER_RSSI             = 0x32c,
        MCS_TXAGC               = 0x340,
        CCK_TXAGC               = 0x348,
-       MacBlkCtrl              = 0x403,
+       MAC_BLK_CTRL            = 0x403,
 };
 
 #define GPI 0x108

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h
index 433272a..f846f10 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h
@@ -42,8 +42,6 @@
 #define CCK_TXAGC              0x348
 
 /* Mac block on/off control register */
-#define MacBlkCtrl                     0x403
-
 #define rFPGA0_RFMOD                   0x800 /* RF mode & CCK TxSC */
 #define rFPGA0_TxInfo                  0x804
 #define rFPGA0_PSDFunction             0x808

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c
index 82b45c6..9c80dc1 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c
@@ -41,7 +41,7 @@ int rtl92e_suspend(struct device *dev_d)
                rtl92e_writel(dev, WFCRC1, 0xffffffff);
                rtl92e_writel(dev, WFCRC2, 0xffffffff);
                rtl92e_writeb(dev, PMR, 0x5);
-               rtl92e_writeb(dev, MacBlkCtrl, 0xa);
+               rtl92e_writeb(dev, MAC_BLK_CTRL, 0xa);
        }
 out_pci_suspend:
        netdev_info(dev, "WOL is %s\n", priv->rtllib->bSupportRemoteWakeUp ?