Commit 707a605b authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Ingo Molnar

x86/pci: Use MRFLD abbreviation for Merrifield

Everywhere in the kernel the MRFLD is used as abbreviation of Intel Merrifield.
Do the same in intel_mid_pci.c module.
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/1468321462-136016-1-git-send-email-andriy.shevchenko@linux.intel.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 06a3fcc4
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
#define PCIE_CAP_OFFSET 0x100 #define PCIE_CAP_OFFSET 0x100
/* Quirks for the listed devices */ /* Quirks for the listed devices */
#define PCI_DEVICE_ID_INTEL_MRFL_MMC 0x1190 #define PCI_DEVICE_ID_INTEL_MRFLD_MMC 0x1190
#define PCI_DEVICE_ID_INTEL_MRFL_HSU 0x1191 #define PCI_DEVICE_ID_INTEL_MRFLD_HSU 0x1191
/* Fixed BAR fields */ /* Fixed BAR fields */
#define PCIE_VNDR_CAP_ID_FIXED_BAR 0x00 /* Fixed BAR (TBD) */ #define PCIE_VNDR_CAP_ID_FIXED_BAR 0x00 /* Fixed BAR (TBD) */
...@@ -229,7 +229,7 @@ static int intel_mid_pci_irq_enable(struct pci_dev *dev) ...@@ -229,7 +229,7 @@ static int intel_mid_pci_irq_enable(struct pci_dev *dev)
* Skip HS UART common registers device since it has * Skip HS UART common registers device since it has
* IRQ0 assigned and not used by the kernel. * IRQ0 assigned and not used by the kernel.
*/ */
if (dev->device == PCI_DEVICE_ID_INTEL_MRFL_HSU) if (dev->device == PCI_DEVICE_ID_INTEL_MRFLD_HSU)
return -EBUSY; return -EBUSY;
/* /*
* TNG has IRQ0 assigned to eMMC controller. But there * TNG has IRQ0 assigned to eMMC controller. But there
...@@ -238,7 +238,7 @@ static int intel_mid_pci_irq_enable(struct pci_dev *dev) ...@@ -238,7 +238,7 @@ static int intel_mid_pci_irq_enable(struct pci_dev *dev)
* eMMC gets it. The rest of devices still could be * eMMC gets it. The rest of devices still could be
* enabled without interrupt line being allocated. * enabled without interrupt line being allocated.
*/ */
if (dev->device != PCI_DEVICE_ID_INTEL_MRFL_MMC) if (dev->device != PCI_DEVICE_ID_INTEL_MRFLD_MMC)
return 0; return 0;
} }
break; break;
......
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