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 D23DFC43381 for ; Fri, 22 Feb 2019 22:15:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9F566206C0 for ; Fri, 22 Feb 2019 22:15:10 +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="XxBe2Ozm" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726492AbfBVWPG (ORCPT ); Fri, 22 Feb 2019 17:15:06 -0500 Received: from mail-qt1-f196.google.com ([209.85.160.196]:41901 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726387AbfBVWPD (ORCPT ); Fri, 22 Feb 2019 17:15:03 -0500 Received: by mail-qt1-f196.google.com with SMTP id v10so4317257qtp.8 for ; Fri, 22 Feb 2019 14:15:02 -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=NMNkzC8Ri0itmDMCbwDkcpwGc6DYiermiwOcT9uaoqE=; b=XxBe2Ozm0RvvBXpjGUywkYGiyrq/ynM1Zbd43naoSVNOQr/dFzVfuLo2pgANdkYSo5 LSKGEuovtbqVQs4zRuYa6vKmeRFaVKByCd+of9HNyGn04aMl3VRlC605HIUyp+6mq5Ff ND+kcLkU3GQZZVk+fLjufViiLsZ4U8/EyXRn4kMPIut0YEigd5Sc+em8+ur8t52NfoAz f2ouWXPFglLe2cYU7O3CNAxgFhO6GC06lhDwx2XXTyr/bv6kQFzusZpeVhZSPrAXDhXj sHQA/LNmeprWWh3jwx8VN8kG0aLvKfwmGsRG0IhOa9S42PMNfqUjFRyM6DGspuQtPsn6 XUCQ== 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=NMNkzC8Ri0itmDMCbwDkcpwGc6DYiermiwOcT9uaoqE=; b=h1kCw54BckiRUqLC2wfcqjZrntU8O3oU+REXwcHBD8G++YrV0LQP2QjzMmPbxDo2kA YwDfxl95/7O3mZhAavRnA78MakEySymGgV49vUE5PtCgDKt0+zaLYHWx0DKPjt4MtiEe 87vpGuPOhHThuwAP9hTwnWJOk9/WNv5CkuSoPcD1QQcxCEQvY9WkPog5u5l9b4bbmvVD menRdocRz6klIK3SKeLViwRjvGGODn1pVwHEXaUgWGrGq9+WVfpgLyMDyR1Ray42atzY yLPnxvTHqv9Dy84HGVyC8PXpANvmUyaNHHYm4Ug0t0ZX64mRcdcqmApZ2yhBbDu6GBm3 nGBg== X-Gm-Message-State: AHQUAub6+W8RrZFGHMETns+10IlHg9LdQBst0ATGx9YpLMcEJrNCHp5F GgcC0DNxEupwdQ9iOMdrkaS0wA== X-Google-Smtp-Source: AHgI3Ibj6/TG1lk2bdnpTkSutWvPTqgrdZp0+NO6EZpmdkQKnpdEFEMWc3T9w/4nGVUPNmpozg/QQw== X-Received: by 2002:ac8:1bf7:: with SMTP id m52mr5065454qtk.200.1550873702317; Fri, 22 Feb 2019 14:15:02 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id j66sm2707211qkj.27.2019.02.22.14.15.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Feb 2019 14:15:01 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net, jiri@resnulli.us Cc: mkubecek@suse.cz, andrew@lunn.ch, f.fainelli@gmail.com, netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH net-next v3 4/6] nfp: remove ethtool flashing fallback Date: Fri, 22 Feb 2019 14:07:55 -0800 Message-Id: <20190222220758.7117-5-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190222220758.7117-1-jakub.kicinski@netronome.com> References: <20190222220758.7117-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 fallback will be called reliably, we can remove the ethtool flashing code. Signed-off-by: Jakub Kicinski --- .../ethernet/netronome/nfp/nfp_net_ethtool.c | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c index 8f189149efc5..690b62718dbb 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c @@ -1234,28 +1234,6 @@ static int nfp_net_set_channels(struct net_device *netdev, return nfp_net_set_num_rings(nn, total_rx, total_tx); } -static int -nfp_net_flash_device(struct net_device *netdev, struct ethtool_flash *flash) -{ - struct nfp_app *app; - int ret; - - if (flash->region != ETHTOOL_FLASH_ALL_REGIONS) - return -EOPNOTSUPP; - - app = nfp_app_from_netdev(netdev); - if (!app) - return -EOPNOTSUPP; - - dev_hold(netdev); - rtnl_unlock(); - ret = nfp_flash_update_common(app->pf, flash->data, NULL); - rtnl_lock(); - dev_put(netdev); - - return ret; -} - static const struct ethtool_ops nfp_net_ethtool_ops = { .get_drvinfo = nfp_net_get_drvinfo, .get_link = ethtool_op_get_link, @@ -1266,7 +1244,6 @@ static const struct ethtool_ops nfp_net_ethtool_ops = { .get_sset_count = nfp_net_get_sset_count, .get_rxnfc = nfp_net_get_rxnfc, .set_rxnfc = nfp_net_set_rxnfc, - .flash_device = nfp_net_flash_device, .get_rxfh_indir_size = nfp_net_get_rxfh_indir_size, .get_rxfh_key_size = nfp_net_get_rxfh_key_size, .get_rxfh = nfp_net_get_rxfh, @@ -1292,7 +1269,6 @@ const struct ethtool_ops nfp_port_ethtool_ops = { .get_strings = nfp_port_get_strings, .get_ethtool_stats = nfp_port_get_stats, .get_sset_count = nfp_port_get_sset_count, - .flash_device = nfp_net_flash_device, .set_dump = nfp_app_set_dump, .get_dump_flag = nfp_app_get_dump_flag, .get_dump_data = nfp_app_get_dump_data, -- 2.19.2