Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[net-next-2.6.git] / drivers / mmc / core / debugfs.c

diff --git a/drivers/mmc/core/debugfs.c b/drivers/mmc/core/debugfs.c
index 46bc6d7551a3e7ea7b6398a9bc44d74f5fac8c6f..eed1405fd742d5132249039f21591f2ebc5ac99a 100644 (file)
--- a/drivers/mmc/core/debugfs.c
+++ b/drivers/mmc/core/debugfs.c
@@ -134,6 +134,33 @@ static const struct file_operations mmc_ios_fops = {
        .release        = single_release,
 };
 
+static int mmc_clock_opt_get(void *data, u64 *val)
+{
+       struct mmc_host *host = data;
+
+       *val = host->ios.clock;
+
+       return 0;
+}
+
+static int mmc_clock_opt_set(void *data, u64 val)
+{
+       struct mmc_host *host = data;
+
+       /* We need this check due to input value is u64 */
+       if (val > host->f_max)
+               return -EINVAL;
+
+       mmc_claim_host(host);
+       mmc_set_clock(host, (unsigned int) val);
+       mmc_release_host(host);
+
+       return 0;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(mmc_clock_fops, mmc_clock_opt_get, mmc_clock_opt_set,
+       "%llu\n");
+
 void mmc_add_host_debugfs(struct mmc_host *host)
 {
        struct dentry *root;
@@ -150,11 +177,15 @@ void mmc_add_host_debugfs(struct mmc_host *host)
        host->debugfs_root = root;
 
        if (!debugfs_create_file("ios", S_IRUSR, root, host, &mmc_ios_fops))
-               goto err_ios;
+               goto err_node;
+
+       if (!debugfs_create_file("clock", S_IRUSR | S_IWUSR, root, host,
+                       &mmc_clock_fops))
+               goto err_node;
 
        return;
 
-err_ios:
+err_node:
        debugfs_remove_recursive(root);
        host->debugfs_root = NULL;
 err_root: