ice: Make use of the helper function devm_add_action_or_reset()
authorCai Huoqing <caihuoqing@baidu.com>
Wed, 22 Sep 2021 12:59:46 +0000 (20:59 +0800)
committerTony Nguyen <anthony.l.nguyen@intel.com>
Tue, 19 Oct 2021 17:53:28 +0000 (10:53 -0700)
The helper function devm_add_action_or_reset() will internally
call devm_add_action(), and if devm_add_action() fails then it will
execute the action mentioned and return the error code. So
use devm_add_action_or_reset() instead of devm_add_action()
to simplify the error handling, reduce the code.

Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
drivers/net/ethernet/intel/ice/ice_devlink.c

index 55353bf..e3d9f3f 100644 (file)
@@ -452,10 +452,8 @@ struct ice_pf *ice_allocate_pf(struct device *dev)
                return NULL;
 
        /* Add an action to teardown the devlink when unwinding the driver */
-       if (devm_add_action(dev, ice_devlink_free, devlink)) {
-               devlink_free(devlink);
+       if (devm_add_action_or_reset(dev, ice_devlink_free, devlink))
                return NULL;
-       }
 
        return devlink_priv(devlink);
 }