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

Commit 9310f0dc authored by Mika Westerberg's avatar Mika Westerberg Committed by Bjorn Helgaas
Browse files

PCI: pciehp: Rename host->native_hotplug to host->native_pcie_hotplug 



Rename host->native_hotplug to host->native_pcie_hotplug to make room for a
similar flag for SHPC hotplug.

Suggested-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
[bhelgaas: split to separate patch]
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 408fec36

drivers/acpi/pci_root.c

+1 −1
Original line number Diff line number Diff line
@@ -902,7 +902,7 @@ struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root, 


	host_bridge = to_pci_host_bridge(bus->bridge);

	if (!(root->osc_control_set & OSC_PCI_EXPRESS_NATIVE_HP_CONTROL))

		host_bridge->native_hotplug = 0;

		host_bridge->native_pcie_hotplug = 0;

	if (!(root->osc_control_set & OSC_PCI_EXPRESS_AER_CONTROL))

		host_bridge->native_aer = 0;

	if (!(root->osc_control_set & OSC_PCI_EXPRESS_PME_CONTROL))

drivers/pci/pcie/portdrv_core.c

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ static int get_port_device_capability(struct pci_dev *dev) 
	int services = 0;



	if (dev->is_hotplug_bridge &&

	    (pcie_ports_native || host->native_hotplug)) {

	    (pcie_ports_native || host->native_pcie_hotplug)) {

		services |= PCIE_PORT_SERVICE_HP;



		/*

drivers/pci/probe.c

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ struct pci_host_bridge *pci_alloc_host_bridge(size_t priv) 
	 * OS from interfering.

	 */

	bridge->native_aer = 1;

	bridge->native_hotplug = 1;

	bridge->native_pcie_hotplug = 1;

	bridge->native_pme = 1;



	return bridge;

include/linux/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ struct pci_host_bridge { 
	unsigned int	ignore_reset_delay:1;	/* For entire hierarchy */

	unsigned int	no_ext_tags:1;		/* No Extended Tags */

	unsigned int	native_aer:1;		/* OS may use PCIe AER */

	unsigned int	native_hotplug:1;	/* OS may use PCIe hotplug */

	unsigned int	native_pcie_hotplug:1;	/* OS may use PCIe hotplug */

	unsigned int	native_pme:1;		/* OS may use PCIe PME */

	/* Resource alignment requirements */

	resource_size_t (*align_resource)(struct pci_dev *dev,