From: Manish Narani Date: Mon, 6 Apr 2020 17:43:32 +0000 (+0530) Subject: mmc: sdhci-of-arasan: Rename sdhci_arasan_data to avoid confusion X-Git-Tag: block-5.8-2020-06-11~27^2~120 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=19ee441f2cab760921b15df11cb7ea2fb4751567;p=linux-block.git mmc: sdhci-of-arasan: Rename sdhci_arasan_data to avoid confusion There is 'struct sdhci_arasan_data' but also 'struct sdhci_arasan_of_data sdhci_arasan_data'. Rename the latter to avoid confusion with the name of the struct. Reported-by: Adrian Hunter Signed-off-by: Manish Narani Link: https://lore.kernel.org/r/1586195015-128992-4-git-send-email-manish.narani@xilinx.com Signed-off-by: Ulf Hansson --- diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c index 9e2ea3b813b3..51e134713631 100644 --- a/drivers/mmc/host/sdhci-of-arasan.c +++ b/drivers/mmc/host/sdhci-of-arasan.c @@ -354,7 +354,7 @@ static const struct sdhci_pltfm_data sdhci_arasan_pdata = { SDHCI_QUIRK2_STOP_WITH_TC, }; -static struct sdhci_arasan_of_data sdhci_arasan_data = { +static struct sdhci_arasan_of_data sdhci_arasan_generic_data = { .pdata = &sdhci_arasan_pdata, }; @@ -552,15 +552,15 @@ static const struct of_device_id sdhci_arasan_of_match[] = { /* Generic compatible below here */ { .compatible = "arasan,sdhci-8.9a", - .data = &sdhci_arasan_data, + .data = &sdhci_arasan_generic_data, }, { .compatible = "arasan,sdhci-5.1", - .data = &sdhci_arasan_data, + .data = &sdhci_arasan_generic_data, }, { .compatible = "arasan,sdhci-4.9a", - .data = &sdhci_arasan_data, + .data = &sdhci_arasan_generic_data, }, { .compatible = "xlnx,zynqmp-8.9a",