misc: rtsx: Use standard PCI definitions

When reading registers defined by the PCIe spec, use the names already
defined by the PCI core.  This makes maintenance of the PCI core and
drivers easier.  No functional change intended.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20200721212336.1159079-6-helgaas@kernel.org
[ additional replacements due to changes in my tree - gregkh ]
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/cardreader/rts5228.c b/drivers/misc/cardreader/rts5228.c
index f5716c63110476974148f2964d1a1d93a61980a8..28feab1449ab42b949631649213643d59907c02d 100644 (file)
--- a/drivers/misc/cardreader/rts5228.c
+++ b/drivers/misc/cardreader/rts5228.c
@@ -395,22 +395,22 @@ static void rts5228_init_from_cfg(struct rtsx_pcr *pcr)
        else
                rtsx_pci_disable_oobs_polling(pcr);
 
-       if (lval & ASPM_L1_1_EN_MASK)
+       if (lval & PCI_L1SS_CTL1_ASPM_L1_1)
                rtsx_set_dev_flag(pcr, ASPM_L1_1_EN);
        else
                rtsx_clear_dev_flag(pcr, ASPM_L1_1_EN);
 
-       if (lval & ASPM_L1_2_EN_MASK)
+       if (lval & PCI_L1SS_CTL1_ASPM_L1_2)
                rtsx_set_dev_flag(pcr, ASPM_L1_2_EN);
        else
                rtsx_clear_dev_flag(pcr, ASPM_L1_2_EN);
 
-       if (lval & PM_L1_1_EN_MASK)
+       if (lval & PCI_L1SS_CTL1_PCIPM_L1_1)
                rtsx_set_dev_flag(pcr, PM_L1_1_EN);
        else
                rtsx_clear_dev_flag(pcr, PM_L1_1_EN);
 
-       if (lval & PM_L1_2_EN_MASK)
+       if (lval & PCI_L1SS_CTL1_PCIPM_L1_2)
                rtsx_set_dev_flag(pcr, PM_L1_2_EN);
        else
                rtsx_clear_dev_flag(pcr, PM_L1_2_EN);

diff --git a/drivers/misc/cardreader/rts5249.c b/drivers/misc/cardreader/rts5249.c
index 1b8149e806c1cc8efcdba98272ad85b762c5e70a..941b3d77f1e995dfec661a8a4f5ca4770616b8cd 100644 (file)
--- a/drivers/misc/cardreader/rts5249.c
+++ b/drivers/misc/cardreader/rts5249.c
@@ -105,16 +105,16 @@ static void rts5249_init_from_cfg(struct rtsx_pcr *pcr)
 
        pci_read_config_dword(pdev, l1ss + PCI_L1SS_CTL1, &lval);
 
-       if (lval & ASPM_L1_1_EN_MASK)
+       if (lval & PCI_L1SS_CTL1_ASPM_L1_1)
                rtsx_set_dev_flag(pcr, ASPM_L1_1_EN);
 
-       if (lval & ASPM_L1_2_EN_MASK)
+       if (lval & PCI_L1SS_CTL1_ASPM_L1_2)
                rtsx_set_dev_flag(pcr, ASPM_L1_2_EN);
 
-       if (lval & PM_L1_1_EN_MASK)
+       if (lval & PCI_L1SS_CTL1_PCIPM_L1_1)
                rtsx_set_dev_flag(pcr, PM_L1_1_EN);
 
-       if (lval & PM_L1_2_EN_MASK)
+       if (lval & PCI_L1SS_CTL1_PCIPM_L1_2)
                rtsx_set_dev_flag(pcr, PM_L1_2_EN);
 
        if (option->ltr_en) {

diff --git a/drivers/misc/cardreader/rts5260.c b/drivers/misc/cardreader/rts5260.c
index ebf77643cc90ae0250de0e866b3d1071c10580f2..b9f66b1384a61a251a3652265d7c23dd7a24ba0b 100644 (file)
--- a/drivers/misc/cardreader/rts5260.c
+++ b/drivers/misc/cardreader/rts5260.c
@@ -508,16 +508,16 @@ static void rts5260_init_from_cfg(struct rtsx_pcr *pcr)
 
        pci_read_config_dword(pdev, l1ss + PCI_L1SS_CTL1, &lval);
 
-       if (lval & ASPM_L1_1_EN_MASK)
+       if (lval & PCI_L1SS_CTL1_ASPM_L1_1)
                rtsx_set_dev_flag(pcr, ASPM_L1_1_EN);
 
-       if (lval & ASPM_L1_2_EN_MASK)
+       if (lval & PCI_L1SS_CTL1_ASPM_L1_2)
                rtsx_set_dev_flag(pcr, ASPM_L1_2_EN);
 
-       if (lval & PM_L1_1_EN_MASK)
+       if (lval & PCI_L1SS_CTL1_PCIPM_L1_1)
                rtsx_set_dev_flag(pcr, PM_L1_1_EN);
 
-       if (lval & PM_L1_2_EN_MASK)
+       if (lval & PCI_L1SS_CTL1_PCIPM_L1_2)
                rtsx_set_dev_flag(pcr, PM_L1_2_EN);
 
        rts5260_pwr_saving_setting(pcr);

diff --git a/drivers/misc/cardreader/rts5261.c b/drivers/misc/cardreader/rts5261.c
index 4b6e3fe4a007043901f7e01366174bfe1198cdff..471961487ff8fcc92798d39cb20c2d9fa8564170 100644 (file)
--- a/drivers/misc/cardreader/rts5261.c
+++ b/drivers/misc/cardreader/rts5261.c
@@ -423,22 +423,22 @@ static void rts5261_init_from_cfg(struct rtsx_pcr *pcr)
 
        pci_read_config_dword(pdev, l1ss + PCI_L1SS_CTL1, &lval);
 
-       if (lval & ASPM_L1_1_EN_MASK)
+       if (lval & PCI_L1SS_CTL1_ASPM_L1_1)
                rtsx_set_dev_flag(pcr, ASPM_L1_1_EN);
        else
                rtsx_clear_dev_flag(pcr, ASPM_L1_1_EN);
 
-       if (lval & ASPM_L1_2_EN_MASK)
+       if (lval & PCI_L1SS_CTL1_ASPM_L1_2)
                rtsx_set_dev_flag(pcr, ASPM_L1_2_EN);
        else
                rtsx_clear_dev_flag(pcr, ASPM_L1_2_EN);
 
-       if (lval & PM_L1_1_EN_MASK)
+       if (lval & PCI_L1SS_CTL1_PCIPM_L1_1)
                rtsx_set_dev_flag(pcr, PM_L1_1_EN);
        else
                rtsx_clear_dev_flag(pcr, PM_L1_1_EN);
 
-       if (lval & PM_L1_2_EN_MASK)
+       if (lval & PCI_L1SS_CTL1_PCIPM_L1_2)
                rtsx_set_dev_flag(pcr, PM_L1_2_EN);
        else
                rtsx_clear_dev_flag(pcr, PM_L1_2_EN);

diff --git a/include/linux/rtsx_pci.h b/include/linux/rtsx_pci.h
index f146ca413f38aad9f551ae980272e12fd1c10588..745f5e73f99acdd4f41b2e5dd3e6048df86c83a2 100644 (file)
--- a/include/linux/rtsx_pci.h
+++ b/include/linux/rtsx_pci.h
@@ -1083,11 +1083,6 @@ struct pcr_ops {
 
 enum PDEV_STAT  {PDEV_STAT_IDLE, PDEV_STAT_RUN};
 
-#define ASPM_L1_1_EN_MASK              BIT(3)
-#define ASPM_L1_2_EN_MASK              BIT(2)
-#define PM_L1_1_EN_MASK                BIT(1)
-#define PM_L1_2_EN_MASK                BIT(0)
-
 #define ASPM_L1_1_EN                   BIT(0)
 #define ASPM_L1_2_EN                   BIT(1)
 #define PM_L1_1_EN                             BIT(2)