ramips: mt7620: eMMC: fix compiler warnings in non-debug mode

[openwrt/openwrt.git] / target / linux / ramips / patches-4.9 / 0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch

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 dc55967b640e305fe34f1080834c22d08732c608..d2c8a0e08440781214623067422be2db71b02af3 100644 (file)
--- 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
@@ -248,7 +248,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +
 --- /dev/null
 +++ b/drivers/mmc/host/mtk-mmc/dbg.c
-@@ -0,0 +1,347 @@
+@@ -0,0 +1,348 @@
 +/* Copyright Statement:
 + *
 + * This software/firmware and related documentation ("MediaTek Software") are
@@ -299,16 +299,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +#include "mt6575_sd.h"
 +#include <linux/seq_file.h>
 +
-+static char cmd_buf[256];
-+
-+/* for debug zone */
-+unsigned int sd_debug_zone[4]={
-+      0,
-+      0,
-+      0,
-+      0
-+};
-+
 +/* mode select */
 +u32 dma_size[4]={
 +      512,
@@ -324,6 +314,17 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +};
 +
 +#if defined (MT6575_SD_DEBUG)
++static char cmd_buf[256];
++
++/* for debug zone */
++static unsigned int sd_debug_zone[4]={
++      0,
++      0,
++      0,
++      0
++};
++
++
 +/* for driver profile */
 +#define TICKS_ONE_MS  (13000)
 +u32 gpt_enable = 0;
@@ -1761,7 +1762,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +
 --- /dev/null
 +++ b/drivers/mmc/host/mtk-mmc/sd.c
-@@ -0,0 +1,3067 @@
+@@ -0,0 +1,3057 @@
 +/* Copyright Statement:
 + *
 + * This software/firmware and related documentation ("MediaTek Software") are
@@ -1914,10 +1915,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +#define MAX_SGMT_SZ         (MAX_DMA_CNT)
 +#define MAX_REQ_SZ          (MAX_SGMT_SZ * 8)  
 +
-+#ifdef MT6575_SD_DEBUG
-+static struct msdc_regs *msdc_reg[HOST_MAX_NUM];
-+#endif 
-+
 +static int mtk_sw_poll;
 +
 +static int cd_active_low = 1;
@@ -1928,7 +1925,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +//#define PERI_MSDC2_PDN    (17)
 +//#define PERI_MSDC3_PDN    (18)
 +
-+struct msdc_host *msdc_6575_host[] = {NULL,NULL,NULL,NULL};
 +#if 0 /* --- by chhung */
 +/* gate means clock power down */
 +static int g_clk_gate = 0; 
@@ -4360,10 +4356,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +    u32 base = host->base;
 +    struct msdc_hw *hw = host->hw;
 +
-+#ifdef MT6575_SD_DEBUG        
-+    msdc_reg[host->id] = (struct msdc_regs *)host->base;
-+#endif
-+
 +    /* Power on */
 +#if 0 /* --- by chhung */
 +    msdc_vcore_on(host);
@@ -4551,11 +4543,11 @@ Signed-off-by: John Crispin <blogic@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)
@@ -4572,7 +4564,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +    host = mmc_priv(mmc);
 +    host->hw        = hw;
 +    host->mmc       = mmc;
-+    host->id        = pdev->id;
++    BUG_ON(pdev->id < -1);
++    BUG_ON(pdev->id >= ARRAY_SIZE(drv_mode));
++    host->id        = (pdev->id == -1) ? 0 : pdev->id;
 +    host->error     = 0;
 +    host->irq       = irq;    
 +    host->base      = (unsigned long) base;
@@ -4600,8 +4594,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +    host->dma.bd =  dma_alloc_coherent(NULL, MAX_BD_NUM  * sizeof(bd_t),  &host->dma.bd_addr,  GFP_KERNEL); 
 +    BUG_ON((!host->dma.gpd) || (!host->dma.bd));    
 +    msdc_init_gpd_bd(host, &host->dma);
-+    /*for emmc*/
-+    msdc_6575_host[pdev->id] = host;
 +    
 +#if 0
 +    tasklet_init(&host->card_tasklet, msdc_tasklet_card, (ulong)host);
@@ -4748,7 +4740,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +      { .compatible = "ralink,mt7620-sdhci" },
 +      {},
 +};
-+MODULE_DEVICE_TABLE(of, rt288x_wdt_match);
++MODULE_DEVICE_TABLE(of, mt7620_sdhci_match);
 +
 +static struct platform_driver mt_msdc_driver = {
 +    .probe   = msdc_drv_probe,
@@ -4759,7 +4751,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +#endif
 +    .driver  = {
 +        .name  = DRV_NAME,
-+        .owner = THIS_MODULE,
 +      .of_match_table = mt7620_sdhci_match,
 +    },
 +};
@@ -4829,7 +4820,3 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +module_init(mt_msdc_init);
 +module_exit(mt_msdc_exit);
 +MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION("MediaTek MT6575 SD/MMC Card Driver");
-+MODULE_AUTHOR("Infinity Chen <infinity.chen@mediatek.com>");
-+
-+EXPORT_SYMBOL(msdc_6575_host);