From mboxrd@z Thu Jan 1 00:00:00 1970 From: Florian Fainelli Subject: [PATCH net-next] net: core: Inline netdev_features_size_check() Date: Mon, 30 Apr 2018 14:20:05 -0700 Message-ID: <20180430212005.28204-1-f.fainelli@gmail.com> Cc: davem@davemloft.net, stephen@networkplumber.org, Florian Fainelli To: netdev@vger.kernel.org Return-path: Received: from mail-pf0-f194.google.com ([209.85.192.194]:38419 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754867AbeD3VUL (ORCPT ); Mon, 30 Apr 2018 17:20:11 -0400 Received: by mail-pf0-f194.google.com with SMTP id o76so7705178pfi.5 for ; Mon, 30 Apr 2018 14:20:11 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: We do not require this inline function to be used in multiple different locations, just inline it where it gets used in register_netdevice(). Suggested-by: David Miller Suggested-by: Stephen Hemminger Signed-off-by: Florian Fainelli --- include/linux/netdevice.h | 6 ------ net/core/dev.c | 3 ++- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 9e09dd897b74..82f5a9aba578 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -4108,12 +4108,6 @@ const char *netdev_drivername(const struct net_device *dev); void linkwatch_run_queue(void); -static inline void netdev_features_size_check(void) -{ - BUILD_BUG_ON(sizeof(netdev_features_t) * BITS_PER_BYTE < - NETDEV_FEATURE_COUNT); -} - static inline netdev_features_t netdev_intersect_features(netdev_features_t f1, netdev_features_t f2) { diff --git a/net/core/dev.c b/net/core/dev.c index e01c21a88cae..3263c14c607f 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -7879,7 +7879,8 @@ int register_netdevice(struct net_device *dev) int ret; struct net *net = dev_net(dev); - netdev_features_size_check(); + BUILD_BUG_ON(sizeof(netdev_features_t) * BITS_PER_BYTE < + NETDEV_FEATURE_COUNT); BUG_ON(dev_boot_phase); ASSERT_RTNL(); -- 2.14.1