[PATCH net-next] ethtool: Remove trailing semicolon for static inline

[PATCH net-next] ethtool: Remove trailing semicolon for static inline

[Florian Fainelli]

Android's header sanitization tool chokes on static inline functions having a
trailing semicolon, leading to an incorrectly parsed header file. While the
tool should obviously be fixed, also fix the header files for the two affected
functions: ethtool_get_flow_spec_ring() and ethtool_get_flow_spec_ring_vf().

Fixes: 8cf6f497de40 ("ethtool: Add helper routines to pass vf to rx_flow_spec")
Reporetd-by: Blair Prescott <blair.prescott@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 include/uapi/linux/ethtool.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
index 7363f18e65a5..813282cc8af6 100644
--- a/include/uapi/linux/ethtool.h
+++ b/include/uapi/linux/ethtool.h
@@ -902,13 +902,13 @@ struct ethtool_rx_flow_spec {
 static inline __u64 ethtool_get_flow_spec_ring(__u64 ring_cookie)
 {
 	return ETHTOOL_RX_FLOW_SPEC_RING & ring_cookie;
-};
+}
 
 static inline __u64 ethtool_get_flow_spec_ring_vf(__u64 ring_cookie)
 {
 	return (ETHTOOL_RX_FLOW_SPEC_RING_VF & ring_cookie) >>
 				ETHTOOL_RX_FLOW_SPEC_RING_VF_OFF;
-};
+}
 
 /**
  * struct ethtool_rxnfc - command to get or set RX flow classification rules
-- 
2.17.1

Re: [PATCH net-next] ethtool: Remove trailing semicolon for static inline

[David Miller]

From: Florian Fainelli <f.fainelli@gmail.com>
Date: Sat,  4 Aug 2018 14:20:40 -0700

> Android's header sanitization tool chokes on static inline functions having a
> trailing semicolon, leading to an incorrectly parsed header file. While the
> tool should obviously be fixed, also fix the header files for the two affected
> functions: ethtool_get_flow_spec_ring() and ethtool_get_flow_spec_ring_vf().
> 
> Fixes: 8cf6f497de40 ("ethtool: Add helper routines to pass vf to rx_flow_spec")
> Reporetd-by: Blair Prescott <blair.prescott@broadcom.com>
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

Applied, thanks Florian.

Trailing semicolon removal has become so trendy all of a sudden...