The following commit has been merged in the master branch: commit 121bdca0d476c1018fa4b3c06ac008b7979acbd3 Author: Simon Wunderlich simon.wunderlich@open-mesh.com Date: Fri Mar 11 14:01:11 2016 +0100
batman-adv: fix debuginfo macro style issue
Structure initialization within the macros should follow the general coding style used in the kernel: put the initialization of the first variable and the closing brace on a separate line.
Reported-by: Antonio Quartulli a@unstable.cc Signed-off-by: Simon Wunderlich simon.wunderlich@open-mesh.com [sven@narfation.org: fix conflicts with current version] Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Marek Lindner mareklindner@neomailbox.ch Signed-off-by: Antonio Quartulli a@unstable.cc
diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c index 48253cf..aa315da 100644 --- a/net/batman-adv/debugfs.c +++ b/net/batman-adv/debugfs.c @@ -365,14 +365,17 @@ static int batadv_nc_nodes_open(struct inode *inode, struct file *file)
#define BATADV_DEBUGINFO(_name, _mode, _open) \ struct batadv_debuginfo batadv_debuginfo_##_name = { \ - .attr = { .name = __stringify(_name), \ - .mode = _mode, }, \ - .fops = { .owner = THIS_MODULE, \ - .open = _open, \ - .read = seq_read, \ - .llseek = seq_lseek, \ - .release = single_release, \ - } \ + .attr = { \ + .name = __stringify(_name), \ + .mode = _mode, \ + }, \ + .fops = { \ + .owner = THIS_MODULE, \ + .open = _open, \ + .read = seq_read, \ + .llseek = seq_lseek, \ + .release = single_release, \ + }, \ }
/* the following attributes are general and therefore they will be directly