From patchwork Fri Mar 1 16:05:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 1050274 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="aEVE41jT"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 449vR62GQnz9s70 for ; Sat, 2 Mar 2019 03:05:54 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388961AbfCAQFw (ORCPT ); Fri, 1 Mar 2019 11:05:52 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:39820 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388923AbfCAQFu (ORCPT ); Fri, 1 Mar 2019 11:05:50 -0500 Received: by mail-wm1-f68.google.com with SMTP id z84so12738565wmg.4 for ; Fri, 01 Mar 2019 08:05:49 -0800 (PST) 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=TGTniRN0EpvCdN+1fbJxBDKiPKR6FwDmsMa7A6KekhM=; b=aEVE41jTrhY7kYTgZ51jB7FdW5d7RPiMhtvCggiXnqH2RF5bwhwYddegOfIO8ZMfBC T08CDTA60hD99YyqSjB4uvbsvIGt8drVFI/MkTOMCFpadU6iYB5qx3uZ24ysK4rqxas/ X2XhNPN5PDqf9KN7LrxE3Tk7NvbwIZ21GwzxJp1NIGxsf23RR7QNH3CBpTCZnw16sLln QfBHQdL0wBoxcvbjvKLWqckb4TBTDZog8EQzPqdUHucPuOl89wBlA4Au+jAq7C+eCWnL omSEirT9DXTqkO4VFJIoaIdSPpofvaCHJNHyQ5jvQSOqGqWRnnewodl9KPOe4pdANvzx 7WtA== 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=TGTniRN0EpvCdN+1fbJxBDKiPKR6FwDmsMa7A6KekhM=; b=ulBgqmmdtLK96G9Ut1ErsmxPKFuxlQM7UjstCULOEtbpdcqQvndXv2eK5BM4+54W5h eELNL1CSo1Znyd/51dqhJM9FfvGkSlEz+nycpx2ut+cjUrk1qVkadAvdf6k+p1rAsCM1 TYYkWQkWQTjn5VoWS6oq0gD3HUOzq/ChFvj6Us+HPg35W7oHJTuLXwJ8GZpVYmz40r3t aNeoVOB4nZr+KIGl1PnN3UJzdQBluKVpZae5QQwZVLXgN6gQG6zGUT4Dy96t7aaghPqq hEJkF1gla6TQn9B1Z8a0exXyw+mzUOhNNmYRJkxffLR+/Ics4ZIzbFMGwS3O1yugbwu9 q+Vg== X-Gm-Message-State: AHQUAuYvO0lq45V78Rw2rD2y98jBU1nQEfQCfnFchw8Fdj/YpqOloDlX b4sLjhM/ovxB16my2XnhRX9FM2GBQEq5LA== X-Google-Smtp-Source: AHgI3Ia1VjySf1lIx2cMYG+Vdvu2+80gaVVIAER1cFedNf69PG1dhrqt5tjwsymNnpCHHJsnkvMaXA== X-Received: by 2002:a1c:1d56:: with SMTP id d83mr3806401wmd.67.1551456349064; Fri, 01 Mar 2019 08:05:49 -0800 (PST) Received: from localhost (ip-89-177-134-16.net.upcbroadband.cz. [89.177.134.16]) by smtp.gmail.com with ESMTPSA id o30sm26588382wro.57.2019.03.01.08.05.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2019 08:05:48 -0800 (PST) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, mlxsw@mellanox.com, idosch@mellanox.com, jakub.kicinski@netronome.com, dirk.vandermerwe@netronome.com, f.fainelli@gmail.com, andrew@lunn.ch, vivien.didelot@gmail.com Subject: [patch net-next RFC 5/8] mlxsw: Remove ndo_get_port_parent_id implementation Date: Fri, 1 Mar 2019 17:05:39 +0100 Message-Id: <20190301160542.6474-6-jiri@resnulli.us> X-Mailer: git-send-email 2.14.5 In-Reply-To: <20190301160542.6474-1-jiri@resnulli.us> References: <20190301160542.6474-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/spectrum.c | 13 ------------- drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 13 ------------- 2 files changed, 26 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c index 75c5b8f65912..f277c0eb6fc8 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -1703,18 +1703,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) { @@ -1739,7 +1727,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 e6c7bf78f245..db54335032b4 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c +++ b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c @@ -379,25 +379,12 @@ 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 const struct net_device_ops mlxsw_sx_port_netdev_ops = { .ndo_open = mlxsw_sx_port_open, .ndo_stop = mlxsw_sx_port_stop, .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, }; static void mlxsw_sx_port_get_drvinfo(struct net_device *dev,