]> git.baikalelectronics.ru Git - kernel.git/commit
PCI: Consolidate conditions to allow runtime PM on PCIe ports
authorLukas Wunner <lukas@wunner.de>
Fri, 28 Oct 2016 08:52:06 +0000 (10:52 +0200)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 18 Nov 2016 00:46:22 +0000 (18:46 -0600)
commit79d4b5d42d08cdffb2f91df4705d8adad295e1c4
treec87e7380bc65cb413430988b6f41a19b752ae000
parent05785fee19595ab82cea2ba3450b0b22bced3a66
PCI: Consolidate conditions to allow runtime PM on PCIe ports

The conditions to allow runtime PM on PCIe ports are currently spread
across two different files:  The condition relating to hotplug ports is
located in portdrv_pci.c whereas all other conditions are located in pci.c.

Consolidate all conditions in a single place in pci.c, thus making it
easier to follow the logic and amend conditions down the road.

Note that the condition relating to hotplug ports is inserted *before* the
condition relating to the "pcie_port_pm=force" command line option, so
runtime PM is not afforded to hotplug ports even if this option is given.
That's exactly how the code behaved up until now.  If this is not desired,
the ordering of the conditions can simply be reversed.

No functional change intended.

Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/pci/pci.c
drivers/pci/pcie/portdrv_pci.c