From: Adrian Hunter <adrian.hunter@intel.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-mmc@vger.kernel.org, Ulf Hansson <ulf.hansson@linaro.org>
Subject: Re: [PATCH v1 1/1] sdhci-pci: Use MRFLD as abbreviation of Merrifield
Date: Thu, 21 Jul 2016 13:13:32 +0300 [thread overview]
Message-ID: <5790A04C.2040905@intel.com> (raw)
In-Reply-To: <1468321422-135871-1-git-send-email-andriy.shevchenko@linux.intel.com>
On 12/07/16 14:03, Andy Shevchenko wrote:
> Everywhere else in the code MRFLD abbreviation is used for Intel Merrifield. Do
> the same for sdhci-pci.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
> ---
> drivers/mmc/host/sdhci-pci-core.c | 18 +++++++++---------
> drivers/mmc/host/sdhci-pci.h | 2 +-
> 2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
> index 773532d..d116d4f 100644
> --- a/drivers/mmc/host/sdhci-pci-core.c
> +++ b/drivers/mmc/host/sdhci-pci-core.c
> @@ -419,13 +419,13 @@ static const struct sdhci_pci_fixes sdhci_intel_byt_sd = {
> };
>
> /* Define Host controllers for Intel Merrifield platform */
> -#define INTEL_MRFL_EMMC_0 0
> -#define INTEL_MRFL_EMMC_1 1
> +#define INTEL_MRFLD_EMMC_0 0
> +#define INTEL_MRFLD_EMMC_1 1
>
> -static int intel_mrfl_mmc_probe_slot(struct sdhci_pci_slot *slot)
> +static int intel_mrfld_mmc_probe_slot(struct sdhci_pci_slot *slot)
> {
> - if ((PCI_FUNC(slot->chip->pdev->devfn) != INTEL_MRFL_EMMC_0) &&
> - (PCI_FUNC(slot->chip->pdev->devfn) != INTEL_MRFL_EMMC_1))
> + if ((PCI_FUNC(slot->chip->pdev->devfn) != INTEL_MRFLD_EMMC_0) &&
> + (PCI_FUNC(slot->chip->pdev->devfn) != INTEL_MRFLD_EMMC_1))
> /* SD support is not ready yet */
> return -ENODEV;
>
> @@ -435,12 +435,12 @@ static int intel_mrfl_mmc_probe_slot(struct sdhci_pci_slot *slot)
> return 0;
> }
>
> -static const struct sdhci_pci_fixes sdhci_intel_mrfl_mmc = {
> +static const struct sdhci_pci_fixes sdhci_intel_mrfld_mmc = {
> .quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,
> .quirks2 = SDHCI_QUIRK2_BROKEN_HS200 |
> SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
> .allow_runtime_pm = true,
> - .probe_slot = intel_mrfl_mmc_probe_slot,
> + .probe_slot = intel_mrfld_mmc_probe_slot,
> };
>
> /* O2Micro extra registers */
> @@ -1104,10 +1104,10 @@ static const struct pci_device_id pci_ids[] = {
>
> {
> .vendor = PCI_VENDOR_ID_INTEL,
> - .device = PCI_DEVICE_ID_INTEL_MRFL_MMC,
> + .device = PCI_DEVICE_ID_INTEL_MRFLD_MMC,
> .subvendor = PCI_ANY_ID,
> .subdevice = PCI_ANY_ID,
> - .driver_data = (kernel_ulong_t)&sdhci_intel_mrfl_mmc,
> + .driver_data = (kernel_ulong_t)&sdhci_intel_mrfld_mmc,
> },
>
> {
> diff --git a/drivers/mmc/host/sdhci-pci.h b/drivers/mmc/host/sdhci-pci.h
> index 968b81e..e1d44c0 100644
> --- a/drivers/mmc/host/sdhci-pci.h
> +++ b/drivers/mmc/host/sdhci-pci.h
> @@ -14,7 +14,7 @@
> #define PCI_DEVICE_ID_INTEL_BSW_EMMC 0x2294
> #define PCI_DEVICE_ID_INTEL_BSW_SDIO 0x2295
> #define PCI_DEVICE_ID_INTEL_BSW_SD 0x2296
> -#define PCI_DEVICE_ID_INTEL_MRFL_MMC 0x1190
> +#define PCI_DEVICE_ID_INTEL_MRFLD_MMC 0x1190
> #define PCI_DEVICE_ID_INTEL_CLV_SDIO0 0x08f9
> #define PCI_DEVICE_ID_INTEL_CLV_SDIO1 0x08fa
> #define PCI_DEVICE_ID_INTEL_CLV_SDIO2 0x08fb
>
next prev parent reply other threads:[~2016-07-21 10:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-12 11:03 [PATCH v1 1/1] sdhci-pci: Use MRFLD as abbreviation of Merrifield Andy Shevchenko
2016-07-21 10:13 ` Adrian Hunter [this message]
2016-07-23 9:37 ` Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5790A04C.2040905@intel.com \
--to=adrian.hunter@intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=linux-mmc@vger.kernel.org \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.