From: Murali Karicheri <m-karicheri2@ti.com>
To: <davem@davemloft.net>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <arvid.brodin@alten.se>,
<a-kramer@ti.com>
Subject: [PATCH net 04/14] net: hsr: fix alignment issues in the code for functions
Date: Fri, 5 Apr 2019 13:31:26 -0400 [thread overview]
Message-ID: <20190405173136.18050-5-m-karicheri2@ti.com> (raw)
In-Reply-To: <20190405173136.18050-1-m-karicheri2@ti.com>
This patch fixes alignment issues in code for functions. This is
seen when ran checkpatch.pl -f option on files under net/hsr.
Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
---
net/hsr/hsr_device.c | 6 +++---
net/hsr/hsr_framereg.c | 2 +-
net/hsr/hsr_netlink.c | 10 +++++-----
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c
index cf5c3951d35a..0aea1bd09526 100644
--- a/net/hsr/hsr_device.c
+++ b/net/hsr/hsr_device.c
@@ -243,7 +243,7 @@ static const struct header_ops hsr_header_ops = {
};
static void send_hsr_supervision_frame(struct hsr_port *master,
- u8 type, u8 hsrVer)
+ u8 type, u8 hsrVer)
{
struct sk_buff *skb;
int hlen, tlen;
@@ -331,13 +331,13 @@ static void hsr_announce(struct timer_list *t)
if (hsr->announce_count < 3 && hsr->protVersion == 0) {
send_hsr_supervision_frame(master, HSR_TLV_ANNOUNCE,
- hsr->protVersion);
+ hsr->protVersion);
hsr->announce_count++;
interval = msecs_to_jiffies(HSR_ANNOUNCE_INTERVAL);
} else {
send_hsr_supervision_frame(master, HSR_TLV_LIFE_CHECK,
- hsr->protVersion);
+ hsr->protVersion);
interval = msecs_to_jiffies(HSR_LIFE_CHECK_INTERVAL);
}
diff --git a/net/hsr/hsr_framereg.c b/net/hsr/hsr_framereg.c
index 47dbaf2faefa..78fca38ffa9f 100644
--- a/net/hsr/hsr_framereg.c
+++ b/net/hsr/hsr_framereg.c
@@ -105,7 +105,7 @@ int hsr_create_self_node(struct list_head *self_node_db,
rcu_read_lock();
oldnode = list_first_or_null_rcu(self_node_db,
- struct hsr_node, mac_list);
+ struct hsr_node, mac_list);
if (oldnode) {
list_replace_rcu(&oldnode->mac_list, &node->mac_list);
rcu_read_unlock();
diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c
index 39768382be24..15d3dba229b9 100644
--- a/net/hsr/hsr_netlink.c
+++ b/net/hsr/hsr_netlink.c
@@ -270,8 +270,8 @@ static int hsr_get_node_status(struct sk_buff *skb_in, struct genl_info *info)
}
msg_head = genlmsg_put(skb_out, NETLINK_CB(skb_in).portid,
- info->snd_seq, &hsr_genl_family, 0,
- HSR_C_SET_NODE_STATUS);
+ info->snd_seq, &hsr_genl_family, 0,
+ HSR_C_SET_NODE_STATUS);
if (!msg_head) {
res = -ENOMEM;
goto nla_put_failure;
@@ -295,7 +295,7 @@ static int hsr_get_node_status(struct sk_buff *skb_in, struct genl_info *info)
goto nla_put_failure;
res = nla_put(skb_out, HSR_A_NODE_ADDR, ETH_ALEN,
- nla_data(info->attrs[HSR_A_NODE_ADDR]));
+ nla_data(info->attrs[HSR_A_NODE_ADDR]));
if (res < 0)
goto nla_put_failure;
@@ -396,8 +396,8 @@ static int hsr_get_node_list(struct sk_buff *skb_in, struct genl_info *info)
}
msg_head = genlmsg_put(skb_out, NETLINK_CB(skb_in).portid,
- info->snd_seq, &hsr_genl_family, 0,
- HSR_C_SET_NODE_LIST);
+ info->snd_seq, &hsr_genl_family, 0,
+ HSR_C_SET_NODE_LIST);
if (!msg_head) {
res = -ENOMEM;
goto nla_put_failure;
--
2.17.0
next prev parent reply other threads:[~2019-04-05 17:30 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-05 17:31 [PATCH net 00/14] net: hsr: improvements and bug fixes Murali Karicheri
2019-04-05 17:31 ` [PATCH net 01/14] net: hsr: fix lines exceeding 80 characters Murali Karicheri
2019-04-05 17:31 ` [PATCH net 02/14] net: hsr: fix multiple blank lines in the code Murali Karicheri
2019-04-05 17:31 ` [PATCH net 03/14] net: hsr: remove unnecessary paranthesis from " Murali Karicheri
2019-04-05 17:31 ` Murali Karicheri [this message]
2019-04-05 17:31 ` [PATCH net 05/14] net: hsr: fix lines that ends with a '(' Murali Karicheri
2019-04-05 17:31 ` [PATCH net 06/14] net: hsr: fix NULL checks in the code Murali Karicheri
2019-04-05 17:31 ` [PATCH net 07/14] net: hsr: remove unnecessary space after a cast Murali Karicheri
2019-04-05 17:31 ` [PATCH net 08/14] net: hsr: fix placement of logical operator in a multi-line statement Murali Karicheri
2019-04-05 17:31 ` [PATCH net 09/14] net: hsr: add missing space around operator in code Murali Karicheri
2019-04-05 17:31 ` [PATCH net 10/14] net: hsr: remove camel case usage in the code Murali Karicheri
2019-04-05 17:31 ` [PATCH net 11/14] net: hsr: add blank line after function declaration Murali Karicheri
2019-04-05 17:31 ` [PATCH net 12/14] net: hsr: convert to SPDX identifier Murali Karicheri
2019-04-05 17:31 ` [PATCH net 13/14] net: hsr: add debugfs support for display node list Murali Karicheri
2019-04-05 17:31 ` [PATCH net 14/14] net: hsr: Fix node prune function for forget time expiry Murali Karicheri
2019-04-07 1:32 ` [PATCH net 00/14] net: hsr: improvements and bug fixes David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190405173136.18050-5-m-karicheri2@ti.com \
--to=m-karicheri2@ti.com \
--cc=a-kramer@ti.com \
--cc=arvid.brodin@alten.se \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®