Merge remote-tracking branches 'asoc/fix/cs4270', 'asoc/fix/da7219', 'asoc/fix/hdmi...

[karo-tx-linux.git] / drivers / oprofile / oprofile_perf.c

diff --git a/drivers/oprofile/oprofile_perf.c b/drivers/oprofile/oprofile_perf.c
index 52ad942df04e3a0fe9debd69ac8c392749c2dce5..d5b2732b1b818ede3e815ed5f5d3d30030b16544 100644 (file)
--- a/drivers/oprofile/oprofile_perf.c
+++ b/drivers/oprofile/oprofile_perf.c
@@ -147,13 +147,13 @@ static int oprofile_perf_create_files(struct dentry *root)
                char buf[4];
 
                snprintf(buf, sizeof buf, "%d", i);
-               dir = oprofilefs_mkdir(root->d_sb, root, buf);
-               oprofilefs_create_ulong(root->d_sb, dir, "enabled", &counter_config[i].enabled);
-               oprofilefs_create_ulong(root->d_sb, dir, "event", &counter_config[i].event);
-               oprofilefs_create_ulong(root->d_sb, dir, "count", &counter_config[i].count);
-               oprofilefs_create_ulong(root->d_sb, dir, "unit_mask", &counter_config[i].unit_mask);
-               oprofilefs_create_ulong(root->d_sb, dir, "kernel", &counter_config[i].kernel);
-               oprofilefs_create_ulong(root->d_sb, dir, "user", &counter_config[i].user);
+               dir = oprofilefs_mkdir(root, buf);
+               oprofilefs_create_ulong(dir, "enabled", &counter_config[i].enabled);
+               oprofilefs_create_ulong(dir, "event", &counter_config[i].event);
+               oprofilefs_create_ulong(dir, "count", &counter_config[i].count);
+               oprofilefs_create_ulong(dir, "unit_mask", &counter_config[i].unit_mask);
+               oprofilefs_create_ulong(dir, "kernel", &counter_config[i].kernel);
+               oprofilefs_create_ulong(dir, "user", &counter_config[i].user);
        }
 
        return 0;