PCI: acpiphp: Replace local macros with standard ACPI macros

Replace local defined macros (ACPI_STA_xxx) with standard ACPI macros
(ACPI_STA_DEVICE_xxx).

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Yinghai Lu <yinghai@kernel.org>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Toshi Kani <toshi.kani@hp.com>

diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h
index b70ac00a117e1eaa3c65939cd64555982a482f7a..1b311f9db82d733697a01d5370051e409c75279b 100644 (file)
--- a/drivers/pci/hotplug/acpiphp.h
+++ b/drivers/pci/hotplug/acpiphp.h
@@ -146,10 +146,6 @@ struct acpiphp_attention_info
 #define ACPI_PCI_HOST_HID              "PNP0A03"
 
 /* ACPI _STA method value (ignore bit 4; battery present) */
-#define ACPI_STA_PRESENT               (0x00000001)
-#define ACPI_STA_ENABLED               (0x00000002)
-#define ACPI_STA_SHOW_IN_UI            (0x00000004)
-#define ACPI_STA_FUNCTIONING           (0x00000008)
 #define ACPI_STA_ALL                   (0x0000000f)
 
 /* bridge flags */

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index a1c8dd67aae1ee354f36da22150893e6f23c3991..718464f8fd40885b1bc06c56eec168c31f71e0cf 100644 (file)
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -487,7 +487,7 @@ static int add_bridge(struct acpi_pci_root *root)
                        dbg("%s: _STA evaluation failure\n", __func__);
                        return 0;
                }
-               if ((tmp & ACPI_STA_FUNCTIONING) == 0)
+               if ((tmp & ACPI_STA_DEVICE_FUNCTIONING) == 0)
                        /* don't register this object */
                        return 0;
        }
@@ -1389,7 +1389,7 @@ u8 acpiphp_get_latch_status(struct acpiphp_slot *slot)
 
        sta = get_slot_status(slot);
 
-       return (sta & ACPI_STA_SHOW_IN_UI) ? 0 : 1;
+       return (sta & ACPI_STA_DEVICE_UI) ? 0 : 1;
 }