ethtool: Don't check for NULL info in prepare_data callbacks

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>
Link: https://patch.msgid.link/20240731-prepare_data-null-check-v1-1-627f2320678f@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/ethtool/linkinfo.c b/net/ethtool/linkinfo.c
index 5c317d23787b56afc7b1310e4d129ba883364537..30b8ce2751594ebdb49c1ebc80e3c7674795ce2a 100644 (file)
--- 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 b2591db49f7db82a37995fc43305d0d5cc74ccd1..259cd9ef1f2a1c1f5d0cb2d7d1d5d34bda42ebbf 100644 (file)
--- 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 c678b484a07954891568fe2e2f38fe9ae7834590..56b99606f00b99665b1cf269a2072047f78f08d2 100644 (file)
--- 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;
                        }
                }