GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-03-31 11:34:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtc: rtc-fm3130: use devm_*() functions

Browse source 
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>
This commit is contained in:
Jingoo Han 2013-04-29 16:20:41 -07:00 • committed by Linus Torvalds
parent 2a444cf77c
commit c54a52e3a8
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/rtc/rtc-fm3130.c
View file

@ -358,7 +358,7 @@ static int fm3130_probe(struct i2c_client *client,
I2C_FUNC_I2C | I2C_FUNC_SMBUS_WRITE_BYTE_DATA)) I2C_FUNC_I2C | I2C_FUNC_SMBUS_WRITE_BYTE_DATA))
return -EIO; return -EIO;
fm3130 = kzalloc(sizeof(struct fm3130), GFP_KERNEL); fm3130 = devm_kzalloc(&client->dev, sizeof(struct fm3130), GFP_KERNEL);
if (!fm3130) if (!fm3130)
return -ENOMEM; return -ENOMEM;
@ -507,7 +507,7 @@ bad_clock:
/* We won't bail out here because we just got invalid data. /* We won't bail out here because we just got invalid data.
Time setting from u-boot doesn't work anyway */ Time setting from u-boot doesn't work anyway */
fm3130->rtc = rtc_device_register(client->name, &client->dev, fm3130->rtc = devm_rtc_device_register(&client->dev, client->name,
&fm3130_rtc_ops, THIS_MODULE); &fm3130_rtc_ops, THIS_MODULE);
if (IS_ERR(fm3130->rtc)) { if (IS_ERR(fm3130->rtc)) {
err = PTR_ERR(fm3130->rtc); err = PTR_ERR(fm3130->rtc);
@ -517,16 +517,11 @@ bad_clock:
} }
return 0; return 0;
exit_free: exit_free:
kfree(fm3130);
return err; return err;
} }
static int fm3130_remove(struct i2c_client *client) static int fm3130_remove(struct i2c_client *client)
{ {
struct fm3130 *fm3130 = i2c_get_clientdata(client);
rtc_device_unregister(fm3130->rtc);
kfree(fm3130);
return 0; return 0;
} }