diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index 591d8e67755..29b64f0b7c8 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -360,33 +360,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 dc7d13c0a9b..bc6c4766575 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -339,12 +339,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;