Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DBF12C10F05 for ; Tue, 26 Mar 2019 12:03:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A05792075C for ; Tue, 26 Mar 2019 12:03:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="F95esVSK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731486AbfCZMDR (ORCPT ); Tue, 26 Mar 2019 08:03:17 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:34446 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731438AbfCZMDO (ORCPT ); Tue, 26 Mar 2019 08:03:14 -0400 Received: by mail-wr1-f68.google.com with SMTP id p10so14055012wrq.1 for ; Tue, 26 Mar 2019 05:03:13 -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=JCc42m6nwt0PnDwU2OjeMW3yBbt51NZ7dDGyQSfgLyc=; b=F95esVSKcjhs5BkW3dfD5Ja0vsgfOX50tccrUGeglFoHypi96vucJs1RPgNh3DICoS vZuYeJldTydpZEfaDoyZX7Hy+rhvx3+gCalejNAcLZ0QCXfyAgjKfiglsuKwKyqvgeuO zNQaqJygc83XiOv8VhfMC4uUQiSJKDuQA6XLaGYhHzIzbLpaCQ9IINFkLMvOX3vbNYMR RRtyy3X7o9NWAXNoIiCT0eXEaMf3TRESnGn5RrOIAEWm5yQz4cWhHVFfJeV57MJJeB66 WIrwFCP5x4zXh7wX6cTMIRC0fbxuwFrOmhWiMO2UlcHMFA+o+4/JB2n+REre1XxRVNns o1+g== 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=JCc42m6nwt0PnDwU2OjeMW3yBbt51NZ7dDGyQSfgLyc=; b=phEZbFkqp4O3rh/W47AGwWMZ6RTg8e8FjZOP1x6lNoZb20zQTQsQRX4iNPfe/Z/ql7 PHEuKeWHAlHpEcDCC6LM4/LMkQKbvk57INbEYYfoZXjSv0ukjkjnxkIBcOR9sXI2QJH8 eMHL8mdlNft4/+saXvlL0JeqrfPHdj2s2Gt0sTBwAVGVraAGFv4rCNExC80DHqHJv1pn Tq8DUpxwgf1y8LPqJ5Cslgs++hEiSA/RVqLYKwQOZuoQZQyZVjMo6tbPwIF8cCkwuNia Wz2rzB51d3tZtTlY6YMOQ538iJkjfy3hy7htU8QaYc3M7rjpqrOfWYx1JJTt/+/fT95x Q8pA== X-Gm-Message-State: APjAAAWiznwY70AP4IZOpmyk3+sg/4d/aRgkvnRcgu/tTn7t0W8Fm004 d9jaIW0jR9uJg7Zn+bT5otPHpZstUcw= X-Google-Smtp-Source: APXvYqzSwZCV3gPN/LCT0tPnK+9P1BPeHsVOWJAOmfWe9cV70YSC6qiVsnYKiXsRyFht54EGBJG6Bw== X-Received: by 2002:a5d:638d:: with SMTP id p13mr18841899wru.202.1553601792489; Tue, 26 Mar 2019 05:03:12 -0700 (PDT) Received: from localhost (mail.chocen-mesto.cz. [85.163.43.2]) by smtp.gmail.com with ESMTPSA id h14sm31384628wre.90.2019.03.26.05.03.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Mar 2019 05:03:12 -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 v2 04/12] mlxsw: Remove ndo_get_phys_port_name implementation Date: Tue, 26 Mar 2019 13:02:59 +0100 Message-Id: <20190326120307.2953-5-jiri@resnulli.us> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190326120307.2953-1-jiri@resnulli.us> References: <20190326120307.2953-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko Rely on the previously introduced fallback and let the core call devlink directly in order to get the physical port name. Signed-off-by: Jiri Pirko --- v1->v2: - adjusted patch description --- drivers/net/ethernet/mellanox/mlxsw/core.c | 10 ---------- drivers/net/ethernet/mellanox/mlxsw/core.h | 2 -- drivers/net/ethernet/mellanox/mlxsw/minimal.c | 11 ----------- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 11 ----------- drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 11 ----------- 5 files changed, 45 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c index aa71aeb44101..e55b4aa91e3b 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core.c @@ -1796,16 +1796,6 @@ enum devlink_port_type mlxsw_core_port_type_get(struct mlxsw_core *mlxsw_core, } EXPORT_SYMBOL(mlxsw_core_port_type_get); -int mlxsw_core_port_get_phys_port_name(struct mlxsw_core *mlxsw_core, - u8 local_port, char *name, size_t len) -{ - struct mlxsw_core_port *mlxsw_core_port = - &mlxsw_core->ports[local_port]; - struct devlink_port *devlink_port = &mlxsw_core_port->devlink_port; - - return devlink_port_get_phys_port_name(devlink_port, name, len); -} -EXPORT_SYMBOL(mlxsw_core_port_get_phys_port_name); struct devlink_port * mlxsw_core_port_devlink_port_get(struct mlxsw_core *mlxsw_core, diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.h b/drivers/net/ethernet/mellanox/mlxsw/core.h index cb870502f04c..e8c424da534c 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core.h +++ b/drivers/net/ethernet/mellanox/mlxsw/core.h @@ -176,8 +176,6 @@ void mlxsw_core_port_clear(struct mlxsw_core *mlxsw_core, u8 local_port, void *port_driver_priv); enum devlink_port_type mlxsw_core_port_type_get(struct mlxsw_core *mlxsw_core, u8 local_port); -int mlxsw_core_port_get_phys_port_name(struct mlxsw_core *mlxsw_core, - u8 local_port, char *name, size_t len); struct devlink_port * mlxsw_core_port_devlink_port_get(struct mlxsw_core *mlxsw_core, u8 local_port); diff --git a/drivers/net/ethernet/mellanox/mlxsw/minimal.c b/drivers/net/ethernet/mellanox/mlxsw/minimal.c index d6e6042223f9..ec5f5a66b607 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/minimal.c +++ b/drivers/net/ethernet/mellanox/mlxsw/minimal.c @@ -51,16 +51,6 @@ static int mlxsw_m_port_dummy_open_stop(struct net_device *dev) return 0; } -static int -mlxsw_m_port_get_phys_port_name(struct net_device *dev, char *name, size_t len) -{ - struct mlxsw_m_port *mlxsw_m_port = netdev_priv(dev); - struct mlxsw_core *core = mlxsw_m_port->mlxsw_m->core; - u8 local_port = mlxsw_m_port->local_port; - - return mlxsw_core_port_get_phys_port_name(core, local_port, name, len); -} - static int mlxsw_m_port_get_port_parent_id(struct net_device *dev, struct netdev_phys_item_id *ppid) { @@ -86,7 +76,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_phys_port_name = mlxsw_m_port_get_phys_port_name, .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 1225fa50f36f..8b9a6870dbc2 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -1254,16 +1254,6 @@ static int mlxsw_sp_port_kill_vid(struct net_device *dev, return 0; } -static int mlxsw_sp_port_get_phys_port_name(struct net_device *dev, char *name, - size_t len) -{ - struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev); - - return mlxsw_core_port_get_phys_port_name(mlxsw_sp_port->mlxsw_sp->core, - mlxsw_sp_port->local_port, - name, len); -} - static struct mlxsw_sp_port_mall_tc_entry * mlxsw_sp_port_mall_tc_entry_find(struct mlxsw_sp_port *port, unsigned long cookie) { @@ -1749,7 +1739,6 @@ static const struct net_device_ops mlxsw_sp_port_netdev_ops = { .ndo_get_offload_stats = mlxsw_sp_port_get_offload_stats, .ndo_vlan_rx_add_vid = mlxsw_sp_port_add_vid, .ndo_vlan_rx_kill_vid = mlxsw_sp_port_kill_vid, - .ndo_get_phys_port_name = mlxsw_sp_port_get_phys_port_name, .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 696b8c8547bc..5312dc1f339b 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c +++ b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c @@ -379,16 +379,6 @@ mlxsw_sx_port_get_stats64(struct net_device *dev, stats->tx_dropped = tx_dropped; } -static int mlxsw_sx_port_get_phys_port_name(struct net_device *dev, char *name, - size_t len) -{ - struct mlxsw_sx_port *mlxsw_sx_port = netdev_priv(dev); - - return mlxsw_core_port_get_phys_port_name(mlxsw_sx_port->mlxsw_sx->core, - mlxsw_sx_port->local_port, - name, len); -} - static int mlxsw_sx_port_get_port_parent_id(struct net_device *dev, struct netdev_phys_item_id *ppid) { @@ -417,7 +407,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_phys_port_name = mlxsw_sx_port_get_phys_port_name, .ndo_get_port_parent_id = mlxsw_sx_port_get_port_parent_id, .ndo_get_devlink_port = mlxsw_sx_port_get_devlink_port, }; -- 2.17.2