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, 0 insertions, 11 deletions

diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index 63843ae5dc81..5e87b54c5dc5 100644
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -43,7 +43,6 @@ static inline bool switchdev_trans_ph_commit(struct switchdev_trans *trans)
 
 enum switchdev_attr_id {
         SWITCHDEV_ATTR_ID_UNDEFINED,
-        SWITCHDEV_ATTR_ID_PORT_PARENT_ID,
         SWITCHDEV_ATTR_ID_PORT_STP_STATE,
         SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS,
         SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT,
@@ -61,7 +60,6 @@ struct switchdev_attr {
         void *complete_priv;
         void (*complete)(struct net_device *dev, int err, void *priv);
         union {
-                struct netdev_phys_item_id ppid;        /* PORT_PARENT_ID */
                 u8 stp_state;                           /* PORT_STP_STATE */
                 unsigned long brport_flags;             /* PORT_BRIDGE_FLAGS */
                 unsigned long brport_flags_support;     /* PORT_BRIDGE_FLAGS_SUPPORT */
@@ -208,9 +206,6 @@ void switchdev_port_fwd_mark_set(struct net_device *dev,
                                  struct net_device *group_dev,
                                  bool joining);
 
-bool switchdev_port_same_parent_id(struct net_device *a,
-                                   struct net_device *b);
-
 int switchdev_handle_port_obj_add(struct net_device *dev,
                         struct switchdev_notifier_port_obj_info *port_obj_info,
                         bool (*check_cb)(const struct net_device *dev),
@@ -295,12 +290,6 @@ call_switchdev_blocking_notifiers(unsigned long val,
         return NOTIFY_DONE;
 }
 
-static inline bool switchdev_port_same_parent_id(struct net_device *a,
-                                                 struct net_device *b)
-{
-        return false;
-}
-
 static inline int
 switchdev_handle_port_obj_add(struct net_device *dev,
                         struct switchdev_notifier_port_obj_info *port_obj_info,