Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1441248
| From | Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v1 1/1] x86/pci: Use MRFLD abbreviation for Merrifield |
| Date | 2016-07-12 13:10 +0200 |
| Message-ID | <rU3JD-44Q-7@gated-at.bofh.it> (permalink) |
| Organization | linux.* mail to news gateway |
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: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- arch/x86/pci/intel_mid_pci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c index 5413d6a..5a18aed 100644 --- a/arch/x86/pci/intel_mid_pci.c +++ b/arch/x86/pci/intel_mid_pci.c @@ -36,8 +36,8 @@ #define PCIE_CAP_OFFSET 0x100 /* Quirks for the listed devices */ -#define PCI_DEVICE_ID_INTEL_MRFL_MMC 0x1190 -#define PCI_DEVICE_ID_INTEL_MRFL_HSU 0x1191 +#define PCI_DEVICE_ID_INTEL_MRFLD_MMC 0x1190 +#define PCI_DEVICE_ID_INTEL_MRFLD_HSU 0x1191 /* Fixed BAR fields */ #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) * Skip HS UART common registers device since it has * 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; /* * TNG has IRQ0 assigned to eMMC controller. But there @@ -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 * 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; } break; -- 2.8.1
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
[PATCH v1 1/1] x86/pci: Use MRFLD abbreviation for Merrifield Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-07-12 13:10 +0200
Re: [PATCH v1 1/1] x86/pci: Use MRFLD abbreviation for Merrifield Ingo Molnar <mingo@kernel.org> - 2016-07-13 09:30 +0200
Re: [PATCH v1 1/1] x86/pci: Use MRFLD abbreviation for Merrifield Bjorn Helgaas <helgaas@kernel.org> - 2016-07-18 18:50 +0200
Re: [PATCH v1 1/1] x86/pci: Use MRFLD abbreviation for Merrifield Ingo Molnar <mingo@kernel.org> - 2016-07-18 19:40 +0200
[tip:x86/platform] x86/pci: Use MRFLD abbreviation for Merrifield tip-bot for Andy Shevchenko <tipbot@zytor.com> - 2016-07-13 10:10 +0200
csiph-web