[openwrt/openwrt] ramips: mt7620: eMMC: fix compiler warning (misleading indentation)

LEDE Commits lede-commits at lists.infradead.org
Wed Apr 4 00:16:27 PDT 2018


mkresin pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/7d44b36c9878329b70bfdda732fa5fb6c82f2cc8

commit 7d44b36c9878329b70bfdda732fa5fb6c82f2cc8
Author: André Draszik <git at andred.net>
AuthorDate: Thu Feb 22 10:21:35 2018 +0000

    ramips: mt7620: eMMC: fix compiler warning (misleading indentation)
    
    drivers/mmc/host/mtk-mmc/sd.c:2782:5: warning: this 'if' clause does not guard... [-Wmisleading-indentation]
         if ((hw->flags & MSDC_SDIO_IRQ) || (hw->flags & MSDC_EXT_SDIO_IRQ))
         ^~
    drivers/mmc/host/mtk-mmc/sd.c:2785:2: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if'
      cd_active_low = !of_property_read_bool(pdev->dev.of_node, "mediatek,cd-high");
      ^~~~~~~~~~~~~
    
    Signed-off-by: André Draszik <git at andred.net>
---
 .../0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch          | 8 ++++----
 .../0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch          | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/target/linux/ramips/patches-4.14/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch b/target/linux/ramips/patches-4.14/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
index 3411d30..8ae3391 100644
--- a/target/linux/ramips/patches-4.14/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
+++ b/target/linux/ramips/patches-4.14/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
@@ -4551,11 +4551,11 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
 +    if ((hw->flags & MSDC_SDIO_IRQ) || (hw->flags & MSDC_EXT_SDIO_IRQ))
 +        mmc->caps |= MMC_CAP_SDIO_IRQ;  /* yes for sdio */
 +
-+	cd_active_low = !of_property_read_bool(pdev->dev.of_node, "mediatek,cd-high");
-+	mtk_sw_poll = of_property_read_bool(pdev->dev.of_node, "mediatek,cd-poll");
++    cd_active_low = !of_property_read_bool(pdev->dev.of_node, "mediatek,cd-high");
++    mtk_sw_poll = of_property_read_bool(pdev->dev.of_node, "mediatek,cd-poll");
 +
-+	if (mtk_sw_poll)
-+		mmc->caps |= MMC_CAP_NEEDS_POLL;
++    if (mtk_sw_poll)
++        mmc->caps |= MMC_CAP_NEEDS_POLL;
 +
 +    /* MMC core transfer sizes tunable parameters */
 +#if LINUX_VERSION_CODE > KERNEL_VERSION(3,10,0)
diff --git a/target/linux/ramips/patches-4.9/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch b/target/linux/ramips/patches-4.9/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
index e342de0..5b98f0a 100644
--- a/target/linux/ramips/patches-4.9/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
+++ b/target/linux/ramips/patches-4.9/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
@@ -4551,11 +4551,11 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
 +    if ((hw->flags & MSDC_SDIO_IRQ) || (hw->flags & MSDC_EXT_SDIO_IRQ))
 +        mmc->caps |= MMC_CAP_SDIO_IRQ;  /* yes for sdio */
 +
-+	cd_active_low = !of_property_read_bool(pdev->dev.of_node, "mediatek,cd-high");
-+	mtk_sw_poll = of_property_read_bool(pdev->dev.of_node, "mediatek,cd-poll");
++    cd_active_low = !of_property_read_bool(pdev->dev.of_node, "mediatek,cd-high");
++    mtk_sw_poll = of_property_read_bool(pdev->dev.of_node, "mediatek,cd-poll");
 +
-+	if (mtk_sw_poll)
-+		mmc->caps |= MMC_CAP_NEEDS_POLL;
++    if (mtk_sw_poll)
++        mmc->caps |= MMC_CAP_NEEDS_POLL;
 +
 +    /* MMC core transfer sizes tunable parameters */
 +#if LINUX_VERSION_CODE > KERNEL_VERSION(3,10,0)



More information about the lede-commits mailing list