Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-07 13:43:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drivers/rtc/rtc-twl.c: use devm_*() functions

Browse Source 
Use devm_*() functions to make cleanup paths simpler, and remove
unnecessary remove().

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Cc: Yoichi Yuasa <yuasa@linux-mips.org>
Cc: Grygorii Strashko <grygorii.strashko@ti.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 2014-01-23 15:55:06 -08:00 committed by Linus Torvalds
parent 663b35241d
commit f53eeb853d
1 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/rtc/rtc-twl.c
View File

@ -479,7 +479,7 @@ static int twl_rtc_probe(struct platform_device *pdev)
u8 rd_reg; u8 rd_reg;
if (irq <= 0) if (irq <= 0)
goto out1; return ret;
/* Initialize the register map */ /* Initialize the register map */
if (twl_class_is_4030()) if (twl_class_is_4030())
@ -489,7 +489,7 @@ static int twl_rtc_probe(struct platform_device *pdev)
ret = twl_rtc_read_u8(&rd_reg, REG_RTC_STATUS_REG); ret = twl_rtc_read_u8(&rd_reg, REG_RTC_STATUS_REG);
if (ret < 0) if (ret < 0)
goto out1; return ret;
if (rd_reg & BIT_RTC_STATUS_REG_POWER_UP_M) if (rd_reg & BIT_RTC_STATUS_REG_POWER_UP_M)
dev_warn(&pdev->dev, "Power up reset detected.\n"); dev_warn(&pdev->dev, "Power up reset detected.\n");
@ -500,7 +500,7 @@ static int twl_rtc_probe(struct platform_device *pdev)
/* Clear RTC Power up reset and pending alarm interrupts */ /* Clear RTC Power up reset and pending alarm interrupts */
ret = twl_rtc_write_u8(rd_reg, REG_RTC_STATUS_REG); ret = twl_rtc_write_u8(rd_reg, REG_RTC_STATUS_REG);
if (ret < 0) if (ret < 0)
goto out1; return ret;
if (twl_class_is_6030()) { if (twl_class_is_6030()) {
twl6030_interrupt_unmask(TWL6030_RTC_INT_MASK, twl6030_interrupt_unmask(TWL6030_RTC_INT_MASK,
@ -512,7 +512,7 @@ static int twl_rtc_probe(struct platform_device *pdev)
dev_info(&pdev->dev, "Enabling TWL-RTC\n"); dev_info(&pdev->dev, "Enabling TWL-RTC\n");
ret = twl_rtc_write_u8(BIT_RTC_CTRL_REG_STOP_RTC_M, REG_RTC_CTRL_REG); ret = twl_rtc_write_u8(BIT_RTC_CTRL_REG_STOP_RTC_M, REG_RTC_CTRL_REG);
if (ret < 0) if (ret < 0)
goto out1; return ret;
/* ensure interrupts are disabled, bootloaders can be strange */ /* ensure interrupts are disabled, bootloaders can be strange */
ret = twl_rtc_write_u8(0, REG_RTC_INTERRUPTS_REG); ret = twl_rtc_write_u8(0, REG_RTC_INTERRUPTS_REG);
@ -522,34 +522,29 @@ static int twl_rtc_probe(struct platform_device *pdev)
/* init cached IRQ enable bits */ /* init cached IRQ enable bits */
ret = twl_rtc_read_u8(&rtc_irq_bits, REG_RTC_INTERRUPTS_REG); ret = twl_rtc_read_u8(&rtc_irq_bits, REG_RTC_INTERRUPTS_REG);
if (ret < 0) if (ret < 0)
goto out1; return ret;
device_init_wakeup(&pdev->dev, 1); device_init_wakeup(&pdev->dev, 1);
rtc = rtc_device_register(pdev->name, rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
&pdev->dev, &twl_rtc_ops, THIS_MODULE); &twl_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc)) { if (IS_ERR(rtc)) {
ret = PTR_ERR(rtc);
dev_err(&pdev->dev, "can't register RTC device, err %ld\n", dev_err(&pdev->dev, "can't register RTC device, err %ld\n",
PTR_ERR(rtc)); PTR_ERR(rtc));
goto out1; return PTR_ERR(rtc);
} }
ret = request_threaded_irq(irq, NULL, twl_rtc_interrupt, ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
IRQF_TRIGGER_RISING | IRQF_ONESHOT, twl_rtc_interrupt,
dev_name(&rtc->dev), rtc); IRQF_TRIGGER_RISING | IRQF_ONESHOT,
dev_name(&rtc->dev), rtc);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "IRQ is not free.\n"); dev_err(&pdev->dev, "IRQ is not free.\n");
goto out2; return ret;
} }
platform_set_drvdata(pdev, rtc); platform_set_drvdata(pdev, rtc);
return 0; return 0;
out2:
rtc_device_unregister(rtc);
out1:
return ret;
} }
/* /*
@ -559,9 +554,6 @@ static int twl_rtc_probe(struct platform_device *pdev)
static int twl_rtc_remove(struct platform_device *pdev) static int twl_rtc_remove(struct platform_device *pdev)
{ {
/* leave rtc running, but disable irqs */ /* leave rtc running, but disable irqs */
struct rtc_device *rtc = platform_get_drvdata(pdev);
int irq = platform_get_irq(pdev, 0);
mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_ALARM_M); mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_ALARM_M);
mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M); mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M);
if (twl_class_is_6030()) { if (twl_class_is_6030()) {
@ -571,10 +563,6 @@ static int twl_rtc_remove(struct platform_device *pdev)
REG_INT_MSK_STS_A); REG_INT_MSK_STS_A);
} }
free_irq(irq, rtc);
rtc_device_unregister(rtc);
return 0; return 0;
} }