Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mmc: sdhci-pltfm: remove the unneeded check of disabled device

Since commit cd1e65044d44 ("of/device: Don't register disabled
devices"), the disabled device will not be registered at all. So
we don't need to do the check again in the platform device driver.

And the check in the current code is useless even if we really
run into a disabled device. In this case, it just doesn't parse
the dtb for the infos such as quirks or clock, but it will continue
to try to init the disabled device after that check. So just remove it.

Signed-off-by: Kevin Hao <haokexin@gmail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

authored by

Kevin Hao and committed by
Ulf Hansson
5ec35820 01df7ecd

+26 -28
+26 -28
drivers/mmc/host/sdhci-pltfm.c
··· 75 75 u32 bus_width; 76 76 int size; 77 77 78 - if (of_device_is_available(np)) { 79 - if (of_get_property(np, "sdhci,auto-cmd12", NULL)) 80 - host->quirks |= SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12; 78 + if (of_get_property(np, "sdhci,auto-cmd12", NULL)) 79 + host->quirks |= SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12; 81 80 82 - if (of_get_property(np, "sdhci,1-bit-only", NULL) || 83 - (of_property_read_u32(np, "bus-width", &bus_width) == 0 && 84 - bus_width == 1)) 85 - host->quirks |= SDHCI_QUIRK_FORCE_1_BIT_DATA; 81 + if (of_get_property(np, "sdhci,1-bit-only", NULL) || 82 + (of_property_read_u32(np, "bus-width", &bus_width) == 0 && 83 + bus_width == 1)) 84 + host->quirks |= SDHCI_QUIRK_FORCE_1_BIT_DATA; 86 85 87 - if (sdhci_of_wp_inverted(np)) 88 - host->quirks |= SDHCI_QUIRK_INVERTED_WRITE_PROTECT; 86 + if (sdhci_of_wp_inverted(np)) 87 + host->quirks |= SDHCI_QUIRK_INVERTED_WRITE_PROTECT; 89 88 90 - if (of_get_property(np, "broken-cd", NULL)) 91 - host->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION; 89 + if (of_get_property(np, "broken-cd", NULL)) 90 + host->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION; 92 91 93 - if (of_get_property(np, "no-1-8-v", NULL)) 94 - host->quirks2 |= SDHCI_QUIRK2_NO_1_8_V; 92 + if (of_get_property(np, "no-1-8-v", NULL)) 93 + host->quirks2 |= SDHCI_QUIRK2_NO_1_8_V; 95 94 96 - if (of_device_is_compatible(np, "fsl,p2020-rev1-esdhc")) 97 - host->quirks |= SDHCI_QUIRK_BROKEN_DMA; 95 + if (of_device_is_compatible(np, "fsl,p2020-rev1-esdhc")) 96 + host->quirks |= SDHCI_QUIRK_BROKEN_DMA; 98 97 99 - if (of_device_is_compatible(np, "fsl,p2020-esdhc") || 100 - of_device_is_compatible(np, "fsl,p1010-esdhc") || 101 - of_device_is_compatible(np, "fsl,t4240-esdhc") || 102 - of_device_is_compatible(np, "fsl,mpc8536-esdhc")) 103 - host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL; 98 + if (of_device_is_compatible(np, "fsl,p2020-esdhc") || 99 + of_device_is_compatible(np, "fsl,p1010-esdhc") || 100 + of_device_is_compatible(np, "fsl,t4240-esdhc") || 101 + of_device_is_compatible(np, "fsl,mpc8536-esdhc")) 102 + host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL; 104 103 105 - clk = of_get_property(np, "clock-frequency", &size); 106 - if (clk && size == sizeof(*clk) && *clk) 107 - pltfm_host->clock = be32_to_cpup(clk); 104 + clk = of_get_property(np, "clock-frequency", &size); 105 + if (clk && size == sizeof(*clk) && *clk) 106 + pltfm_host->clock = be32_to_cpup(clk); 108 107 109 - if (of_find_property(np, "keep-power-in-suspend", NULL)) 110 - host->mmc->pm_caps |= MMC_PM_KEEP_POWER; 108 + if (of_find_property(np, "keep-power-in-suspend", NULL)) 109 + host->mmc->pm_caps |= MMC_PM_KEEP_POWER; 111 110 112 - if (of_find_property(np, "enable-sdio-wakeup", NULL)) 113 - host->mmc->pm_caps |= MMC_PM_WAKE_SDIO_IRQ; 114 - } 111 + if (of_find_property(np, "enable-sdio-wakeup", NULL)) 112 + host->mmc->pm_caps |= MMC_PM_WAKE_SDIO_IRQ; 115 113 } 116 114 #else 117 115 void sdhci_get_of_property(struct platform_device *pdev) {}