hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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:50 -07:00 committed by Linus Torvalds
parent d6fbdc34c2
commit 4ad21183da
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/rtc/rtc-pcf8583.c
View File

@ -268,39 +268,29 @@ static int pcf8583_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct pcf8583 *pcf8583; struct pcf8583 *pcf8583;
int err;
if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
return -ENODEV; return -ENODEV;
pcf8583 = kzalloc(sizeof(struct pcf8583), GFP_KERNEL); pcf8583 = devm_kzalloc(&client->dev, sizeof(struct pcf8583),
GFP_KERNEL);
if (!pcf8583) if (!pcf8583)
return -ENOMEM; return -ENOMEM;
i2c_set_clientdata(client, pcf8583); i2c_set_clientdata(client, pcf8583);
pcf8583->rtc = rtc_device_register(pcf8583_driver.driver.name, pcf8583->rtc = devm_rtc_device_register(&client->dev,
&client->dev, &pcf8583_rtc_ops, THIS_MODULE); pcf8583_driver.driver.name,
&pcf8583_rtc_ops, THIS_MODULE);
if (IS_ERR(pcf8583->rtc)) { if (IS_ERR(pcf8583->rtc))
err = PTR_ERR(pcf8583->rtc); return PTR_ERR(pcf8583->rtc);
goto exit_kfree;
}
return 0; return 0;
exit_kfree:
kfree(pcf8583);
return err;
} }
static int pcf8583_remove(struct i2c_client *client) static int pcf8583_remove(struct i2c_client *client)
{ {
struct pcf8583 *pcf8583 = i2c_get_clientdata(client);
if (pcf8583->rtc)
rtc_device_unregister(pcf8583->rtc);
kfree(pcf8583);
return 0; return 0;
} }