[SCSI] qla2xxx: Update firmware link in Kconfig file.

[firefly-linux-kernel-4.4.55.git] / drivers / rtc / rtc-pcf50633.c

diff --git a/drivers/rtc/rtc-pcf50633.c b/drivers/rtc/rtc-pcf50633.c
index e9f3135d305ff35eb4594dd6e35dfaee93a5c35a..e6b6911c8e0528b326e6a0e93050510f81735b52 100644 (file)
--- a/drivers/rtc/rtc-pcf50633.c
+++ b/drivers/rtc/rtc-pcf50633.c
@@ -252,20 +252,17 @@ static int pcf50633_rtc_probe(struct platform_device *pdev)
 {
        struct pcf50633_rtc *rtc;
 
-       rtc = kzalloc(sizeof(*rtc), GFP_KERNEL);
+       rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL);
        if (!rtc)
                return -ENOMEM;
 
        rtc->pcf = dev_to_pcf50633(pdev->dev.parent);
        platform_set_drvdata(pdev, rtc);
-       rtc->rtc_dev = rtc_device_register("pcf50633-rtc", &pdev->dev,
+       rtc->rtc_dev = devm_rtc_device_register(&pdev->dev, "pcf50633-rtc",
                                &pcf50633_rtc_ops, THIS_MODULE);
 
-       if (IS_ERR(rtc->rtc_dev)) {
-               int ret =  PTR_ERR(rtc->rtc_dev);
-               kfree(rtc);
-               return ret;
-       }
+       if (IS_ERR(rtc->rtc_dev))
+               return PTR_ERR(rtc->rtc_dev);
 
        pcf50633_register_irq(rtc->pcf, PCF50633_IRQ_ALARM,
                                        pcf50633_rtc_irq, rtc);
@@ -277,12 +274,8 @@ static int pcf50633_rtc_remove(struct platform_device *pdev)
        struct pcf50633_rtc *rtc;
 
        rtc = platform_get_drvdata(pdev);
-
        pcf50633_free_irq(rtc->pcf, PCF50633_IRQ_ALARM);
 
-       rtc_device_unregister(rtc->rtc_dev);
-       kfree(rtc);
-
        return 0;
 }