Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[linux-2.6-microblaze.git] / drivers / clk / tegra / clk-dfll.c

diff --git a/drivers/clk/tegra/clk-dfll.c b/drivers/clk/tegra/clk-dfll.c
index 0400e5b..1fc71ba 100644 (file)
--- a/drivers/clk/tegra/clk-dfll.c
+++ b/drivers/clk/tegra/clk-dfll.c
@@ -1293,8 +1293,8 @@ static int attr_enable_set(void *data, u64 val)
 
        return val ? dfll_enable(td) : dfll_disable(td);
 }
-DEFINE_SIMPLE_ATTRIBUTE(enable_fops, attr_enable_get, attr_enable_set,
-                       "%llu\n");
+DEFINE_DEBUGFS_ATTRIBUTE(enable_fops, attr_enable_get, attr_enable_set,
+                        "%llu\n");
 
 static int attr_lock_get(void *data, u64 *val)
 {
@@ -1310,8 +1310,7 @@ static int attr_lock_set(void *data, u64 val)
 
        return val ? dfll_lock(td) :  dfll_unlock(td);
 }
-DEFINE_SIMPLE_ATTRIBUTE(lock_fops, attr_lock_get, attr_lock_set,
-                       "%llu\n");
+DEFINE_DEBUGFS_ATTRIBUTE(lock_fops, attr_lock_get, attr_lock_set, "%llu\n");
 
 static int attr_rate_get(void *data, u64 *val)
 {
@@ -1328,7 +1327,7 @@ static int attr_rate_set(void *data, u64 val)
 
        return dfll_request_rate(td, val);
 }
-DEFINE_SIMPLE_ATTRIBUTE(rate_fops, attr_rate_get, attr_rate_set, "%llu\n");
+DEFINE_DEBUGFS_ATTRIBUTE(rate_fops, attr_rate_get, attr_rate_set, "%llu\n");
 
 static int attr_registers_show(struct seq_file *s, void *data)
 {
@@ -1379,10 +1378,11 @@ static void dfll_debug_init(struct tegra_dfll *td)
        root = debugfs_create_dir("tegra_dfll_fcpu", NULL);
        td->debugfs_dir = root;
 
-       debugfs_create_file("enable", S_IRUGO | S_IWUSR, root, td, &enable_fops);
-       debugfs_create_file("lock", S_IRUGO, root, td, &lock_fops);
-       debugfs_create_file("rate", S_IRUGO, root, td, &rate_fops);
-       debugfs_create_file("registers", S_IRUGO, root, td, &attr_registers_fops);
+       debugfs_create_file_unsafe("enable", 0644, root, td,
+                                  &enable_fops);
+       debugfs_create_file_unsafe("lock", 0444, root, td, &lock_fops);
+       debugfs_create_file_unsafe("rate", 0444, root, td, &rate_fops);
+       debugfs_create_file("registers", 0444, root, td, &attr_registers_fops);
 }
 
 #else