batman-adv: Prefix types structs with batadv_

[firefly-linux-kernel-4.4.55.git] / net / batman-adv / bat_debugfs.c

diff --git a/net/batman-adv/bat_debugfs.c b/net/batman-adv/bat_debugfs.c
index 03f09f0f6d982a72b15cd352c7f7e896fc7c2c9e..db7b9bf895aa2015a793f410482c34e843c0877f 100644 (file)
--- a/net/batman-adv/bat_debugfs.c
+++ b/net/batman-adv/bat_debugfs.c
@@ -35,14 +35,14 @@
 static struct dentry *batadv_debugfs;
 
 #ifdef CONFIG_BATMAN_ADV_DEBUG
-#define LOG_BUFF_MASK (batadv_log_buff_len - 1)
-#define LOG_BUFF(idx) (debug_log->log_buff[(idx) & LOG_BUFF_MASK])
+#define BATADV_LOG_BUFF_MASK (batadv_log_buff_len - 1)
+#define BATADV_LOG_BUFF(idx) (debug_log->log_buff[(idx) & BATADV_LOG_BUFF_MASK])
 
-static int batadv_log_buff_len = LOG_BUF_LEN;
+static int batadv_log_buff_len = BATADV_LOG_BUF_LEN;
 
-static void batadv_emit_log_char(struct debug_log *debug_log, char c)
+static void batadv_emit_log_char(struct batadv_debug_log *debug_log, char c)
 {
-       LOG_BUFF(debug_log->log_end) = c;
+       BATADV_LOG_BUFF(debug_log->log_end) = c;
        debug_log->log_end++;
 
        if (debug_log->log_end - debug_log->log_start > batadv_log_buff_len)
@@ -50,7 +50,8 @@ static void batadv_emit_log_char(struct debug_log *debug_log, char c)
 }
 
 __printf(2, 3)
-static int batadv_fdebug_log(struct debug_log *debug_log, const char *fmt, ...)
+static int batadv_fdebug_log(struct batadv_debug_log *debug_log,
+                            const char *fmt, ...)
 {
        va_list args;
        static char debug_log_buf[256];
@@ -74,7 +75,7 @@ static int batadv_fdebug_log(struct debug_log *debug_log, const char *fmt, ...)
        return 0;
 }
 
-int batadv_debug_log(struct bat_priv *bat_priv, const char *fmt, ...)
+int batadv_debug_log(struct batadv_priv *bat_priv, const char *fmt, ...)
 {
        va_list args;
        char tmp_log_buf[256];
@@ -105,8 +106,8 @@ static int batadv_log_release(struct inode *inode, struct file *file)
 static ssize_t batadv_log_read(struct file *file, char __user *buf,
                               size_t count, loff_t *ppos)
 {
-       struct bat_priv *bat_priv = file->private_data;
-       struct debug_log *debug_log = bat_priv->debug_log;
+       struct batadv_priv *bat_priv = file->private_data;
+       struct batadv_debug_log *debug_log = bat_priv->debug_log;
        int error, i = 0;
        char c;
 
@@ -133,7 +134,7 @@ static ssize_t batadv_log_read(struct file *file, char __user *buf,
 
        while ((!error) && (i < count) &&
               (debug_log->log_start != debug_log->log_end)) {
-               c = LOG_BUFF(debug_log->log_start);
+               c = BATADV_LOG_BUFF(debug_log->log_start);
 
                debug_log->log_start++;
 
@@ -158,8 +159,8 @@ static ssize_t batadv_log_read(struct file *file, char __user *buf,
 
 static unsigned int batadv_log_poll(struct file *file, poll_table *wait)
 {
-       struct bat_priv *bat_priv = file->private_data;
-       struct debug_log *debug_log = bat_priv->debug_log;
+       struct batadv_priv *bat_priv = file->private_data;
+       struct batadv_debug_log *debug_log = bat_priv->debug_log;
 
        poll_wait(file, &debug_log->queue_wait, wait);
 
@@ -177,7 +178,7 @@ static const struct file_operations batadv_log_fops = {
        .llseek         = no_llseek,
 };
 
-static int batadv_debug_log_setup(struct bat_priv *bat_priv)
+static int batadv_debug_log_setup(struct batadv_priv *bat_priv)
 {
        struct dentry *d;
 
@@ -203,19 +204,19 @@ err:
        return -ENOMEM;
 }
 
-static void batadv_debug_log_cleanup(struct bat_priv *bat_priv)
+static void batadv_debug_log_cleanup(struct batadv_priv *bat_priv)
 {
        kfree(bat_priv->debug_log);
        bat_priv->debug_log = NULL;
 }
 #else /* CONFIG_BATMAN_ADV_DEBUG */
-static int batadv_debug_log_setup(struct bat_priv *bat_priv)
+static int batadv_debug_log_setup(struct batadv_priv *bat_priv)
 {
        bat_priv->debug_log = NULL;
        return 0;
 }
 
-static void batadv_debug_log_cleanup(struct bat_priv *bat_priv)
+static void batadv_debug_log_cleanup(struct batadv_priv *bat_priv)
 {
        return;
 }
@@ -265,13 +266,13 @@ static int batadv_vis_data_open(struct inode *inode, struct file *file)
        return single_open(file, batadv_vis_seq_print_text, net_dev);
 }
 
-struct bat_debuginfo {
+struct batadv_debuginfo {
        struct attribute attr;
        const struct file_operations fops;
 };
 
-#define BAT_DEBUGINFO(_name, _mode, _open)             \
-struct bat_debuginfo batadv_debuginfo_##_name = {      \
+#define BATADV_DEBUGINFO(_name, _mode, _open)          \
+struct batadv_debuginfo batadv_debuginfo_##_name = {   \
        .attr = { .name = __stringify(_name),           \
                  .mode = _mode, },                     \
        .fops = { .owner = THIS_MODULE,                 \
@@ -282,17 +283,19 @@ struct bat_debuginfo batadv_debuginfo_##_name = { \
                }                                       \
 };
 
-static BAT_DEBUGINFO(routing_algos, S_IRUGO, batadv_algorithms_open);
-static BAT_DEBUGINFO(originators, S_IRUGO, batadv_originators_open);
-static BAT_DEBUGINFO(gateways, S_IRUGO, batadv_gateways_open);
-static BAT_DEBUGINFO(transtable_global, S_IRUGO, batadv_transtable_global_open);
+static BATADV_DEBUGINFO(routing_algos, S_IRUGO, batadv_algorithms_open);
+static BATADV_DEBUGINFO(originators, S_IRUGO, batadv_originators_open);
+static BATADV_DEBUGINFO(gateways, S_IRUGO, batadv_gateways_open);
+static BATADV_DEBUGINFO(transtable_global, S_IRUGO,
+                       batadv_transtable_global_open);
 #ifdef CONFIG_BATMAN_ADV_BLA
-static BAT_DEBUGINFO(bla_claim_table, S_IRUGO, batadv_bla_claim_table_open);
+static BATADV_DEBUGINFO(bla_claim_table, S_IRUGO, batadv_bla_claim_table_open);
 #endif
-static BAT_DEBUGINFO(transtable_local, S_IRUGO, batadv_transtable_local_open);
-static BAT_DEBUGINFO(vis_data, S_IRUGO, batadv_vis_data_open);
+static BATADV_DEBUGINFO(transtable_local, S_IRUGO,
+                       batadv_transtable_local_open);
+static BATADV_DEBUGINFO(vis_data, S_IRUGO, batadv_vis_data_open);
 
-static struct bat_debuginfo *batadv_mesh_debuginfos[] = {
+static struct batadv_debuginfo *batadv_mesh_debuginfos[] = {
        &batadv_debuginfo_originators,
        &batadv_debuginfo_gateways,
        &batadv_debuginfo_transtable_global,
@@ -306,10 +309,10 @@ static struct bat_debuginfo *batadv_mesh_debuginfos[] = {
 
 void batadv_debugfs_init(void)
 {
-       struct bat_debuginfo *bat_debug;
+       struct batadv_debuginfo *bat_debug;
        struct dentry *file;
 
-       batadv_debugfs = debugfs_create_dir(DEBUGFS_BAT_SUBDIR, NULL);
+       batadv_debugfs = debugfs_create_dir(BATADV_DEBUGFS_SUBDIR, NULL);
        if (batadv_debugfs == ERR_PTR(-ENODEV))
                batadv_debugfs = NULL;
 
@@ -337,8 +340,8 @@ void batadv_debugfs_destroy(void)
 
 int batadv_debugfs_add_meshif(struct net_device *dev)
 {
-       struct bat_priv *bat_priv = netdev_priv(dev);
-       struct bat_debuginfo **bat_debug;
+       struct batadv_priv *bat_priv = netdev_priv(dev);
+       struct batadv_debuginfo **bat_debug;
        struct dentry *file;
 
        if (!batadv_debugfs)
@@ -360,8 +363,8 @@ int batadv_debugfs_add_meshif(struct net_device *dev)
                                          bat_priv->debug_dir,
                                          dev, &(*bat_debug)->fops);
                if (!file) {
-                       bat_err(dev, "Can't add debugfs file: %s/%s\n",
-                               dev->name, ((*bat_debug)->attr).name);
+                       batadv_err(dev, "Can't add debugfs file: %s/%s\n",
+                                  dev->name, ((*bat_debug)->attr).name);
                        goto rem_attr;
                }
        }
@@ -380,7 +383,7 @@ out:
 
 void batadv_debugfs_del_meshif(struct net_device *dev)
 {
-       struct bat_priv *bat_priv = netdev_priv(dev);
+       struct batadv_priv *bat_priv = netdev_priv(dev);
 
        batadv_debug_log_cleanup(bat_priv);