diff mbox

[v1,1/1] sdhci-pci: Use MRFLD as abbreviation of Merrifield

Message ID 1468321422-135871-1-git-send-email-andriy.shevchenko@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Andy Shevchenko July 12, 2016, 11:03 a.m. UTC 
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>
---
 drivers/mmc/host/sdhci-pci-core.c | 18 +++++++++---------
 drivers/mmc/host/sdhci-pci.h      |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

Comments

Adrian Hunter July 21, 2016, 10:13 a.m. UTC | #1 
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
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Ulf Hansson July 23, 2016, 9:37 a.m. UTC | #2 
On 12 July 2016 at 13:03, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> 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>

Thanks, applied for next!

Kind regards
Uffe


> ---
>  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
> --
> 2.8.1
>
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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