diff options
| author | Philipp Hortmann <philipp.g.hortmann@gmail.com> | 2023-02-07 21:16:39 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-08 15:32:16 +0300 |
| commit | 0e8696f0e93ceb6d6804352ab04080062cb6209a (patch) | |
| tree | 1eb1802509da8c28d8bc716e9a2754d2c28c26fc /drivers/staging | |
| parent | 766e9d4ae73fd6ad75ca19dd1abac97f5c49ebae (diff) | |
| download | linux-0e8696f0e93ceb6d6804352ab04080062cb6209a.tar.xz | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/rtl_pm.c | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index cb455969f5dc..a2587300a47a 100644 --- 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 2b49820510da..8b8a870fcbbd 100644 --- 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 433272a2aae8..f846f109ed98 100644 --- 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 82b45c61ac75..9c80dc1b6e12 100644 --- 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 ? |