From 4137e50494cb3496fbb6ccd27aa7b6d7c9634c1e Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Mon, 5 Dec 2011 10:28:44 -0800 Subject: [PATCH] mmc: core: Fixup delayed work clock gating patch c31b50e (mmc: core: Use delayed work in clock gating framework, 2011-11-14) missed a few things during review: o A useless pr_info() o milliseconds was written as two words o The sysfs file had units in its output Fix all three problems. Signed-off-by: Stephen Boyd Cc: Sujit Reddy Thumma Signed-off-by: Chris Ball --- Documentation/mmc/mmc-dev-attrs.txt | 2 +- drivers/mmc/core/host.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Documentation/mmc/mmc-dev-attrs.txt b/Documentation/mmc/mmc-dev-attrs.txt index b0245565875a..22ae8441489f 100644 --- a/Documentation/mmc/mmc-dev-attrs.txt +++ b/Documentation/mmc/mmc-dev-attrs.txt @@ -71,6 +71,6 @@ SD/MMC/SDIO Clock Gating Attribute Read and write access is provided to following attribute. This attribute appears only if CONFIG_MMC_CLKGATE is enabled. - clkgate_delay Tune the clock gating delay with desired value in milli seconds. + clkgate_delay Tune the clock gating delay with desired value in milliseconds. echo > /sys/class/mmc_host/mmcX/clkgate_delay diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index 817a76039743..30055f2b0d44 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -58,8 +58,7 @@ static ssize_t clkgate_delay_show(struct device *dev, struct device_attribute *attr, char *buf) { struct mmc_host *host = cls_dev_to_mmc_host(dev); - return snprintf(buf, PAGE_SIZE, "%lu millisecs\n", - host->clkgate_delay); + return snprintf(buf, PAGE_SIZE, "%lu\n", host->clkgate_delay); } static ssize_t clkgate_delay_store(struct device *dev, @@ -74,9 +73,6 @@ static ssize_t clkgate_delay_store(struct device *dev, spin_lock_irqsave(&host->clk_lock, flags); host->clkgate_delay = value; spin_unlock_irqrestore(&host->clk_lock, flags); - - pr_info("%s: clock gate delay set to %lu ms\n", - mmc_hostname(host), value); return count; }