Skip to contentSkip to conversation

keys: remove trailing semicolon in macro definition

PATCH In review [email protected] 4 participants 5 messages Nov 28, 2020 – Dec 2, 2020 Keys/keyrings

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 keys: remove trailing semicolon in macro definition

From: Tom Rix <[email protected]>

The macro use will already have a semicolon.

---
 include/linux/key.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/key.h +2 -2
index 0f2e24f13c2b..1b0837c975b9 100644
@@ -360,7 +360,7 @@ static inline struct key *request_key(struct key_type *type,
  * completion of keys undergoing construction with a non-interruptible wait.
  */
 #define request_key_net(type, description, net, callout_info) \
-	request_key_tag(type, description, net->key_domain, callout_info);
+	request_key_tag(type, description, net->key_domain, callout_info)
 
 /**
  * request_key_net_rcu - Request a key for a net namespace under RCU conditions
@@ -372,7 +372,7 @@ static inline struct key *request_key(struct key_type *type,
  * network namespace are used.
  */
 #define request_key_net_rcu(type, description, net) \
-	request_key_rcu(type, description, net->key_domain);
+	request_key_rcu(type, description, net->key_domain)
 #endif /* CONFIG_NET */
 
 extern int wait_for_key_construction(struct key *key, bool intr);
Signature · 1 line
2.18.4
#2 lore raw
Quoted 9 lines · Jarkko Sakkinen
Quoted 5 lines · On Fri, Nov 27, 2020 at 11:15:43AM -0800, [email protected] wrote:

From: Tom Rix <[email protected]>

The macro use will already have a semicolon.

I'm in-between whether this is worth of merging. The commit message does not help with that decision too much.

It seems worthy of merging to me modulo whatver improvement is desired in the commit message.

There are 3 existing uses of request_key_net. All have a trailing semicolon. There is 1 existing use of request_key_net_rcu. It has a trailing semicolon.

No object change should occur.

maintainer Acked-by
#3 lore raw
Quoted 11 lines · Joe Perches
Quoted 9 lines · Jarkko Sakkinen
Quoted 5 lines · On Fri, Nov 27, 2020 at 11:15:43AM -0800, [email protected] wrote:

From: Tom Rix <[email protected]>

The macro use will already have a semicolon.

I'm in-between whether this is worth of merging. The commit message does not help with that decision too much.

Quoted 7 lines

It seems worthy of merging to me modulo whatver improvement is desired in the commit message.

There are 3 existing uses of request_key_net. All have a trailing semicolon. There is 1 existing use of request_key_net_rcu. It has a trailing semicolon.

No object change should occur.

OK, makes sense.

/Jarkko

maintainer
#4 lore raw
In reply to Jarkko Sakkinen
Quoted 2 lines · Jarkko Sakkinen

I'm in-between whether this is worth of merging. The commit message does not help with that decision too much.

It is worth merging. It might cause problems for someone using it in the body of an if-statement, say, if they don't put braces in, but do put a semicolon on the end. I'll add it to my branch.

David