From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752194AbcGMHZF (ORCPT ); Wed, 13 Jul 2016 03:25:05 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:34641 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751475AbcGMHY4 (ORCPT ); Wed, 13 Jul 2016 03:24:56 -0400 Date: Wed, 13 Jul 2016 09:24:35 +0200 From: Ingo Molnar To: Andy Shevchenko , Bjorn Helgaas Cc: Ingo Molnar , "H. Peter Anvin" , Thomas Gleixner , linux-kernel@vger.kernel.org, x86@kernel.org Subject: Re: [PATCH v1 1/1] x86/pci: Use MRFLD abbreviation for Merrifield Message-ID: <20160713072435.GE13006@gmail.com> References: <1468321462-136016-1-git-send-email-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1468321462-136016-1-git-send-email-andriy.shevchenko@linux.intel.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Bjorn, we already have a few incidental changes to arch/x86/pci/intel_mid_pci.c pending in the tip:x86/platform tree: e99a0745bdf8 x86/pci, x86/platform/intel_mid_pci: Remove duplicate power off code 5823d0893ec2 x86/platform/intel-mid: Add Power Management Unit driver bb27570525a7 x86/platform/intel_mid_pci: Rework IRQ0 workaround mind if I carry this patch too, or would you like to carry it in the PCI tree? Thanks, Ingo * Andy Shevchenko wrote: > 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 > --- > 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 >