From 357f7f515e66f86627ad7f3dfd04263ebfb775f9 Mon Sep 17 00:00:00 2001 From: Subhash Jadavani Date: Tue, 22 May 2012 22:59:54 +0530 Subject: [PATCH] mmc: host: remove mmcq performance numbers statistics mmcq performance numbers are not captured since asynchronous MMC request support got added in MMC block driver. So printing out these numbers (which are all zeros) just adds confusion. This patch removes the printing of mmcq performance numbers statistics. CRs-Fixed: 364206 Change-Id: I7213b11c8e9e055894c9902af7e975de3be1c519 Signed-off-by: Subhash Jadavani --- drivers/mmc/core/host.c | 17 ++++------------- include/linux/mmc/host.h | 4 ---- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index 38fe00671649..44560b15ce57 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -615,33 +615,24 @@ static ssize_t show_perf(struct device *dev, struct device_attribute *attr, char *buf) { struct mmc_host *host = dev_get_drvdata(dev); - int64_t rtime_mmcq, wtime_mmcq, rtime_drv, wtime_drv; - unsigned long rbytes_mmcq, wbytes_mmcq, rbytes_drv, wbytes_drv; + int64_t rtime_drv, wtime_drv; + unsigned long rbytes_drv, wbytes_drv; spin_lock(&host->lock); - rbytes_mmcq = host->perf.rbytes_mmcq; - wbytes_mmcq = host->perf.wbytes_mmcq; rbytes_drv = host->perf.rbytes_drv; wbytes_drv = host->perf.wbytes_drv; - rtime_mmcq = ktime_to_us(host->perf.rtime_mmcq); - wtime_mmcq = ktime_to_us(host->perf.wtime_mmcq); rtime_drv = ktime_to_us(host->perf.rtime_drv); wtime_drv = ktime_to_us(host->perf.wtime_drv); spin_unlock(&host->lock); - return snprintf(buf, PAGE_SIZE, "Write performance at MMCQ Level:" - "%lu bytes in %lld microseconds\n" - "Read performance at MMCQ Level:" - "%lu bytes in %lld microseconds\n" - "Write performance at driver Level:" + return snprintf(buf, PAGE_SIZE, "Write performance at driver Level:" "%lu bytes in %lld microseconds\n" "Read performance at driver Level:" "%lu bytes in %lld microseconds\n", - wbytes_mmcq, wtime_mmcq, rbytes_mmcq, - rtime_mmcq, wbytes_drv, wtime_drv, + wbytes_drv, wtime_drv, rbytes_drv, rtime_drv); } diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 0600ae0d3cb5..996969baca0a 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -432,12 +432,8 @@ struct mmc_host { #ifdef CONFIG_MMC_PERF_PROFILING struct { - unsigned long rbytes_mmcq; /* Rd bytes MMC queue */ - unsigned long wbytes_mmcq; /* Wr bytes MMC queue */ unsigned long rbytes_drv; /* Rd bytes MMC Host */ unsigned long wbytes_drv; /* Wr bytes MMC Host */ - ktime_t rtime_mmcq; /* Rd time MMC queue */ - ktime_t wtime_mmcq; /* Wr time MMC queue */ ktime_t rtime_drv; /* Rd time MMC Host */ ktime_t wtime_drv; /* Wr time MMC Host */ ktime_t start;