ACPI / hotplug: Make acpi_hotplug_profile_ktype static

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / rtc / rtc-pxa.c

diff --git a/drivers/rtc/rtc-pxa.c b/drivers/rtc/rtc-pxa.c
index 2695e55..03c85ee 100644 (file)
--- a/drivers/rtc/rtc-pxa.c
+++ b/drivers/rtc/rtc-pxa.c
@@ -309,8 +309,6 @@ static int pxa_rtc_proc(struct device *dev, struct seq_file *seq)
 }
 
 static const struct rtc_class_ops pxa_rtc_ops = {
-       .open = pxa_rtc_open,
-       .release = pxa_rtc_release,
        .read_time = pxa_rtc_read_time,
        .set_time = pxa_rtc_set_time,
        .read_alarm = pxa_rtc_read_alarm,
@@ -350,7 +348,7 @@ static int __init pxa_rtc_probe(struct platform_device *pdev)
                dev_err(dev, "No alarm IRQ resource defined\n");
                goto err_ress;
        }
-
+       pxa_rtc_open(dev);
        ret = -ENOMEM;
        pxa_rtc->base = ioremap(pxa_rtc->ress->start,
                                resource_size(pxa_rtc->ress));
@@ -396,6 +394,9 @@ static int __exit pxa_rtc_remove(struct platform_device *pdev)
 {
        struct pxa_rtc *pxa_rtc = platform_get_drvdata(pdev);
 
+       struct device *dev = &pdev->dev;
+       pxa_rtc_release(dev);
+
        rtc_device_unregister(pxa_rtc->rtc);
 
        spin_lock_irq(&pxa_rtc->lock);
@@ -453,10 +454,7 @@ static struct platform_driver pxa_rtc_driver = {
 
 static int __init pxa_rtc_init(void)
 {
-       if (cpu_is_pxa27x() || cpu_is_pxa3xx())
-               return platform_driver_probe(&pxa_rtc_driver, pxa_rtc_probe);
-
-       return -ENODEV;
+       return platform_driver_probe(&pxa_rtc_driver, pxa_rtc_probe);
 }
 
 static void __exit pxa_rtc_exit(void)