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 EA16FC43381 for ; Tue, 26 Feb 2019 18:25:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BC86A2184D for ; Tue, 26 Feb 2019 18:25:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="izw0y2PD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729156AbfBZSY6 (ORCPT ); Tue, 26 Feb 2019 13:24:58 -0500 Received: from mail-qk1-f194.google.com ([209.85.222.194]:35423 "EHLO mail-qk1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729125AbfBZSY4 (ORCPT ); Tue, 26 Feb 2019 13:24:56 -0500 Received: by mail-qk1-f194.google.com with SMTP id z13so8204468qki.2 for ; Tue, 26 Feb 2019 10:24:55 -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=izw0y2PDGoBzs4yOT3soDg1gsW8BM27BTxXJA8Dy+o9UauLx+KwhdEJdnZDSVYD99w CYueLOkRODQ9fOwht0YAjx4qrRdVaf1PgybJp6T8YbAY0cdOEpXs0p/tYM5SZe13/uae XdH/uRi8uHOcfIqN5NfpA9dV20hxD/3MDvImVN5Zy7yKZeFfvuPa2OaEYWRY+IanIpxF m61h/833V4Oa24xFXn5X+FdBqkHDNVIv7lagv7pfvhU3XpQilafU0Lm/0DOCQSceicJm AcQvai6+U+/a7pa3tbFw2dM03VUxG40mn4MQ1Uy3Dq4kr8kPc+RFkUBtl0mjyWPuu8Tx PJpA== 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=JHVLAZK/iY3Fbb9N8zkDiGGnfUkRFAyDOTXSVg+wn6Bi1ujOksjnh45azZ9vg1XfI/ eJh/mzSl4ArBUdyH9eVRhNL+Avcd1ORh3WJFnyW65ckbC2Y4Fkzerh33JP7VuRYbFy9c AQPjETVaUGIaLNKO6gZWfVY5TC9/gcXr05/Z+SueFOi2U3l9oBRyQz8L/NUnMsVabb4D JLW2+eUfaE2hNQNBNI9zdO0WAhmBJDrMfEYckwuF5BTwe9ayMRE2ODcy8dbKyPdY0NRW Oa9BKQNMmzqu7GwLBLeqiaxWKskIdkklkjYQamL2sA1MHp0IPyUvjhCEGEQSo8y4Pm0n 6wTQ== X-Gm-Message-State: AHQUAuaMhETdUCWIN3yPlRtPOPG41Qj04BWrvzym0WbVql5YAZ2RtKbE swkfrKYlaVs+MergX6mscarAMA== X-Google-Smtp-Source: AHgI3IYwm34A7ydSP3MSylmHJGaj3P4/q5A0kYYP01LLrxGFIRPV7I5WQG9ZbcOPMEv6oRPvBlQqrA== X-Received: by 2002:a37:884:: with SMTP id 126mr18410980qki.56.1551205495060; Tue, 26 Feb 2019 10:24:55 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id u31sm9733892qth.15.2019.02.26.10.24.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Feb 2019 10:24:54 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net, jiri@resnulli.us Cc: oss-drivers@netronome.com, netdev@vger.kernel.org, Jakub Kicinski Subject: [PATCH net-next 5/8] nfp: switch to devlink_port_get_phys_port_name() Date: Tue, 26 Feb 2019 10:24:33 -0800 Message-Id: <20190226182436.23811-6-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190226182436.23811-1-jakub.kicinski@netronome.com> References: <20190226182436.23811-1-jakub.kicinski@netronome.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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); } /** -- 2.19.2