Commit 03969b94 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller

nfp: remove ethtool flashing fallback

Now that devlink fallback will be called reliably, we can remove
the ethtool flashing code.
Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 28e8c754
...@@ -1234,28 +1234,6 @@ static int nfp_net_set_channels(struct net_device *netdev, ...@@ -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); 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 = { static const struct ethtool_ops nfp_net_ethtool_ops = {
.get_drvinfo = nfp_net_get_drvinfo, .get_drvinfo = nfp_net_get_drvinfo,
.get_link = ethtool_op_get_link, .get_link = ethtool_op_get_link,
...@@ -1266,7 +1244,6 @@ static const struct ethtool_ops nfp_net_ethtool_ops = { ...@@ -1266,7 +1244,6 @@ static const struct ethtool_ops nfp_net_ethtool_ops = {
.get_sset_count = nfp_net_get_sset_count, .get_sset_count = nfp_net_get_sset_count,
.get_rxnfc = nfp_net_get_rxnfc, .get_rxnfc = nfp_net_get_rxnfc,
.set_rxnfc = nfp_net_set_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_indir_size = nfp_net_get_rxfh_indir_size,
.get_rxfh_key_size = nfp_net_get_rxfh_key_size, .get_rxfh_key_size = nfp_net_get_rxfh_key_size,
.get_rxfh = nfp_net_get_rxfh, .get_rxfh = nfp_net_get_rxfh,
...@@ -1292,7 +1269,6 @@ const struct ethtool_ops nfp_port_ethtool_ops = { ...@@ -1292,7 +1269,6 @@ const struct ethtool_ops nfp_port_ethtool_ops = {
.get_strings = nfp_port_get_strings, .get_strings = nfp_port_get_strings,
.get_ethtool_stats = nfp_port_get_stats, .get_ethtool_stats = nfp_port_get_stats,
.get_sset_count = nfp_port_get_sset_count, .get_sset_count = nfp_port_get_sset_count,
.flash_device = nfp_net_flash_device,
.set_dump = nfp_app_set_dump, .set_dump = nfp_app_set_dump,
.get_dump_flag = nfp_app_get_dump_flag, .get_dump_flag = nfp_app_get_dump_flag,
.get_dump_data = nfp_app_get_dump_data, .get_dump_data = nfp_app_get_dump_data,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment