Merge tag 'iio-for-4.8b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio...

[deliverable/linux.git] / net / 6lowpan / debugfs.c

diff --git a/net/6lowpan/debugfs.c b/net/6lowpan/debugfs.c
index 0793a815747206629debbbac5d4ac1386958b6c4..acbaa3db493b2085915ab0c2576be778c262ce0f 100644 (file)
--- a/net/6lowpan/debugfs.c
+++ b/net/6lowpan/debugfs.c
@@ -172,7 +172,7 @@ static const struct file_operations lowpan_ctx_pfx_fops = {
 static int lowpan_dev_debugfs_ctx_init(struct net_device *dev,
                                       struct dentry *ctx, u8 id)
 {
-       struct lowpan_priv *lpriv = lowpan_priv(dev);
+       struct lowpan_dev *ldev = lowpan_dev(dev);
        struct dentry *dentry, *root;
        char buf[32];
 
@@ -185,25 +185,25 @@ static int lowpan_dev_debugfs_ctx_init(struct net_device *dev,
                return -EINVAL;
 
        dentry = debugfs_create_file("active", 0644, root,
-                                    &lpriv->ctx.table[id],
+                                    &ldev->ctx.table[id],
                                     &lowpan_ctx_flag_active_fops);
        if (!dentry)
                return -EINVAL;
 
        dentry = debugfs_create_file("compression", 0644, root,
-                                    &lpriv->ctx.table[id],
+                                    &ldev->ctx.table[id],
                                     &lowpan_ctx_flag_c_fops);
        if (!dentry)
                return -EINVAL;
 
        dentry = debugfs_create_file("prefix", 0644, root,
-                                    &lpriv->ctx.table[id],
+                                    &ldev->ctx.table[id],
                                     &lowpan_ctx_pfx_fops);
        if (!dentry)
                return -EINVAL;
 
        dentry = debugfs_create_file("prefix_len", 0644, root,
-                                    &lpriv->ctx.table[id],
+                                    &ldev->ctx.table[id],
                                     &lowpan_ctx_plen_fops);
        if (!dentry)
                return -EINVAL;
@@ -247,21 +247,21 @@ static const struct file_operations lowpan_context_fops = {
 
 int lowpan_dev_debugfs_init(struct net_device *dev)
 {
-       struct lowpan_priv *lpriv = lowpan_priv(dev);
+       struct lowpan_dev *ldev = lowpan_dev(dev);
        struct dentry *contexts, *dentry;
        int ret, i;
 
        /* creating the root */
-       lpriv->iface_debugfs = debugfs_create_dir(dev->name, lowpan_debugfs);
-       if (!lpriv->iface_debugfs)
+       ldev->iface_debugfs = debugfs_create_dir(dev->name, lowpan_debugfs);
+       if (!ldev->iface_debugfs)
                goto fail;
 
-       contexts = debugfs_create_dir("contexts", lpriv->iface_debugfs);
+       contexts = debugfs_create_dir("contexts", ldev->iface_debugfs);
        if (!contexts)
                goto remove_root;
 
        dentry = debugfs_create_file("show", 0644, contexts,
-                                    &lowpan_priv(dev)->ctx,
+                                    &lowpan_dev(dev)->ctx,
                                     &lowpan_context_fops);
        if (!dentry)
                goto remove_root;
@@ -282,7 +282,7 @@ fail:
 
 void lowpan_dev_debugfs_exit(struct net_device *dev)
 {
-       debugfs_remove_recursive(lowpan_priv(dev)->iface_debugfs);
+       debugfs_remove_recursive(lowpan_dev(dev)->iface_debugfs);
 }
 
 int __init lowpan_debugfs_init(void)