Skip to contentSkip to conversation

bpf: remove trailing semicolon in macro definition

PATCH In review [email protected] 2 participants 3 messages Nov 27, 2020 – Nov 29, 2020

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

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

From: Tom Rix <[email protected]>

The macro use will already have a semicolon.

---
 include/trace/events/xdp.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/trace/events/xdp.h +2 -2
index cd24e8a59529..65ffedf8386f 100644
@@ -146,13 +146,13 @@ DEFINE_EVENT(xdp_redirect_template, xdp_redirect_err,
 );
 
 #define _trace_xdp_redirect(dev, xdp, to)		\
-	 trace_xdp_redirect(dev, xdp, NULL, 0, NULL, to);
+	 trace_xdp_redirect(dev, xdp, NULL, 0, NULL, to)
 
 #define _trace_xdp_redirect_err(dev, xdp, to, err)	\
 	 trace_xdp_redirect_err(dev, xdp, NULL, err, NULL, to);
 
 #define _trace_xdp_redirect_map(dev, xdp, to, map, index)		\
-	 trace_xdp_redirect(dev, xdp, to, 0, map, index);
+	 trace_xdp_redirect(dev, xdp, to, 0, map, index)
 
 #define _trace_xdp_redirect_map_err(dev, xdp, to, map, index, err)	\
 	 trace_xdp_redirect_err(dev, xdp, to, err, map, index);
Signature · 1 line
2.18.4
maintainer
#1 lore raw
Quoted 20 lines · On 11/27/20 8:27 PM, [email protected] wrote:

From: Tom Rix <[email protected]>

The macro use will already have a semicolon.

---
  include/trace/events/xdp.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
include/trace/events/xdp.h +1 -1
index cd24e8a59529..65ffedf8386f 100644
@@ -146,13 +146,13 @@ DEFINE_EVENT(xdp_redirect_template, xdp_redirect_err,
  );
 
  #define _trace_xdp_redirect(dev, xdp, to)		\
-	 trace_xdp_redirect(dev, xdp, NULL, 0, NULL, to);
+	 trace_xdp_redirect(dev, xdp, NULL, 0, NULL, to)

include/trace/events/xdp.h DEFINE_EVENT(xdp_redirect_template, xdp_redirect_err, · line 158

Quoted 10 lines
include/trace/events/xdp.h +1 -1
 
  #define _trace_xdp_redirect_err(dev, xdp, to, err)	\
  	 trace_xdp_redirect_err(dev, xdp, NULL, err, NULL, to);
 
  #define _trace_xdp_redirect_map(dev, xdp, to, map, index)		\
-	 trace_xdp_redirect(dev, xdp, to, 0, map, index);
+	 trace_xdp_redirect(dev, xdp, to, 0, map, index)
 
  #define _trace_xdp_redirect_map_err(dev, xdp, to, map, index, err)	\
  	 trace_xdp_redirect_err(dev, xdp, to, err, map, index);

This looks random, why those but not other locations ?

Thanks,
Daniel

author
#2 lore raw
Quoted 21 lines · Daniel Borkmann
Quoted 20 lines · On 11/27/20 8:27 PM, [email protected] wrote:

From: Tom Rix <[email protected]>

The macro use will already have a semicolon.

---
  include/trace/events/xdp.h | 4 ++--

  1 file changed, 2 insertions(+), 2 deletions(-)
include/trace/events/xdp.h +1 -1
index cd24e8a59529..65ffedf8386f 100644
@@ -146,13 +146,13 @@ DEFINE_EVENT(xdp_redirect_template, xdp_redirect_err,
   );
     #define _trace_xdp_redirect(dev, xdp, to)        \
-     trace_xdp_redirect(dev, xdp, NULL, 0, NULL, to);
+     trace_xdp_redirect(dev, xdp, NULL, 0, NULL, to)
     #define _trace_xdp_redirect_err(dev, xdp, to, err)    \
        trace_xdp_redirect_err(dev, xdp, NULL, err, NULL, to);
Quoted 8 lines

include/trace/events/xdp.h DEFINE_EVENT(xdp_redirect_template, xdp_redirect_err,

Quoted 6 lines
include/trace/events/xdp.h +1 -1
     #define _trace_xdp_redirect_map(dev, xdp, to, map, index)        \
-     trace_xdp_redirect(dev, xdp, to, 0, map, index);
+     trace_xdp_redirect(dev, xdp, to, 0, map, index)
     #define _trace_xdp_redirect_map_err(dev, xdp, to, map, index, err)    \
        trace_xdp_redirect_err(dev, xdp, to, err, map, index);
 

This looks random, why those but not other locations ?

Those other macros were never used.

Tom

Quoted 4 lines

Thanks,
Daniel