devlink: Move netdev_to_devlink helpers to devlink.c

Both netdev_to_devlink and netdev_to_devlink_port are used in devlink.c
only, so move them in order to reduce their scope.

Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/net/devlink.h b/include/net/devlink.h
index ae03eb1c6cc90d0cad93ec5e21409a00b641b837..7f44ad14e5edf814ae619443c331c5a4065463d3 100644 (file)
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -1486,23 +1486,6 @@ void *devlink_priv(struct devlink *devlink);
 struct devlink *priv_to_devlink(void *priv);
 struct device *devlink_to_dev(const struct devlink *devlink);
 
-static inline struct devlink_port *
-netdev_to_devlink_port(struct net_device *dev)
-{
-       if (dev->netdev_ops->ndo_get_devlink_port)
-               return dev->netdev_ops->ndo_get_devlink_port(dev);
-       return NULL;
-}
-
-static inline struct devlink *netdev_to_devlink(struct net_device *dev)
-{
-       struct devlink_port *devlink_port = netdev_to_devlink_port(dev);
-
-       if (devlink_port)
-               return devlink_port->devlink;
-       return NULL;
-}
-
 struct ib_device;
 
 struct net *devlink_net(const struct devlink *devlink);

diff --git a/net/core/devlink.c b/net/core/devlink.c
index 87d1766ebdbf47f993c0412524cea62968192336..e9e908c4cfb4ba186f4fa26cb39eb9641e6a665b 100644 (file)
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -11381,6 +11381,24 @@ free_msg:
        nlmsg_free(msg);
 }
 
+static struct devlink_port *netdev_to_devlink_port(struct net_device *dev)
+{
+       if (!dev->netdev_ops->ndo_get_devlink_port)
+               return NULL;
+
+       return dev->netdev_ops->ndo_get_devlink_port(dev);
+}
+
+static struct devlink *netdev_to_devlink(struct net_device *dev)
+{
+       struct devlink_port *devlink_port = netdev_to_devlink_port(dev);
+
+       if (!devlink_port)
+               return NULL;
+
+       return devlink_port->devlink;
+}
+
 void devlink_compat_running_version(struct net_device *dev,
                                    char *buf, size_t len)
 {