net: Get rid of SWITCHDEV_ATTR_ID_PORT_PARENT_ID

Now that we have a dedicated NDO for getting a port's parent ID, get rid
of SWITCHDEV_ATTR_ID_PORT_PARENT_ID and convert all callers to use the
NDO exclusively. This is a preliminary change to getting rid of
switchdev_ops eventually.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 15 deletions

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 4eace9f1dcf9..7c5061123ead 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -12,7 +12,6 @@
 #include <linux/capability.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
-#include <net/switchdev.h>
 #include <linux/if_arp.h>
 #include <linux/slab.h>
 #include <linux/sched/signal.h>
@@ -495,27 +494,17 @@ static ssize_t phys_switch_id_show(struct device *dev,
                                    struct device_attribute *attr, char *buf)
 {
         struct net_device *netdev = to_net_dev(dev);
-        const struct net_device_ops *ops = netdev->netdev_ops;
         ssize_t ret = -EINVAL;
 
         if (!rtnl_trylock())
                 return restart_syscall();
 
         if (dev_isalive(netdev)) {
-                struct switchdev_attr attr = {
-                        .orig_dev = netdev,
-                        .id = SWITCHDEV_ATTR_ID_PORT_PARENT_ID,
-                        .flags = SWITCHDEV_F_NO_RECURSE,
-                };
-
-                if (ops->ndo_get_port_parent_id)
-                        ret = dev_get_port_parent_id(netdev, &attr.u.ppid,
-                                                     false);
-                else
-                        ret = switchdev_port_attr_get(netdev, &attr);
+                struct netdev_phys_item_id ppid = { };
+
+                ret = dev_get_port_parent_id(netdev, &ppid, false);
                 if (!ret)
-                        ret = sprintf(buf, "%*phN\n", attr.u.ppid.id_len,
-                                      attr.u.ppid.id);
+                        ret = sprintf(buf, "%*phN\n", ppid.id_len, ppid.id);
         }
         rtnl_unlock();