Use devm_*() functions to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
- if (!(rs5c372 = kzalloc(sizeof(struct rs5c372), GFP_KERNEL))) {
+ rs5c372 = devm_kzalloc(&client->dev, sizeof(struct rs5c372),
+ GFP_KERNEL);
+ if (!rs5c372) {
err = -ENOMEM;
goto exit;
}
err = -ENOMEM;
goto exit;
}
err = rs5c_get_regs(rs5c372);
if (err < 0)
err = rs5c_get_regs(rs5c372);
if (err < 0)
/* clock may be set for am/pm or 24 hr time */
switch (rs5c372->type) {
/* clock may be set for am/pm or 24 hr time */
switch (rs5c372->type) {
break;
default:
dev_err(&client->dev, "unknown RTC type\n");
break;
default:
dev_err(&client->dev, "unknown RTC type\n");
}
/* if the oscillator lost power and no other software (like
}
/* if the oscillator lost power and no other software (like
err = rs5c_oscillator_setup(rs5c372);
if (unlikely(err < 0)) {
dev_err(&client->dev, "setup error\n");
err = rs5c_oscillator_setup(rs5c372);
if (unlikely(err < 0)) {
dev_err(&client->dev, "setup error\n");
}
if (rs5c372_get_datetime(client, &tm) < 0)
}
if (rs5c372_get_datetime(client, &tm) < 0)
);
/* REVISIT use client->irq to register alarm irq ... */
);
/* REVISIT use client->irq to register alarm irq ... */
-
- rs5c372->rtc = rtc_device_register(rs5c372_driver.driver.name,
- &client->dev, &rs5c372_rtc_ops, THIS_MODULE);
+ rs5c372->rtc = devm_rtc_device_register(&client->dev,
+ rs5c372_driver.driver.name,
+ &rs5c372_rtc_ops, THIS_MODULE);
if (IS_ERR(rs5c372->rtc)) {
err = PTR_ERR(rs5c372->rtc);
if (IS_ERR(rs5c372->rtc)) {
err = PTR_ERR(rs5c372->rtc);
}
err = rs5c_sysfs_register(&client->dev);
if (err)
}
err = rs5c_sysfs_register(&client->dev);
if (err)
-exit_devreg:
- rtc_device_unregister(rs5c372->rtc);
-
-exit_kfree:
- kfree(rs5c372);
-
exit:
return err;
}
static int rs5c372_remove(struct i2c_client *client)
{
exit:
return err;
}
static int rs5c372_remove(struct i2c_client *client)
{
- struct rs5c372 *rs5c372 = i2c_get_clientdata(client);
-
- rtc_device_unregister(rs5c372->rtc);
rs5c_sysfs_unregister(&client->dev);
rs5c_sysfs_unregister(&client->dev);