summaryrefslogtreecommitdiffstats
path: root/drivers/rtc/rtc-max77686.c
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-04-30 01:18:30 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-30 03:28:21 +0200
commit0f64f853fc622a0b0c7ab255f8605ae40aa45d84 (patch)
treeb707a55fe215ba7936a8ccdb83455c047cdae458 /drivers/rtc/rtc-max77686.c
parentdrivers/rtc/rtc-max77686.c: add missing module author name (diff)
downloadlinux-0f64f853fc622a0b0c7ab255f8605ae40aa45d84.tar.xz
linux-0f64f853fc622a0b0c7ab255f8605ae40aa45d84.zip
drivers/rtc/rtc-max77686.c: use devm_kzalloc()
Use devm_kzalloc() to make cleanup paths more simple. 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>
Diffstat (limited to 'drivers/rtc/rtc-max77686.c')
-rw-r--r--drivers/rtc/rtc-max77686.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/rtc/rtc-max77686.c b/drivers/rtc/rtc-max77686.c
index 4da2a55ff88f..36b1f5cc4f41 100644
--- a/drivers/rtc/rtc-max77686.c
+++ b/drivers/rtc/rtc-max77686.c
@@ -505,7 +505,8 @@ static int max77686_rtc_probe(struct platform_device *pdev)
dev_info(&pdev->dev, "%s\n", __func__);
- info = kzalloc(sizeof(struct max77686_rtc_info), GFP_KERNEL);
+ info = devm_kzalloc(&pdev->dev, sizeof(struct max77686_rtc_info),
+ GFP_KERNEL);
if (!info)
return -ENOMEM;
@@ -519,7 +520,6 @@ static int max77686_rtc_probe(struct platform_device *pdev)
ret = PTR_ERR(info->max77686->rtc_regmap);
dev_err(info->max77686->dev, "Failed to allocate register map: %d\n",
ret);
- kfree(info);
return ret;
}
platform_set_drvdata(pdev, info);
@@ -563,11 +563,7 @@ static int max77686_rtc_probe(struct platform_device *pdev)
goto err_rtc;
}
- goto out;
err_rtc:
- kfree(info);
- return ret;
-out:
return ret;
}
@@ -578,7 +574,6 @@ static int max77686_rtc_remove(struct platform_device *pdev)
if (info) {
free_irq(info->virq, info);
rtc_device_unregister(info->rtc_dev);
- kfree(info);
}
return 0;