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 B5E20C43381 for ; Fri, 1 Mar 2019 16:05:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 86A8F20857 for ; Fri, 1 Mar 2019 16:05:58 +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="tYkqUjKe" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388979AbfCAQF5 (ORCPT ); Fri, 1 Mar 2019 11:05:57 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:36494 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388959AbfCAQFy (ORCPT ); Fri, 1 Mar 2019 11:05:54 -0500 Received: by mail-wr1-f68.google.com with SMTP id o17so26471270wrw.3 for ; Fri, 01 Mar 2019 08:05:52 -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=ehH9SzOoHKuTj9YZnt7e9HdEDGYJx2xNYFSXWt/Qha4=; b=tYkqUjKeXnAKx9ga/WpDxhyXnzgW0m++klG7IoZdnKzpk+qyu6PiKoz5FFaMv/6pWa amFHWD9XrBggM+bZyxdjx1CoiFYAhmnTY+gzDGwL4xj78nNYU2wM+HlEcxaRv79VpHJ7 0ubkCgGZImCrT6lkgiSN8247uRbsd7XPLKHdo4l7r6y/YUpusJQ+7eaQ3pMttXxU4G7R li9/cWkGto66vARU+u3kt4e+IqRVXW7Ub6JRBuiCl6Gzn4wEcCNqmPh5ZWOfguG+jeRf ias3qu6UitbQtTPD+C0PwCEV7kwpwrhl/Id1s1/JL+aPzVag7zLPSG10/aha/hlobXzH sx6A== 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=ehH9SzOoHKuTj9YZnt7e9HdEDGYJx2xNYFSXWt/Qha4=; b=YXUuGbPIkmUnqFla1dhYoD4+SCjXoApGW+BSoYzQ4O2hPvAizqlpvdaCAyiP5acdvu 4M56kIMuHdTXNswz0bNVNMErF3vcxoc9kf1JBOWktQnCmgqaWR16QCvAueutMIM/d7E0 Rm3RRRKbYNNCWRDG1Q0CwjBct6KYPhpQk7DG3qgYovhnzzMS4kht007PIxpHnJGo9CU4 EBGB2cx7YQT3PIpkaB3i2VkeSWQEJlScIrbRR6zTynsKIHlUYtQbIF1QX1p6TwWau6zW FRAeVqZQ/C39AKGpONUqYZvVNTGI+1Fb5abV6CVsc/YsAiXSZNQuULzQD+nALBdW9Uwf hsog== X-Gm-Message-State: APjAAAUOpQoZntMFx4GcEgRvCelEzTn5SFfcwRzZ8DTBR7BFXQ3Usn9v rb/+cC6zS5ufKKn7ECS985DWwLckjw1UbQ== X-Google-Smtp-Source: APXvYqxQ/meefGV/D+ygq820Ho4B5RC7RvsuMSLXyPdDI+ZCAc/q7UKFUobszzvUQF2rwogLnc8o1w== X-Received: by 2002:adf:8273:: with SMTP id 106mr4150048wrb.34.1551456351981; Fri, 01 Mar 2019 08:05:51 -0800 (PST) Received: from localhost (ip-89-177-134-16.net.upcbroadband.cz. [89.177.134.16]) by smtp.gmail.com with ESMTPSA id 132sm22544876wmd.27.2019.03.01.08.05.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2019 08:05:51 -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 8/8] nfp: remove ndo_get_port_parent_id implementation Date: Fri, 1 Mar 2019 17:05:42 +0100 Message-Id: <20190301160542.6474-9-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/netronome/nfp/nfp_net_common.c | 1 - drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 1 - drivers/net/ethernet/netronome/nfp/nfp_port.c | 16 ---------------- 3 files changed, 18 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index 7dd6b3fbb394..a75b19f2534f 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -3530,7 +3530,6 @@ const struct net_device_ops nfp_net_netdev_ops = { .ndo_udp_tunnel_add = nfp_net_add_vxlan_port, .ndo_udp_tunnel_del = nfp_net_del_vxlan_port, .ndo_bpf = nfp_net_xdp, - .ndo_get_port_parent_id = nfp_port_get_port_parent_id, .ndo_get_devlink_port = nfp_devlink_get_devlink_port, }; diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c index bf621674f583..c3ad083d36c6 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c @@ -272,7 +272,6 @@ const struct net_device_ops nfp_repr_netdev_ops = { .ndo_fix_features = nfp_repr_fix_features, .ndo_set_features = nfp_port_set_features, .ndo_set_mac_address = eth_mac_addr, - .ndo_get_port_parent_id = nfp_port_get_port_parent_id, .ndo_get_devlink_port = nfp_devlink_get_devlink_port, }; diff --git a/drivers/net/ethernet/netronome/nfp/nfp_port.c b/drivers/net/ethernet/netronome/nfp/nfp_port.c index 93c5bfc0510b..fcd16877e6e0 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_port.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_port.c @@ -30,22 +30,6 @@ struct nfp_port *nfp_port_from_netdev(struct net_device *netdev) return NULL; } -int nfp_port_get_port_parent_id(struct net_device *netdev, - struct netdev_phys_item_id *ppid) -{ - struct nfp_port *port; - const u8 *serial; - - port = nfp_port_from_netdev(netdev); - if (!port) - return -EOPNOTSUPP; - - ppid->id_len = nfp_cpp_serial(port->app->cpp, &serial); - memcpy(&ppid->id, serial, ppid->id_len); - - return 0; -} - int nfp_port_setup_tc(struct net_device *netdev, enum tc_setup_type type, void *type_data) { -- 2.14.5