Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

ramips: mt7620: eMMC: remove unused variable

Browse source 
msdc_6575_host[] is unused, just remove it. Also, it
was the source of memory corruption up until the
previous fix to this driver.

Signed-off-by: André Draszik <git@andred.net>
This commit is contained in:
André Draszik 2018-02-22 10:21:51 +00:00 committed by Mathias Kresin
parent ace1686200
commit 584b2a26f5
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1761,7 +1761,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ +
--- /dev/null --- /dev/null
+++ b/drivers/mmc/host/mtk-mmc/sd.c +++ b/drivers/mmc/host/mtk-mmc/sd.c
@@ -0,0 +1,3068 @@ @@ -0,0 +1,3065 @@
+/* Copyright Statement: +/* Copyright Statement:
+ * + *
+ * This software/firmware and related documentation ("MediaTek Software") are + * This software/firmware and related documentation ("MediaTek Software") are
@ -1928,7 +1928,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+//#define PERI_MSDC2_PDN (17) +//#define PERI_MSDC2_PDN (17)
+//#define PERI_MSDC3_PDN (18) +//#define PERI_MSDC3_PDN (18)
+ +
+struct msdc_host *msdc_6575_host[] = {NULL,NULL,NULL,NULL};
+#if 0 /* --- by chhung */ +#if 0 /* --- by chhung */
+/* gate means clock power down */ +/* gate means clock power down */
+static int g_clk_gate = 0; +static int g_clk_gate = 0;
@ -4602,8 +4601,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); + 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)); + BUG_ON((!host->dma.gpd) || (!host->dma.bd));
+ msdc_init_gpd_bd(host, &host->dma); + msdc_init_gpd_bd(host, &host->dma);
+ /*for emmc*/
+ msdc_6575_host[pdev->id] = host;
+ +
+#if 0 +#if 0
+ tasklet_init(&host->card_tasklet, msdc_tasklet_card, (ulong)host); + tasklet_init(&host->card_tasklet, msdc_tasklet_card, (ulong)host);

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

@ -1761,7 +1761,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ +
--- /dev/null --- /dev/null
+++ b/drivers/mmc/host/mtk-mmc/sd.c +++ b/drivers/mmc/host/mtk-mmc/sd.c
@@ -0,0 +1,3068 @@ @@ -0,0 +1,3065 @@
+/* Copyright Statement: +/* Copyright Statement:
+ * + *
+ * This software/firmware and related documentation ("MediaTek Software") are + * This software/firmware and related documentation ("MediaTek Software") are
@ -1928,7 +1928,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+//#define PERI_MSDC2_PDN (17) +//#define PERI_MSDC2_PDN (17)
+//#define PERI_MSDC3_PDN (18) +//#define PERI_MSDC3_PDN (18)
+ +
+struct msdc_host *msdc_6575_host[] = {NULL,NULL,NULL,NULL};
+#if 0 /* --- by chhung */ +#if 0 /* --- by chhung */
+/* gate means clock power down */ +/* gate means clock power down */
+static int g_clk_gate = 0; +static int g_clk_gate = 0;
@ -4602,8 +4601,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); + 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)); + BUG_ON((!host->dma.gpd) || (!host->dma.bd));
+ msdc_init_gpd_bd(host, &host->dma); + msdc_init_gpd_bd(host, &host->dma);
+ /*for emmc*/
+ msdc_6575_host[pdev->id] = host;
+ +
+#if 0 +#if 0
+ tasklet_init(&host->card_tasklet, msdc_tasklet_card, (ulong)host); + tasklet_init(&host->card_tasklet, msdc_tasklet_card, (ulong)host);