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

Commit ad618c99 authored by Lukas Wunner's avatar Lukas Wunner Committed by Bjorn Helgaas
Browse files

PCI: Drop CONFIG_KEXEC_CORE ifdeffery 



Drop the CONFIG_KEXEC_CORE #ifdef around reference to "kexec_in_progress".

Commit 2b94ed24 ("kexec: define kexec_in_progress in !CONFIG_KEXEC
case") has made this unnecessary.

Signed-off-by: default avatarLukas Wunner <lukas@wunner.de>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 29b4817d

drivers/pci/pci-driver.c

+0 −2
Original line number Diff line number Diff line
@@ -466,7 +466,6 @@ static void pci_device_shutdown(struct device *dev) 
	pci_msi_shutdown(pci_dev);

	pci_msix_shutdown(pci_dev);



#ifdef CONFIG_KEXEC_CORE

	/*

	 * If this is a kexec reboot, turn off Bus Master bit on the

	 * device to tell it to not continue to do DMA. Don't touch
@@ -476,7 +475,6 @@ static void pci_device_shutdown(struct device *dev) 
	 */

	if (kexec_in_progress && (pci_dev->current_state <= PCI_D3hot))

		pci_clear_master(pci_dev);

#endif

}



#ifdef CONFIG_PM