KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ramips: mt7620: eMMC: fix compiler warning (misleading indentation)

Browse source 
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@andred.net>
This commit is contained in:
André Draszik 2018-02-22 10:21:35 +00:00 committed by Mathias Kresin
parent bbbd71e3ea
commit 7d44b36c98
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
target/linux/ramips/patches-4.14/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
View file

@ -4551,11 +4551,11 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ if ((hw->flags & MSDC_SDIO_IRQ) || (hw->flags & MSDC_EXT_SDIO_IRQ)) + if ((hw->flags & MSDC_SDIO_IRQ) || (hw->flags & MSDC_EXT_SDIO_IRQ))
+ mmc->caps |= MMC_CAP_SDIO_IRQ; /* yes for sdio */ + mmc->caps |= MMC_CAP_SDIO_IRQ; /* yes for sdio */
+ +
+ cd_active_low = !of_property_read_bool(pdev->dev.of_node, "mediatek,cd-high"); + 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"); + mtk_sw_poll = of_property_read_bool(pdev->dev.of_node, "mediatek,cd-poll");
+ +
+ if (mtk_sw_poll) + if (mtk_sw_poll)
+ mmc->caps |= MMC_CAP_NEEDS_POLL; + mmc->caps |= MMC_CAP_NEEDS_POLL;
+ +
+ /* MMC core transfer sizes tunable parameters */ + /* MMC core transfer sizes tunable parameters */
+#if LINUX_VERSION_CODE > KERNEL_VERSION(3,10,0) +#if LINUX_VERSION_CODE > KERNEL_VERSION(3,10,0)

8
target/linux/ramips/patches-4.9/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
View file

@ -4551,11 +4551,11 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ if ((hw->flags & MSDC_SDIO_IRQ) || (hw->flags & MSDC_EXT_SDIO_IRQ)) + if ((hw->flags & MSDC_SDIO_IRQ) || (hw->flags & MSDC_EXT_SDIO_IRQ))
+ mmc->caps |= MMC_CAP_SDIO_IRQ; /* yes for sdio */ + mmc->caps |= MMC_CAP_SDIO_IRQ; /* yes for sdio */
+ +
+ cd_active_low = !of_property_read_bool(pdev->dev.of_node, "mediatek,cd-high"); + 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"); + mtk_sw_poll = of_property_read_bool(pdev->dev.of_node, "mediatek,cd-poll");
+ +
+ if (mtk_sw_poll) + if (mtk_sw_poll)
+ mmc->caps |= MMC_CAP_NEEDS_POLL; + mmc->caps |= MMC_CAP_NEEDS_POLL;
+ +
+ /* MMC core transfer sizes tunable parameters */ + /* MMC core transfer sizes tunable parameters */
+#if LINUX_VERSION_CODE > KERNEL_VERSION(3,10,0) +#if LINUX_VERSION_CODE > KERNEL_VERSION(3,10,0)