Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce15d873 authored by Jiang Liu's avatar Jiang Liu Committed by Bjorn Helgaas
Browse files

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: default avatarJiang Liu <jiang.liu@huawei.com>
Signed-off-by: default avatarYijing Wang <wangyijing@huawei.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarYinghai Lu <yinghai@kernel.org>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Toshi Kani <toshi.kani@hp.com>
parent 3a0e40be

drivers/pci/hotplug/acpiphp.h

+0 −4
Original line number Diff line number Diff line
@@ -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 */

drivers/pci/hotplug/acpiphp_glue.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}