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,URIBL_BLOCKED,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 3F5CAC43381 for ; Tue, 26 Feb 2019 03:34:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 05E9A206B8 for ; Tue, 26 Feb 2019 03:34:26 +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="cub6zPlR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726478AbfBZDeY (ORCPT ); Mon, 25 Feb 2019 22:34:24 -0500 Received: from mail-qk1-f195.google.com ([209.85.222.195]:34711 "EHLO mail-qk1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726447AbfBZDeW (ORCPT ); Mon, 25 Feb 2019 22:34:22 -0500 Received: by mail-qk1-f195.google.com with SMTP id a15so6790806qkc.1 for ; Mon, 25 Feb 2019 19:34:21 -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=hVWL/tYNdvnVV03Mzhxo7gnvc4lkVibU4m7a80GAeUM=; b=cub6zPlRqC7A6248fxnygIlGjuQ+ulx1xMXZ0YpxZYCAEFVh2XIPalRqFFa5/vfuL0 RpCm4JIT1/xfyYI7gHcFssOZTVu0BeWwidwpzoAnEwHHKYoVs3BpMLGzHiP4F3e8qRzN lsqvEQgYVCHEJv+M0J/xtc3c6GG7LWnakKbUE422FX44BDQnj4j0gH840FDbGSiPnSpL N5pT1izV4sZtOr8VcCJhkmXDB9oguYNHVJY8GsmDNzG4HwEMKX9eQvwx83J9dgfweP2H Xj4dh3q5q8+xhjtvGQiSoqnMIiM+4/HsAwCKhfWgsxKX456Dqm+XGo5bhA/9/HW7hbIg EFEw== 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=hVWL/tYNdvnVV03Mzhxo7gnvc4lkVibU4m7a80GAeUM=; b=eLC2EcWQtuX9NFvL9avMEHCc/IzB9VZtox3pyXjAmg6boClkBzS7TdW6O6lhAIb6j8 2LNMCJhrl9OwFSMgoFU1/ENiBfjD9SJhhwdab+S4bjlaYPbShay5JkxdHWE8Vm8z8/vY VOD5K/wQxoFeDiOt+YVd104TNHBDr1qS9Rere61zrcI2clR7U0RSlOYWnxacsI3INNnd MRlnsIRK9xQoVkwm9yp2izo4E0X1UP5MtOWceXzmraIFNmpwKJYabS8vjyUlqHG9Fj89 hD2jf5fTiAv/KXad+MBLZLgPhM5GTOcNojnxvny5AqcXt/02Y6QvT79g1Esr0nZCUKFU TVpQ== X-Gm-Message-State: AHQUAubqrD2434vs7M3HS/0wq9ozJe3xF6WrVnotOqmQY+76rCpipXqh mvbUrVGfpQ0BRdEVvGCxDZAcew== X-Google-Smtp-Source: AHgI3IarAsGMTZa3GMk8wfXt1UIGOUkB5Kb28PJmJy05g+1urjAX7avjy1KqBmv8OGF3TwSM/Rb3VQ== X-Received: by 2002:a37:ef0a:: with SMTP id j10mr15781239qkk.336.1551152061165; Mon, 25 Feb 2019 19:34:21 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id i20sm8120317qta.19.2019.02.25.19.34.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Feb 2019 19:34:20 -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 v4 4/6] nfp: remove ethtool flashing fallback Date: Mon, 25 Feb 2019 19:34:05 -0800 Message-Id: <20190226033407.32625-5-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190226033407.32625-1-jakub.kicinski@netronome.com> References: <20190226033407.32625-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 Acked-by: Jiri Pirko Reviewed-by: Florian Fainelli --- .../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