Commit d8cac8d9 authored Jul 03, 2016 by Sudip Mukherjee Committed by Alexandre Belloni Jul 19, 2016

rtc: abx80x: use devm_add_action_or_reset()

If devm_add_action() fails we are explicitly calling the cleanup to free
the resources allocated. Lets use the helper devm_add_action_or_reset()
and return directly in case of error, as we know that the cleanup function
has been already called by the helper if there was any error.

Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

parent 104b2d87

drivers/rtc/rtc-abx80x.c

+5 −7

Original line number	Diff line number	Diff line
		@@ -643,17 +643,15 @@ static int abx80x_probe(struct i2c_client *client,
		return err;
		}

		err = devm_add_action(&client->dev, rtc_calib_remove_sysfs_group,
		err = devm_add_action_or_reset(&client->dev,
		rtc_calib_remove_sysfs_group,
		&client->dev);
		if (err) {
		rtc_calib_remove_sysfs_group(&client->dev);
		if (err)
		dev_err(&client->dev,
		"Failed to add sysfs cleanup action: %d\n",
		err);
		return err;
		}

		return 0;
		return err;
		}

		static int abx80x_remove(struct i2c_client *client)