From patchwork Tue Apr 2 08:15:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 1074062 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=resnulli.us Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="dogU3PAB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44YMTk6br2z9sNr for ; Tue, 2 Apr 2019 19:15:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729429AbfDBIPW (ORCPT ); Tue, 2 Apr 2019 04:15:22 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:33146 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729415AbfDBIPU (ORCPT ); Tue, 2 Apr 2019 04:15:20 -0400 Received: by mail-wr1-f66.google.com with SMTP id q1so15391143wrp.0 for ; Tue, 02 Apr 2019 01:15:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sSqIibhWIXds/BHTQ7TwLVa3r/CEYLb7uwpEJdTUdmg=; b=dogU3PABkOu8ner6RaVLsIM9hTcXjQeTGqRlrM6bhS6Db+StZ50rmYTkR5NgNjiJHW q2F1KRsGfW/4qltgv1/mBQjPwZUgXUdvMV5jLJ5MZCAwUbklndHPAMulepmQmpc8UQBb OTCgfYOu/ZpRG7kEM/pn6/WaVRZv+W5VLtbZHdZfWtsfeHPZVR87wc6fPLczrZzd2OKx WJQeZ63Zq567CDBi3IBwcVE7+GcpoOrwswVubYb6I9o8RBjHs83UTZ7vTyUnf97tn3aA ZBV5ls746D03zMG6KTX8bk8itgXcLvsQ4CVwNFQ+Fc3RttS6BJxnjqSXtGZnX3Kg39Mq sdZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sSqIibhWIXds/BHTQ7TwLVa3r/CEYLb7uwpEJdTUdmg=; b=BJ22lVCbi8OZBe6a6eH2RWopghIBGrl8DGt4j+rMvBhHamAyHD2vsPq7Kc1S53UCGV 3nJpoD5OVkFGfMBo/IOC7KmE1UNe3HVyRzI+PIPLcEMDsZIy3SebqmGpYDgnKomZBMBC NX02fbmEDkHROHQ7HH9y2iKsvMDdDhwU6mPDBgrNQhnHlMc007gpWX0vvQiUe1O4wPG8 SMPezi2CPj/xJVK5vP8JJl07ufVOUsAexAgMVLqPgjAi5h7OTPNvVIqpfjPp72PSvczK sou+0a/loGzPVD+pFFt8IMuimkb2ajxp4SdbYqEYizEuh7VXkT+9BvsSG4HozFppUBI6 EIlw== X-Gm-Message-State: APjAAAVuyxqXIL0jX2I/5u3mlNU+Xg81shIQIszPmqta8zHAowinb7ZF UM93AVBTyi82qHqBLqE0dbVAB9BnglQ= X-Google-Smtp-Source: APXvYqxBjSyY5ceJlMEXk5YO7XqlHgu68ZTzGcH01QrtdV42uq65fzh3Di/eDf17JHw8tofZI/zcjg== X-Received: by 2002:a5d:6646:: with SMTP id f6mr10211003wrw.68.1554192918983; Tue, 02 Apr 2019 01:15:18 -0700 (PDT) Received: from localhost (jirka.pirko.cz. [84.16.102.26]) by smtp.gmail.com with ESMTPSA id 7sm46261929wrc.81.2019.04.02.01.15.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Apr 2019 01:15:18 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, mlxsw@mellanox.com, idosch@mellanox.com, jakub.kicinski@netronome.com, f.fainelli@gmail.com, andrew@lunn.ch, vivien.didelot@gmail.com, michael.chan@broadcom.com Subject: [patch net-next v3 05/12] mlxsw: Remove ndo_get_port_parent_id implementation Date: Tue, 2 Apr 2019 10:15:05 +0200 Message-Id: <20190402081512.2988-6-jiri@resnulli.us> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190402081512.2988-1-jiri@resnulli.us> References: <20190402081512.2988-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko Remove implementation of get_port_parent_id ndo and rely on core calling into devlink for the information directly. Signed-off-by: Jiri Pirko --- drivers/net/ethernet/mellanox/mlxsw/minimal.c | 13 ------------- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 13 ------------- drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 13 ------------- 3 files changed, 39 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/minimal.c b/drivers/net/ethernet/mellanox/mlxsw/minimal.c index bd96211602a4..cf2114273b72 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/minimal.c +++ b/drivers/net/ethernet/mellanox/mlxsw/minimal.c @@ -51,18 +51,6 @@ static int mlxsw_m_port_dummy_open_stop(struct net_device *dev) return 0; } -static int mlxsw_m_port_get_port_parent_id(struct net_device *dev, - struct netdev_phys_item_id *ppid) -{ - struct mlxsw_m_port *mlxsw_m_port = netdev_priv(dev); - struct mlxsw_m *mlxsw_m = mlxsw_m_port->mlxsw_m; - - ppid->id_len = sizeof(mlxsw_m->base_mac); - memcpy(&ppid->id, &mlxsw_m->base_mac, ppid->id_len); - - return 0; -} - static struct devlink_port * mlxsw_m_port_get_devlink_port(struct net_device *dev) { @@ -76,7 +64,6 @@ mlxsw_m_port_get_devlink_port(struct net_device *dev) static const struct net_device_ops mlxsw_m_port_netdev_ops = { .ndo_open = mlxsw_m_port_dummy_open_stop, .ndo_stop = mlxsw_m_port_dummy_open_stop, - .ndo_get_port_parent_id = mlxsw_m_port_get_port_parent_id, .ndo_get_devlink_port = mlxsw_m_port_get_devlink_port, }; diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c index 2dbcc8e5e130..fc325f1213fb 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -1704,18 +1704,6 @@ static int mlxsw_sp_set_features(struct net_device *dev, mlxsw_sp_feature_hw_tc); } -static int mlxsw_sp_port_get_port_parent_id(struct net_device *dev, - struct netdev_phys_item_id *ppid) -{ - struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev); - struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp; - - ppid->id_len = sizeof(mlxsw_sp->base_mac); - memcpy(&ppid->id, &mlxsw_sp->base_mac, ppid->id_len); - - return 0; -} - static struct devlink_port * mlxsw_sp_port_get_devlink_port(struct net_device *dev) { @@ -1740,7 +1728,6 @@ static const struct net_device_ops mlxsw_sp_port_netdev_ops = { .ndo_vlan_rx_add_vid = mlxsw_sp_port_add_vid, .ndo_vlan_rx_kill_vid = mlxsw_sp_port_kill_vid, .ndo_set_features = mlxsw_sp_set_features, - .ndo_get_port_parent_id = mlxsw_sp_port_get_port_parent_id, .ndo_get_devlink_port = mlxsw_sp_port_get_devlink_port, }; diff --git a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c index 5397616fcda8..fc4f19167262 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c +++ b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c @@ -379,18 +379,6 @@ mlxsw_sx_port_get_stats64(struct net_device *dev, stats->tx_dropped = tx_dropped; } -static int mlxsw_sx_port_get_port_parent_id(struct net_device *dev, - struct netdev_phys_item_id *ppid) -{ - struct mlxsw_sx_port *mlxsw_sx_port = netdev_priv(dev); - struct mlxsw_sx *mlxsw_sx = mlxsw_sx_port->mlxsw_sx; - - ppid->id_len = sizeof(mlxsw_sx->hw_id); - memcpy(&ppid->id, &mlxsw_sx->hw_id, ppid->id_len); - - return 0; -} - static struct devlink_port * mlxsw_sx_port_get_devlink_port(struct net_device *dev) { @@ -407,7 +395,6 @@ static const struct net_device_ops mlxsw_sx_port_netdev_ops = { .ndo_start_xmit = mlxsw_sx_port_xmit, .ndo_change_mtu = mlxsw_sx_port_change_mtu, .ndo_get_stats64 = mlxsw_sx_port_get_stats64, - .ndo_get_port_parent_id = mlxsw_sx_port_get_port_parent_id, .ndo_get_devlink_port = mlxsw_sx_port_get_devlink_port, };