From patchwork Fri Mar 1 18:04:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 1050322 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=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="lblqMY4h"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 449y4s3CNlz9s5R for ; Sat, 2 Mar 2019 05:05:17 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388303AbfCASFP (ORCPT ); Fri, 1 Mar 2019 13:05:15 -0500 Received: from mail-qt1-f196.google.com ([209.85.160.196]:39753 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728499AbfCASFP (ORCPT ); Fri, 1 Mar 2019 13:05:15 -0500 Received: by mail-qt1-f196.google.com with SMTP id o6so28780879qtk.6 for ; Fri, 01 Mar 2019 10:05:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KktHkygU6jWmqL+PKca+3KkQtat9XwZ62aEsEchNYTo=; b=lblqMY4hxudvJ9i05El3QxGlo5A9LXmd2BblLbfMmnCdNo9dGTWwb/EHEoI1AmF3cq 8GPlPjs7X2JfWvpujBB1/jJXvMHBsglvl7j3sNraOA7xZtjnLqur8XOgXj1lFMO/YaBQ KAwkTYhPqqaV9ud7jBlHDeUza74tdx0q0rgQCqS0fav87pivZ1FpXn/83X+98tvgo1fF b5oFsh9eVe4cvUrP1x9SOPRU3QgvOaTUebtgQ99vIzMVUvhS9XVCswpn/3czwgkhmc7s PAlRKAjz0Ar7gy6Glg75xO/Oscjax3B6lubBvTECVlZJMOKrW5n7Kse9K1pmTuIDsgue 8cJg== 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:mime-version:content-transfer-encoding; bh=KktHkygU6jWmqL+PKca+3KkQtat9XwZ62aEsEchNYTo=; b=StaYYkeMmBozqNmc0HscOu74AqG646rqryptst6D8wLBzLSdEISA/rCiIbULisC9Qg a8xHtbtqATKvfisJAEo3p6Reas4hCOh2HsP4k0MhaA01PmuRJGMAE4ZreC/Bytd6W9vn DnwXucy5liHEIIaqQ0otEvuF6+zKhypl7J1A+yPkrJa9DkRFttGGqMirTJBxslIKU5Df hQIeNLTt3fVDQ2XmvohNAC4TnBmF7zVkM2R1hg1yTDWjhreUP4ltQWjAXDYa1abOf0t/ P96KG3GIsRH85hYtzEHALAnyQSbwCgbtAec5SnkeKab2Yh+bZRszw+ofUx2g7DdB2ux8 8mJA== X-Gm-Message-State: APjAAAUJSq+7ML4uk0h8RMCa/EgZEpkiN0NDml3MYHBKN5BbDcHoodSL 1htlWiHfRvCEARoM+16+YmVa/g== X-Google-Smtp-Source: APXvYqzBSqghooHkqjg83DrpLjRpA2sUbOnBLoS2NDU9Z7wptYrexH9/0dyMfk3RhrhvfJ0WrI22zA== X-Received: by 2002:ac8:1bb7:: with SMTP id z52mr5119285qtj.294.1551463513746; Fri, 01 Mar 2019 10:05:13 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id a13sm16785792qtb.6.2019.03.01.10.05.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Mar 2019 10:05:13 -0800 (PST) From: Jakub Kicinski To: jiri@resnulli.us, davem@davemloft.net Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH net-next v2 5/7] nfp: switch to devlink_port_get_phys_port_name() Date: Fri, 1 Mar 2019 10:04:51 -0800 Message-Id: <20190301180453.17778-6-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190301180453.17778-1-jakub.kicinski@netronome.com> References: <20190301180453.17778-1-jakub.kicinski@netronome.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Now that devlink understands all port flavours - switch to the devlink_port_get_phys_port_name() helper. Signed-off-by: Jakub Kicinski --- drivers/net/ethernet/netronome/nfp/nfp_port.c | 33 +------------------ 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_port.c b/drivers/net/ethernet/netronome/nfp/nfp_port.c index 93c5bfc0510b..3e2ff8d35e8d 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_port.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_port.c @@ -117,44 +117,13 @@ struct nfp_eth_table_port *nfp_port_get_eth_port(struct nfp_port *port) int nfp_port_get_phys_port_name(struct net_device *netdev, char *name, size_t len) { - struct nfp_eth_table_port *eth_port; struct nfp_port *port; - int n; port = nfp_port_from_netdev(netdev); if (!port) return -EOPNOTSUPP; - switch (port->type) { - case NFP_PORT_PHYS_PORT: - eth_port = __nfp_port_get_eth_port(port); - if (!eth_port) - return -EOPNOTSUPP; - - if (!eth_port->is_split) - n = snprintf(name, len, "p%d", eth_port->label_port); - else - n = snprintf(name, len, "p%ds%d", eth_port->label_port, - eth_port->label_subport); - break; - case NFP_PORT_PF_PORT: - if (!port->pf_split) - n = snprintf(name, len, "pf%d", port->pf_id); - else - n = snprintf(name, len, "pf%ds%d", port->pf_id, - port->pf_split_id); - break; - case NFP_PORT_VF_PORT: - n = snprintf(name, len, "pf%dvf%d", port->pf_id, port->vf_id); - break; - default: - return -EOPNOTSUPP; - } - - if (n >= len) - return -EINVAL; - - return 0; + return devlink_port_get_phys_port_name(&port->dl_port, name, len); } /**