mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 14:14:37 +00:00
rtc: rtc-v3020: 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:
parent
87a8142087
commit
431c6c1df3
1 changed files with 3 additions and 10 deletions
|
@ -309,7 +309,7 @@ static int rtc_probe(struct platform_device *pdev)
|
||||||
int i;
|
int i;
|
||||||
int temp;
|
int temp;
|
||||||
|
|
||||||
chip = kzalloc(sizeof *chip, GFP_KERNEL);
|
chip = devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL);
|
||||||
if (!chip)
|
if (!chip)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
@ -353,8 +353,8 @@ static int rtc_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
platform_set_drvdata(pdev, chip);
|
platform_set_drvdata(pdev, chip);
|
||||||
|
|
||||||
chip->rtc = rtc_device_register("v3020",
|
chip->rtc = devm_rtc_device_register(&pdev->dev, "v3020",
|
||||||
&pdev->dev, &v3020_rtc_ops, THIS_MODULE);
|
&v3020_rtc_ops, THIS_MODULE);
|
||||||
if (IS_ERR(chip->rtc)) {
|
if (IS_ERR(chip->rtc)) {
|
||||||
retval = PTR_ERR(chip->rtc);
|
retval = PTR_ERR(chip->rtc);
|
||||||
goto err_io;
|
goto err_io;
|
||||||
|
@ -365,21 +365,14 @@ static int rtc_probe(struct platform_device *pdev)
|
||||||
err_io:
|
err_io:
|
||||||
chip->ops->unmap_io(chip);
|
chip->ops->unmap_io(chip);
|
||||||
err_chip:
|
err_chip:
|
||||||
kfree(chip);
|
|
||||||
|
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int rtc_remove(struct platform_device *dev)
|
static int rtc_remove(struct platform_device *dev)
|
||||||
{
|
{
|
||||||
struct v3020 *chip = platform_get_drvdata(dev);
|
struct v3020 *chip = platform_get_drvdata(dev);
|
||||||
struct rtc_device *rtc = chip->rtc;
|
|
||||||
|
|
||||||
if (rtc)
|
|
||||||
rtc_device_unregister(rtc);
|
|
||||||
|
|
||||||
chip->ops->unmap_io(chip);
|
chip->ops->unmap_io(chip);
|
||||||
kfree(chip);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue