Revert "mmci: provide a debugfs view of mmci status driver"

This reverts commit 0b2036e5c45d297bf12943ed714b1d630ba685aa.

Change-Id: Idf58a463d1ab254d8a5e933950ec2c883b2965dc
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/20564
Reviewed-by: Sebastian RASMUSSEN <sebastian.rasmussen@stericsson.com>
Tested-by: Sebastian RASMUSSEN <sebastian.rasmussen@stericsson.com>

2 files changed, 1 insertions, 131 deletions

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 5954b590056..0ed709bef5e 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -191,127 +191,6 @@ static const struct file_operations mmci_fops_regs = {
 	.release	= single_release,
 };
 
-static int mmci_stat_show(struct seq_file *seq, void *v)
-{
-	struct mmci_host *host = seq->private;
-
-	seq_printf(seq, "\033[1;34mMMCI Statistic\033[0m\n");
-
-	seq_printf(seq, "%-20s:%ld\n",
-			"nb core requetes", host->stat.nb_core_req);
-	seq_printf(seq, "%-20s:%ld\n",
-			"nb cmdcrcfail", host->stat.nb_cmdcrcfail);
-	seq_printf(seq, "%-20s:%ld\n",
-			"nb rx overrun", host->stat.nb_rxoverrun);
-	seq_printf(seq, "%-20s:%ld\n",
-			"nb tx underrun", host->stat.nb_txunderrun);
-	seq_printf(seq, "%-20s:%ld\n",
-			"nb datacrcfail", host->stat.nb_datacrcfail);
-	seq_printf(seq, "%-20s:%ld\n",
-			"nb datatimeout", host->stat.nb_datatimeout);
-	seq_printf(seq, "%-20s:%ld\n",
-			"nb startbiterr", host->stat.nb_startbiterr);
-
-	seq_printf(seq, "\n\033[1;34mMMCI Status\033[0m\n");
-	seq_printf(seq, "%-20s:", "completion pending");
-	switch (host->complete_what) {
-	case COMPLETION_NONE:
-		seq_printf(seq, "COMPLETION_NONE");
-		break;
-	case COMPLETION_FINALIZE:
-		seq_printf(seq, "COMPLETION_FINALIZE");
-		break;
-	case COMPLETION_REQ:
-		seq_printf(seq, "COMPLETION_REQ");
-		break;
-	case COMPLETION_CMDSENT:
-		seq_printf(seq, "COMPLETION_CMDSENT");
-		break;
-	case COMPLETION_RSPFIN:
-		seq_printf(seq, "COMPLETION_RSPFIN");
-		break;
-	case COMPLETION_XFERFINISH:
-		seq_printf(seq, "COMPLETION_XFERFINISH");
-		break;
-	case COMPLETION_XFERFINISH_RSPFIN:
-		seq_printf(seq, "COMPLETION_XFERFINISH_RSPFIN");
-		break;
-	default:
-		seq_printf(seq, "warning not define");
-		break;
-	}
-	seq_printf(seq, "\n");
-
-	seq_printf(seq, "%-20s:", "completion dma");
-	switch (host->dma_complete) {
-	case COMPLETION_DMA_NONE:
-		seq_printf(seq, "COMPLETION_DMA_NONE");
-		break;
-	case COMPLETION_DMA_START:
-		seq_printf(seq, "COMPLETION_DMA_START");
-		break;
-	case COMPLETION_DMA_XFERFINISH:
-		seq_printf(seq, "COMPLETION_DMA_XFERFINISH");
-		break;
-	default:
-		seq_printf(seq, "warning not define");
-		break;
-	}
-	seq_printf(seq, "\n");
-
-	seq_printf(seq, "%-20s:", "pio active");
-	switch (host->pio_active) {
-	case XFER_NONE:
-		seq_printf(seq, "XFER_NONE");
-		break;
-	case XFER_READ:
-		seq_printf(seq, "XFER_READ");
-		break;
-	case XFER_WRITE:
-		seq_printf(seq, "XFER_WRITE");
-		break;
-	default:
-		seq_printf(seq, "warning not define");
-		break;
-	}
-	seq_printf(seq, "\n");
-
-	seq_printf(seq, "%-20s:", "imask0");
-	seq_printf(seq, "0x%x\n", host->mmci_mask0);
-	seq_printf(seq, "%-20s:", "imask1");
-	seq_printf(seq, "0x%x\n", host->mmci_mask1);
-
-	seq_printf(seq, "\n\033[1;34mMMCI clock\033[0m\n");
-	seq_printf(seq, "%-20s:%d\n", "mclk", host->mclk);
-	seq_printf(seq, "%-20s:%d\n", "cclk", host->cclk);
-
-	return 0;
-}
-
-static ssize_t mmci_stat_reset(struct file *filp,
-		const char __user *ubuf, size_t count, loff_t *ppos)
-{
-	struct mmci_host *host =
-		((struct seq_file *)filp->private_data)->private;
-
-	memset(&(host->stat), 0, sizeof(host->stat));
-	return count;
-}
-
-static int mmci_stat_open(struct inode *inode, struct file *file)
-{
-	return single_open(file, mmci_stat_show, inode->i_private);
-}
-
-static const struct file_operations mmci_fops_stat = {
-	.owner		= THIS_MODULE,
-	.open		= mmci_stat_open,
-	.read		= seq_read,
-	.write		= mmci_stat_reset,
-	.llseek		= seq_lseek,
-	.release	= single_release,
-};
-
 static void mmci_debugfs_create(struct mmci_host *host)
 {
 	host->debug_regs = debugfs_create_file("regs", S_IRUGO,
@@ -321,20 +200,11 @@ static void mmci_debugfs_create(struct mmci_host *host)
 	if (IS_ERR(host->debug_regs))
 		dev_err(mmc_dev(host->mmc),
 				"failed to create debug regs file\n");
-
-	host->debug_stat = debugfs_create_file("stat", S_IRUGO | S_IWUSR,
-					       host->mmc->debugfs_root, host,
-					       &mmci_fops_stat);
-
-	if (IS_ERR(host->debug_stat))
-		dev_err(mmc_dev(host->mmc),
-				"failed to create debug stat file\n");
 }
 
 static void mmci_debugfs_remove(struct mmci_host *host)
 {
 	debugfs_remove(host->debug_regs);
-	debugfs_remove(host->debug_stat);
 }
 
 #else
diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
index 58107ed4a19..0a0c4810cf8 100644
--- a/drivers/mmc/host/mmci.h
+++ b/drivers/mmc/host/mmci.h
@@ -180,6 +180,7 @@ struct mmci_stat{
 	unsigned long		nb_datacrcfail;
 	unsigned long		nb_datatimeout;
 	unsigned long		nb_startbiterr;
+	unsigned long		nb_dma_err;
 };
 
 struct mmci_host {
@@ -255,6 +256,5 @@ struct mmci_host {
 	struct mmci_stat	stat;
 #ifdef CONFIG_DEBUG_FS
 	struct dentry		*debug_regs;
-	struct dentry		*debug_stat;
 #endif
 };