Commit 8edcd98b authored by Fuqian Huang's avatar Fuqian Huang Committed by Dmitry Torokhov
Browse files

Input: cyapa - switch to using devm_add_action_or_reset() 



devm_add_action_or_reset() is introduced as a helper function which
internally calls devm_add_action(). If devm_add_action() fails
then it will execute the action mentioned and return the error code.
This reduce source code size (avoid writing the action twice)
and reduce the likelyhood of bugs.

Signed-off-by: default avatarFuqian Huang <huangfq.daxian@gmail.com>
Link: https://lore.kernel.org/linux-input/20190708123323.11943-1-huangfq.daxian@gmail.com


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 3d82a4d7

drivers/input/mouse/cyapa.c

+4 −6
Original line number Diff line number Diff line
@@ -840,10 +840,9 @@ static int cyapa_prepare_wakeup_controls(struct cyapa *cyapa) 
			return error;

		}



		error = devm_add_action(dev,

		error = devm_add_action_or_reset(dev,

				cyapa_remove_power_wakeup_group, cyapa);

		if (error) {

			cyapa_remove_power_wakeup_group(cyapa);

			dev_err(dev, "failed to add power cleanup action: %d\n",

				error);

			return error;
@@ -957,9 +956,9 @@ static int cyapa_start_runtime(struct cyapa *cyapa) 
		return error;

	}



	error = devm_add_action(dev, cyapa_remove_power_runtime_group, cyapa);

	error = devm_add_action_or_reset(dev, cyapa_remove_power_runtime_group,

					 cyapa);

	if (error) {

		cyapa_remove_power_runtime_group(cyapa);

		dev_err(dev,

			"failed to add power runtime cleanup action: %d\n",

			error);
@@ -1291,9 +1290,8 @@ static int cyapa_probe(struct i2c_client *client, 
		return error;

	}



	error = devm_add_action(dev, cyapa_disable_regulator, cyapa);

	error = devm_add_action_or_reset(dev, cyapa_disable_regulator, cyapa);

	if (error) {

		cyapa_disable_regulator(cyapa);

		dev_err(dev, "failed to add disable regulator action: %d\n",

			error);

		return error;