From mboxrd@z Thu Jan 1 00:00:00 1970 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=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,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 812C0C4360F for ; Fri, 1 Mar 2019 08:14:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4DB5F2186A for ; Fri, 1 Mar 2019 08:14:15 +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="dNdI0Lsh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733292AbfCAIOO (ORCPT ); Fri, 1 Mar 2019 03:14:14 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:41208 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733235AbfCAIOK (ORCPT ); Fri, 1 Mar 2019 03:14:10 -0500 Received: by mail-wr1-f66.google.com with SMTP id n2so24799416wrw.8 for ; Fri, 01 Mar 2019 00:14:08 -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=n14tlF5ApBqPSdpKBRoo4ZQhdCDU0BdWxEudc5hovdU=; b=dNdI0LshnPoGum6o+Qpv5RclYvjNz/dNsrolociaN85bXLcjhwtN4EiQI32FohAyUK grApO4QAXWYq+Fml/ZeVfK+RE1Hwqt4qHrKrHhEpNPi7YmC7cRg3KYiEh09NTs2h0oFL CswWWscCtIzElHZYp88Qaz7Pjnj/itythzGdMIkCewRFJAfry2Ram+S4nzQcfJyM+z3j G2dduu20ZijpWP/cMmLBakHGhzcKI+Mnj/qMeV+P0m4WZgqLcxyoLh8pPj0aY2vwH+0u rc7aywlut7vOYKqWI4wVrGTqatkUgSI8d7adKT7HRsbzr+6VdrZiB9LNtV60Gp2VceUi gqZA== 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=n14tlF5ApBqPSdpKBRoo4ZQhdCDU0BdWxEudc5hovdU=; b=B10nE+yofIkFpCt+Gx+/I+Pr/G7L2O7/nwGBwN8mIZ+UNyqtAJOgD+dCuoNpLG2juf ZSSJ2KXJ61/6z75bIgbtER82bsgyPl/BhOGcGB+oxO5aspW6Y6xPVAorAQ8GuZ4ikrGw Dsc7LpYpprzsTZyh+MnkgMZGtavika9z2GhY2Kbi52o1U1zW2pgz2gPwpCO+OtNRRFH3 BY7+T3IqD/GRLcqS7ZT2AZ8nPCVLsMnJKmcgaOzT1CBYJeJr8WULk1xX0p3pIEw2Cz3m zEhhL4qg1DEucXqCamiN7426Kdtwqh+8MvmyKAeNnLeVvWOHolcMEXtLdCahH4PuRbMh iBaw== X-Gm-Message-State: APjAAAVf3RBV/719rFJ2tdCI3PdLprnaKvqm1Qrglfl9yiJA+YfG6JCV GgrtX6IUzaJVNtHiLDXCA8mL4ZCs//g1xw== X-Google-Smtp-Source: APXvYqxmnMYB1gcUwF2d1b+lo43PCB/pvD2Jx01k2GXpX4LegDGy7nf2ZEIb86FUaWHZR5nmVAaF5g== X-Received: by 2002:a5d:668e:: with SMTP id l14mr2390883wru.198.1551428047817; Fri, 01 Mar 2019 00:14:07 -0800 (PST) Received: from localhost (ip-89-177-134-16.net.upcbroadband.cz. [89.177.134.16]) by smtp.gmail.com with ESMTPSA id w10sm26259380wru.5.2019.03.01.00.14.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2019 00:14:07 -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 4/5] mlxsw: Remove ndo_get_phys_port_name implementation Date: Fri, 1 Mar 2019 09:14:01 +0100 Message-Id: <20190301081402.6074-5-jiri@resnulli.us> X-Mailer: git-send-email 2.14.5 In-Reply-To: <20190301081402.6074-1-jiri@resnulli.us> References: <20190301081402.6074-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 introduce fallback and let the core directly call devlink in order to get the physical port name. Signed-off-by: Jiri Pirko --- drivers/net/ethernet/mellanox/mlxsw/core.c | 10 ---------- drivers/net/ethernet/mellanox/mlxsw/core.h | 2 -- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 11 ----------- drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 11 ----------- 4 files changed, 34 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c index 5d656310434d..d10108e44438 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 0592cd724ec3..60b017a07cea 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/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c index 7995e7b042a2..5d0adec84858 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -1253,16 +1253,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) { @@ -1748,7 +1738,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 533fe6235b7c..9999d866f394 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) { @@ -407,7 +397,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, }; -- 2.14.5