Commit e99a0745 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Ingo Molnar

x86/pci, x86/platform/intel_mid_pci: Remove duplicate power off code

Intel MID platforms (Moorestown, Medfield, Clovertrail, Merrifield) are
sharing the code in the intel_mid_pci.c module. There is no need to
power off specific Moorestown devices after the following commit:

  5823d089 ("x86/platform/intel-mid: Add Power Management Unit driver")

... because the condition in mrfld_power_off_dev() is true for any platform
from the above list.

Remove duplicate power off certain devices on Intel Moorestown and rename
the affected functions to show that they are applied to any of Intel MID
platforms.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1467749348-100518-1-git-send-email-andriy.shevchenko@linux.intel.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 0519e8b4
...@@ -316,7 +316,7 @@ static void pci_d3delay_fixup(struct pci_dev *dev) ...@@ -316,7 +316,7 @@ static void pci_d3delay_fixup(struct pci_dev *dev)
} }
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_ANY_ID, pci_d3delay_fixup); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_ANY_ID, pci_d3delay_fixup);
static void mid_power_off_dev(struct pci_dev *dev) static void mid_power_off_one_device(struct pci_dev *dev)
{ {
u16 pmcsr; u16 pmcsr;
...@@ -330,12 +330,7 @@ static void mid_power_off_dev(struct pci_dev *dev) ...@@ -330,12 +330,7 @@ static void mid_power_off_dev(struct pci_dev *dev)
pci_set_power_state(dev, PCI_D3hot); pci_set_power_state(dev, PCI_D3hot);
} }
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0801, mid_power_off_dev); static void mid_power_off_devices(struct pci_dev *dev)
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0809, mid_power_off_dev);
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x080C, mid_power_off_dev);
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0815, mid_power_off_dev);
static void mrfld_power_off_dev(struct pci_dev *dev)
{ {
int id; int id;
...@@ -350,10 +345,10 @@ static void mrfld_power_off_dev(struct pci_dev *dev) ...@@ -350,10 +345,10 @@ static void mrfld_power_off_dev(struct pci_dev *dev)
* This sets only PMCSR bits. The actual power off will happen in * This sets only PMCSR bits. The actual power off will happen in
* arch/x86/platform/intel-mid/pwr.c. * arch/x86/platform/intel-mid/pwr.c.
*/ */
mid_power_off_dev(dev); mid_power_off_one_device(dev);
} }
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_ANY_ID, mrfld_power_off_dev); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_ANY_ID, mid_power_off_devices);
/* /*
* Langwell devices reside at fixed offsets, don't try to move them. * Langwell devices reside at fixed offsets, don't try to move them.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment