ethtool: fec_prepare_data() - jump to error handling

Refactor fec_prepare_data() a little bit to skip the body
of the function and exit on error. Currently the code
depends on the fact that we only have one call which
may fail between ethnl_ops_begin() and ethnl_ops_complete()
and simply saves the error code. This will get hairy with
the stats also being queried.

No functional changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ethtool/fec.c b/net/ethtool/fec.c
index 31454b9188bdb21cd27d744bdb6b935e617d89b7..3e7d091ee7aaf6e11929933a659ac3d096904d53 100644 (file)
--- a/net/ethtool/fec.c
+++ b/net/ethtool/fec.c
@@ -80,9 +80,8 @@ static int fec_prepare_data(const struct ethnl_req_info *req_base,
        if (ret < 0)
                return ret;
        ret = dev->ethtool_ops->get_fecparam(dev, &fec);
-       ethnl_ops_complete(dev);
        if (ret)
-               return ret;
+               goto out_complete;
 
        WARN_ON_ONCE(fec.reserved);
 
@@ -98,7 +97,9 @@ static int fec_prepare_data(const struct ethnl_req_info *req_base,
        if (data->active_fec == __ETHTOOL_LINK_MODE_MASK_NBITS)
                data->active_fec = 0;
 
-       return 0;
+out_complete:
+       ethnl_ops_complete(dev);
+       return ret;
 }
 
 static int fec_reply_size(const struct ethnl_req_info *req_base,