Commit 17581718 authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds
Browse files

rtc: rtc-x1205: use devm_rtc_device_register()



devm_rtc_device_register() is device managed and makes cleanup paths
simpler.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a5aa7776
Loading
Loading
Loading
Loading
+3 −11
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ static int x1205_probe(struct i2c_client *client,

	dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n");

	rtc = rtc_device_register(x1205_driver.driver.name, &client->dev,
	rtc = devm_rtc_device_register(&client->dev, x1205_driver.driver.name,
					&x1205_rtc_ops, THIS_MODULE);

	if (IS_ERR(rtc))
@@ -653,21 +653,13 @@ static int x1205_probe(struct i2c_client *client,

	err = x1205_sysfs_register(&client->dev);
	if (err)
		goto exit_devreg;
		return err;

	return 0;

exit_devreg:
	rtc_device_unregister(rtc);

	return err;
}

static int x1205_remove(struct i2c_client *client)
{
	struct rtc_device *rtc = i2c_get_clientdata(client);

	rtc_device_unregister(rtc);
	x1205_sysfs_unregister(&client->dev);
	return 0;
}