Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1437253
| From | Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v1 1/2] x86/platform/intel_mid_pci: Remove duplicate power off |
| Date | 2016-07-05 22:10 +0200 |
| Message-ID | <rREPp-7zl-27@gated-at.bofh.it> (permalink) |
| Organization | linux.* mail to news gateway |
Intel MID platforms (Moorestown, Medfield, Clovertrail, Merrifield) are sharing
the code in intel_mid_pci.c module. There is no need to power off specific
Moorestown devices after commit 5823d0893ec2 ("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
functions to show that they are applied to any of Intel MID platforms.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
arch/x86/pci/intel_mid_pci.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
index a971043..5413d6a 100644
--- a/arch/x86/pci/intel_mid_pci.c
+++ b/arch/x86/pci/intel_mid_pci.c
@@ -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);
-static void mid_power_off_dev(struct pci_dev *dev)
+static void mid_power_off_one_device(struct pci_dev *dev)
{
u16 pmcsr;
@@ -330,12 +330,7 @@ static void mid_power_off_dev(struct pci_dev *dev)
pci_set_power_state(dev, PCI_D3hot);
}
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0801, mid_power_off_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)
+static void mid_power_off_devices(struct pci_dev *dev)
{
int id;
@@ -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
* 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.
--
2.8.1
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
[PATCH v1 1/2] x86/platform/intel_mid_pci: Remove duplicate power off Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-07-05 22:10 +0200
[PATCH v1 2/2] x86/platform/intel-mid: Extend PWRMU to support Penwell Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-07-05 22:10 +0200
[tip:x86/platform] x86/platform/intel-mid: Extend PWRMU to support Penwell tip-bot for Andy Shevchenko <tipbot@zytor.com> - 2016-07-08 14:10 +0200
[tip:x86/platform] x86/pci, x86/platform/intel_mid_pci: Remove duplicate power off code tip-bot for Andy Shevchenko <tipbot@zytor.com> - 2016-07-08 14:10 +0200
csiph-web