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-pcf2123: 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:47 -07:00 committed by Linus Torvalds
parent 6b5f486225
commit dd48ccc491
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/rtc/rtc-pcf2123.c
View File

@ -226,7 +226,8 @@ static int pcf2123_probe(struct spi_device *spi)
u8 txbuf[2], rxbuf[2]; u8 txbuf[2], rxbuf[2];
int ret, i; int ret, i;
pdata = kzalloc(sizeof(struct pcf2123_plat_data), GFP_KERNEL); pdata = devm_kzalloc(&spi->dev, sizeof(struct pcf2123_plat_data),
GFP_KERNEL);
if (!pdata) if (!pdata)
return -ENOMEM; return -ENOMEM;
spi->dev.platform_data = pdata; spi->dev.platform_data = pdata;
@ -281,7 +282,7 @@ static int pcf2123_probe(struct spi_device *spi)
pcf2123_delay_trec(); pcf2123_delay_trec();
/* Finalize the initialization */ /* Finalize the initialization */
rtc = rtc_device_register(pcf2123_driver.driver.name, &spi->dev, rtc = devm_rtc_device_register(&spi->dev, pcf2123_driver.driver.name,
&pcf2123_rtc_ops, THIS_MODULE); &pcf2123_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc)) { if (IS_ERR(rtc)) {
@ -314,7 +315,6 @@ sysfs_exit:
device_remove_file(&spi->dev, &pdata->regs[i].attr); device_remove_file(&spi->dev, &pdata->regs[i].attr);
kfree_exit: kfree_exit:
kfree(pdata);
spi->dev.platform_data = NULL; spi->dev.platform_data = NULL;
return ret; return ret;
} }
@ -325,15 +325,10 @@ static int pcf2123_remove(struct spi_device *spi)
int i; int i;
if (pdata) { if (pdata) {
struct rtc_device *rtc = pdata->rtc;
if (rtc)
rtc_device_unregister(rtc);
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
if (pdata->regs[i].name[0]) if (pdata->regs[i].name[0])
device_remove_file(&spi->dev, device_remove_file(&spi->dev,
&pdata->regs[i].attr); &pdata->regs[i].attr);
kfree(pdata);
} }
return 0; return 0;