| Message ID | 20240731-prepare_data-null-check-v1-1-627f2320678f@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 743ff02152bc46bb4a2f2a49ec891c87eba6ab5b |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] ethtool: Don't check for NULL info in prepare_data callbacks | expand |
On Wed, 31 Jul 2024 10:15:28 +0100 Simon Horman wrote: > Since commit f946270d05c2 ("ethtool: netlink: always pass genl_info to > .prepare_data") the info argument of prepare_data callbacks is never > NULL. Remove checks present in callback implementations. > > Link: https://lore.kernel.org/netdev/20240703121237.3f8b9125@kernel.org/ > Signed-off-by: Simon Horman <horms@kernel.org> Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Wed, 31 Jul 2024 10:15:28 +0100 you wrote: > Since commit f946270d05c2 ("ethtool: netlink: always pass genl_info to > .prepare_data") the info argument of prepare_data callbacks is never > NULL. Remove checks present in callback implementations. > > Link: https://lore.kernel.org/netdev/20240703121237.3f8b9125@kernel.org/ > Signed-off-by: Simon Horman <horms@kernel.org> > > [...] Here is the summary with links: - [net-next] ethtool: Don't check for NULL info in prepare_data callbacks https://git.kernel.org/netdev/net-next/c/743ff02152bc You are awesome, thank you!
diff --git a/net/ethtool/linkinfo.c b/net/ethtool/linkinfo.c index 5c317d23787b..30b8ce275159 100644 --- a/net/ethtool/linkinfo.c +++ b/net/ethtool/linkinfo.c @@ -35,7 +35,7 @@ static int linkinfo_prepare_data(const struct ethnl_req_info *req_base, if (ret < 0) return ret; ret = __ethtool_get_link_ksettings(dev, &data->ksettings); - if (ret < 0 && info) + if (ret < 0) GENL_SET_ERR_MSG(info, "failed to retrieve link settings"); ethnl_ops_complete(dev); diff --git a/net/ethtool/linkmodes.c b/net/ethtool/linkmodes.c index b2591db49f7d..259cd9ef1f2a 100644 --- a/net/ethtool/linkmodes.c +++ b/net/ethtool/linkmodes.c @@ -40,7 +40,7 @@ static int linkmodes_prepare_data(const struct ethnl_req_info *req_base, return ret; ret = __ethtool_get_link_ksettings(dev, &data->ksettings); - if (ret < 0 && info) { + if (ret < 0) { GENL_SET_ERR_MSG(info, "failed to retrieve link settings"); goto out; } diff --git a/net/ethtool/strset.c b/net/ethtool/strset.c index c678b484a079..56b99606f00b 100644 --- a/net/ethtool/strset.c +++ b/net/ethtool/strset.c @@ -289,8 +289,7 @@ static int strset_prepare_data(const struct ethnl_req_info *req_base, for (i = 0; i < ETH_SS_COUNT; i++) { if ((req_info->req_ids & (1U << i)) && data->sets[i].per_dev) { - if (info) - GENL_SET_ERR_MSG(info, "requested per device strings without dev"); + GENL_SET_ERR_MSG(info, "requested per device strings without dev"); return -EINVAL; } }
Since commit f946270d05c2 ("ethtool: netlink: always pass genl_info to .prepare_data") the info argument of prepare_data callbacks is never NULL. Remove checks present in callback implementations. Link: https://lore.kernel.org/netdev/20240703121237.3f8b9125@kernel.org/ Signed-off-by: Simon Horman <horms@kernel.org> --- net/ethtool/linkinfo.c | 2 +- net/ethtool/linkmodes.c | 2 +- net/ethtool/strset.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-)