Commit 7c1b694a authored by Cai Huoqing's avatar Cai Huoqing Committed by Tony Nguyen
Browse files

ice: Make use of the helper function devm_add_action_or_reset() 



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: default avatarCai Huoqing <caihuoqing@baidu.com>
Tested-by: default avatarGurucharan G <gurucharanx.g@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 3f13f570

drivers/net/ethernet/intel/ice/ice_devlink.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

}